branch: externals/phps-mode
commit 94d48149a0e9f32a459bae52b931fe75864594fe
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Added test for moving lexer tokens
---
phps-lexer.el | 6 +++---
phps-test-lexer.el | 11 +++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/phps-lexer.el b/phps-lexer.el
index 8e41347..3382a00 100644
--- a/phps-lexer.el
+++ b/phps-lexer.el
@@ -1293,10 +1293,10 @@ ANY_CHAR'
(if (> token-start start)
(let ((new-token-start (+ token-start diff))
(new-token-end (+ token-end diff)))
- (push `(,token-symbol ,new-token-start ,new-token-end)
new-tokens)
- (push token new-tokens))))))
+ (push `(,token-symbol ,new-token-start . ,new-token-end)
new-tokens))
+ (push token new-tokens))))))
- new-tokens)))
+ new-tokens))
(defun phps-mode/run-incremental-lex ()
"Run incremental lexer based on `phps-mode/buffer-changes--start'."
diff --git a/phps-test-lexer.el b/phps-test-lexer.el
index d152f6c..9056461 100644
--- a/phps-test-lexer.el
+++ b/phps-test-lexer.el
@@ -40,6 +40,7 @@
(autoload 'phps-mode/with-test-buffer "phps-test")
(autoload 'phps-mode/lexer-init "phps-lexer")
(autoload 'phps-mode/lexer-get-point-data "phps-lexer")
+(autoload 'phps-mode/move-lexer-tokens "phps-lexer")
(autoload 'should "ert")
(defun phps-mode/test-lexer--script-boundaries ()
@@ -268,6 +269,15 @@
)
+(defun phps-mode/test-move-lexer-tokens ()
+ "Run test for move lexer tokens."
+
+ (should (equal
+ '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC 7 . 16) (T_ERROR 21 . 60))
+ (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) 8 5)))
+
+ )
+
(defun phps-mode/test-lexer ()
"Run test for lexer."
;; (message "-- Running all tests for lexer... --\n")
@@ -277,6 +287,7 @@
(phps-mode/test-lexer--complex-tokens)
(phps-mode/test-lexer--namespaces)
(phps-mode/test-lexer--errors)
+ (phps-mode/test-move-lexer-tokens)
;; (message "\n-- Ran all tests for lexer. --")
)
