branch: externals/phps-mode
commit 64e17894fdc543c894e910396d1429f88b5d3491
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Fixed indentation were assignments end at next line
---
README.md | 2 +-
phps-mode-functions.el | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index d756fe2..0e9551c 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This mode does not require PHP installed on computer because
it has a elisp base
* Flycheck support (PHP Mess Detector, PHP Code Sniffer) (100%)
* Lexer based on official PHP re2c lexer (100%)
* Syntax coloring based on lexer tokens (100%)
-* PSR-1 and PSR-2 indentation based on lexer tokens (95%)
+* PSR-1 and PSR-2 indentation based on lexer tokens (100%)
* Imenu support (100%)
* Integration with `(electric-pair)` (100%)
* Incremental lexer and syntax coloring after buffer changes (100%)
diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index d3649e1..9186e9e 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -481,7 +481,10 @@
(when in-assignment
(when (or (string= token ";")
(and (string= token ")")
- (< round-bracket-level (car
in-assignment-round-bracket-level)))
+ (or (< round-bracket-level (car
in-assignment-round-bracket-level))
+ (and
+ (= round-bracket-level (car
in-assignment-round-bracket-level))
+ (string= next-token ")"))))
(and (string= token ",")
(= round-bracket-level (car
in-assignment-round-bracket-level))
(= square-bracket-level (car
in-assignment-square-bracket-level)))
@@ -493,7 +496,7 @@
;; NOTE Ending an assignment because of function token is
to support PSR-2 Closures
(when phps-mode-functions-verbose
- (message "Ended assignment at %s" token))
+ (message "Ended assignment at %s %s" token next-token))
(pop in-assignment-square-bracket-level)
(pop in-assignment-round-bracket-level)
(unless in-assignment-round-bracket-level
