[elpa] externals/phps-mode fc2e8b7 212/405: Added logic to indent token-less lines as well

[Stefan Monnier]

branch: externals/phps-mode
commit fc2e8b736d9ae77390986674cd3d9b3711d8a119
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    Added logic to indent token-less lines as well
---
 phps-mode-functions.el      | 9 ++++++++-
 phps-mode-test-functions.el | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index 64545f0..8f08c29 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -417,7 +417,14 @@
                         (puthash token-start-line-number `(,column-level-start 
,tuning-level) line-indents))
 
 
-                      ;; TODO Fill token-less but in-scripting lines 
in-between with indentation
+                      ;; Indent token-less lines here in between last tokens 
if distance is more than 1 line
+                      (when (and (> next-token-start-line-number (1+ 
token-start-line-number))
+                                 (not (equal token 'T_CLOSE_TAG)))
+                        (let ((token-line-number-diff (1- (- 
token-start-line-number next-token-start-line-number))))
+                          (while (>= token-line-number-diff 0)
+                            (puthash (- token-start-line-number 
token-line-number-diff) `(,column-level-start ,tuning-level) line-indents)
+                            ;; (message "Saved line %s indent %s %s" (- 
token-end-line-number token-line-number-diff) column-level tuning-level)
+                            (setq token-line-number-diff (1- 
token-line-number-diff)))))
 
 
                       ;; Does token span over several lines?
diff --git a/phps-mode-test-functions.el b/phps-mode-test-functions.el
index 9cf29e5..41e46be 100644
--- a/phps-mode-test-functions.el
+++ b/phps-mode-test-functions.el
@@ -542,8 +542,8 @@
   (phps-mode-test-functions-get-lines-indent-inline-if)
   (phps-mode-test-functions-get-lines-indent-alternative-if)
   (phps-mode-test-functions-get-lines-indent-multi-line-assignments)
-  (phps-mode-test-functions-get-lines-indent-switch-case)
   (phps-mode-test-functions-get-lines-indent)
+  (phps-mode-test-functions-get-lines-indent-switch-case)
   (phps-mode-test-functions-indent-line))
 
 (phps-mode-test-functions)