[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode c68c7a0 131/405: Fixed issue were first-token
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode c68c7a0 131/405: Fixed issue were first-token-on-line was nil |
Date: |
Sat, 13 Jul 2019 09:59:59 -0400 (EDT) |
branch: externals/phps-mode
commit c68c7a000217b3fef04e6dc573c505b9ac25361a
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Fixed issue were first-token-on-line was nil
---
phps-mode-functions.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index ba99fa2..088d31b 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -323,14 +323,14 @@
(<= token-start line-end))
(setq first-token-on-line end-token-number))
-
;; Did we encounter end of alternative control structure?
(when (or (equal token 'T_ENDIF)
(equal token 'T_ENDWHILE)
(equal token 'T_ENDFOR)
(equal token 'T_ENDFOREACH)
(equal token 'T_ENDSWITCH))
- (when (= first-token-on-line end-token-number)
+ (when (and first-token-on-line
+ (= first-token-on-line end-token-number))
(setq start-alternative-control-structure-level (1-
start-alternative-control-structure-level)))
(setq end-alternative-control-structure-level (1-
end-alternative-control-structure-level)))
@@ -365,7 +365,8 @@
;; Is token at or before line beginning?
(when (or (<= token-end line-beginning)
- (= first-token-on-line end-token-number))
+ (and first-token-on-line
+ (= first-token-on-line
end-token-number)))
(setq start-alternative-control-structure-level (1+
start-alternative-control-structure-level)))
;; Is token at or before line end?
@@ -375,7 +376,8 @@
)
(when (or (<= token-end line-beginning)
- (= first-token-on-line end-token-number))
+ (and first-token-on-line
+ (= first-token-on-line end-token-number)))
(setq start-inline-control-structure-level (1+
start-inline-control-structure-level))
(setq start-expecting-semi-colon t))
- [elpa] externals/phps-mode 314dba1 135/405: Improved articulation of what information get-current-line-data should return, (continued)
- [elpa] externals/phps-mode 314dba1 135/405: Improved articulation of what information get-current-line-data should return, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode f0523b7 137/405: More work on new function to calculate indentation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 16d8056 144/405: Foundation for new indentation tests completed, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d380cd4 129/405: Updated readme, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 3f08b86 128/405: Updated tracking of alternative control structures, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 52c502c 139/405: Improved logic for doc-comment tracking, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 1472273 136/405: Begun working on new approach to indentation calculation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 9792f70 133/405: Cleaning up code gather point meta information, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode cc947a9 140/405: Added more tests for new indentation function, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d3e00f2 141/405: Starting on new function for indentation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c68c7a0 131/405: Fixed issue were first-token-on-line was nil,
Stefan Monnier <=
- [elpa] externals/phps-mode c4ee0c3 132/405: Added more failing tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 0b3ced4 145/405: First test for new indentation function passes, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 96588b5 142/405: More work on new indentation calculation functions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 9d6af11 157/405: More work on indentations, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e249124 152/405: Prevent negative indent, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 4a27c44 147/405: Added support for naming unit tests to better find failures, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode b852f5f 160/405: All tests for indentation passes, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode dfb0427 151/405: Added unit test for round and square bracket expressions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 7b8cea3 163/405: Added failing indentation test for class multiple implements, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a61ff64 134/405: Renamed function get-point-data to get-current-line-data for better semantics, Stefan Monnier, 2019/07/13