branch: externals/phps-mode
commit 2dc9280bcd681b324e87648f7f434c19886931a0
Author: Christian Johansson <[email protected]>
Commit: Christian Johansson <[email protected]>
More work
---
phps-mode-indent.el | 3 ++-
phps-mode-macros.el | 2 +-
test/phps-mode-test-indent.el | 8 ++++++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index abedda6a8f..8164ae8a01 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -1041,12 +1041,13 @@
(setq
match-type
'line-after-line-that-ends-with-semicolon)
+ (end-of-line)
(when-let
((reference-line
(phps-mode-indent--get-previous-reference-command-line)))
- ;; (message "reference-line: %S" reference-line)
+ (message "reference-line: %S" reference-line)
(let ((reference-indentation
(phps-mode-indent--string-indentation
reference-line)))
diff --git a/phps-mode-macros.el b/phps-mode-macros.el
index c3cffb5e82..7d4e2550d7 100644
--- a/phps-mode-macros.el
+++ b/phps-mode-macros.el
@@ -9,7 +9,7 @@
(defconst
phps-mode-macrotime-debug
- nil
+ t
"Debug messages during macro expansion time, default nil.")
(defmacro phps-mode-debug-message (&rest message)
diff --git a/test/phps-mode-test-indent.el b/test/phps-mode-test-indent.el
index 72203dd2ac..e7bf7c013a 100644
--- a/test/phps-mode-test-indent.el
+++ b/test/phps-mode-test-indent.el
@@ -116,6 +116,14 @@
(phps-mode-indent--get-previous-reference-command-line)
"$var = 'command'")))
+ (with-temp-buffer
+ (insert "<?php\nif(true):\n echo 'here';\nelse:\n echo 'Something
else';\n echo 'Something else again';")
+ (goto-char (point-max))
+ (should
+ (string=
+ (phps-mode-indent--get-previous-reference-command-line)
+ " echo 'Something else';")))
+
(with-temp-buffer
(insert "<?php\nif (true) {\n array(\n 8,\n );")
(goto-char (point-max))
