[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode a59ef7b 079/405: More unit tests for moving l
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode a59ef7b 079/405: More unit tests for moving lexer token positions |
Date: |
Sat, 13 Jul 2019 09:59:47 -0400 (EDT) |
branch: externals/phps-mode
commit a59ef7b3eb0b04606100adbb5303b23835b10120
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
More unit tests for moving lexer token positions
---
phps-lexer.el | 4 ++--
phps-test-lexer.el | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/phps-lexer.el b/phps-lexer.el
index 3382a00..d96bf2b 100644
--- a/phps-lexer.el
+++ b/phps-lexer.el
@@ -1279,7 +1279,7 @@ ANY_CHAR'
(setq phps-mode/lexer-tokens (semantic-lex-buffer)))
(defun phps-mode/move-lexer-tokens (old-tokens start diff)
- "Move lexer OLD-TOKENS positions after START with DIFF points."
+ "Move lexer OLD-TOKENS positions after (or equal to) START with DIFF points."
(let ((new-tokens '()))
(when old-tokens
@@ -1290,7 +1290,7 @@ ANY_CHAR'
(let ((token-symbol (car token))
(token-start (car (cdr token)))
(token-end (cdr (cdr token))))
- (if (> token-start start)
+ (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))
diff --git a/phps-test-lexer.el b/phps-test-lexer.el
index 9056461..8ef15d5 100644
--- a/phps-test-lexer.el
+++ b/phps-test-lexer.el
@@ -276,6 +276,22 @@
'((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)))
+ (should (equal
+ '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC 7 . 16) (T_ERROR 11 . 50))
+ (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) 8 -5)))
+
+ (should (equal
+ '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC 8 . 17) (T_ERROR 17 . 56))
+ (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) 7 1)))
+
+ (should (equal
+ '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC 7 . 16) (T_ERROR 16 . 55))
+ (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) 20 1)))
+
+ (should (equal
+ '((T_OPEN_TAG 2 . 8) (T_START_HEREDOC 8 . 17) (T_ERROR 17 . 56))
+ (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) -20 1)))
+
)
(defun phps-mode/test-lexer ()
- [elpa] externals/phps-mode 236f05e 071/405: Updated makefile to not use hard-coded path to emacs, (continued)
- [elpa] externals/phps-mode 236f05e 071/405: Updated makefile to not use hard-coded path to emacs, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode bf633d2 061/405: Added test for indent of final line of doc comment block, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode ba8165a 063/405: Fixed bug with brace count not including braces inside double quoted strings, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 99dfc68 067/405: Incremental-lexer deletes affected overlays, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 90d059c 064/405: Fixed bug in incremental lexer logic, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 1be9270 068/405: Updated README, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e57f1e1 075/405: Skipping indentation if it's already correct, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c57fb5b 073/405: Improved indentation of trailing opening brace, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 5e30a65 076/405: Added TODO items, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 94d4814 078/405: Added test for moving lexer tokens, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a59ef7b 079/405: More unit tests for moving lexer token positions,
Stefan Monnier <=
- [elpa] externals/phps-mode 287d934 077/405: Updated comments are made un-tested function for moving token positions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode b3821a1 080/405: Updated TODOs, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode f4cd90e 072/405: Updated readme and makefile for running all tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode f79cf4f 081/405: Started on function for moving lexer states, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e340279 082/405: Added unit tests for moving lexer-state positions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 89b12ab 084/405: Added autoloads and fixed bug with assigning variable, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a10cc79 085/405: Debugging a indentation case, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e30ac0c 083/405: Started implementation of moving lexer and state position when, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 8c919ac 087/405: Added failing indentation test, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 69ced0d 090/405: Added another unit test for failed indentation, Stefan Monnier, 2019/07/13