branch: externals/phps-mode
commit 71858d1a4c1829276c0816e8f9a13a763a7f7eba
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Removed side-effect of END_PARSE token being added to tokens after
processing buffer
---
phps-mode-functions.el | 2 +-
phps-mode-test-functions.el | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index 7df727c..d169e85 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -178,7 +178,7 @@
(token-end nil)
(token-start-line-number 0)
(token-end-line-number 0)
- (tokens (nreverse phps-mode-lexer-tokens))
+ (tokens (nreverse (copy-sequence phps-mode-lexer-tokens)))
(nesting-stack nil)
(nesting-key nil)
(class-declaration-started-this-line nil)
diff --git a/phps-mode-test-functions.el b/phps-mode-test-functions.el
index a3296e1..c59541a 100644
--- a/phps-mode-test-functions.el
+++ b/phps-mode-test-functions.el
@@ -907,8 +907,6 @@
'((T_OPEN_TAG 1 . 7) (T_VARIABLE 7 . 11) ("=" 12 . 13)
(T_CONSTANT_ENCAPSED_STRING 14 . 19) (";" 19 . 20) (T_VARIABLE 23 . 28) ("=" 29
. 30) (T_CONSTANT_ENCAPSED_STRING 31 . 36) (";" 36 . 37))))
)
- ;; TODO The test below should not contain END_PARSE token, incremental lexer
should not be triggered by inserting a newline and indenting
-
(phps-mode-test-with-buffer
"<?php\nif (true):\n $var = 'abc';\n $var2 = '123';\nendif;\n"
"Add newline inside if body after two assignments and inspect moved tokens
and states"
@@ -919,7 +917,7 @@
(newline-and-indent)
;; (message "Tokens %s" (phps-mode-lexer-get-tokens))
(should (equal (phps-mode-lexer-get-tokens)
- '((T_OPEN_TAG 1 . 7) (T_IF 7 . 9) ("(" 10 . 11) (T_STRING 11
. 15) (")" 15 . 16) (":" 16 . 17) (T_VARIABLE 22 . 26) ("=" 27 . 28)
(T_CONSTANT_ENCAPSED_STRING 29 . 34) (";" 34 . 35) (T_VARIABLE 40 . 45) ("=" 46
. 47) (T_CONSTANT_ENCAPSED_STRING 48 . 53) (";" 53 . 54) (T_ENDIF 60 . 65) (";"
65 . 66) (END_PARSE 68 . 68)))))
+ '((T_OPEN_TAG 1 . 7) (T_IF 7 . 9) ("(" 10 . 11) (T_STRING 11
. 15) (")" 15 . 16) (":" 16 . 17) (T_VARIABLE 22 . 26) ("=" 27 . 28)
(T_CONSTANT_ENCAPSED_STRING 29 . 34) (";" 34 . 35) (T_VARIABLE 40 . 45) ("=" 46
. 47) (T_CONSTANT_ENCAPSED_STRING 48 . 53) (";" 53 . 54) (T_ENDIF 60 . 65) (";"
65 . 66)))))
)
