[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode 64e1789 356/405: Fixed indentation were assig
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode 64e1789 356/405: Fixed indentation were assignments end at next line |
Date: |
Sat, 13 Jul 2019 10:00:48 -0400 (EDT) |
branch: externals/phps-mode
commit 64e17894fdc543c894e910396d1429f88b5d3491
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
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
- [elpa] externals/phps-mode 9e62157 338/405: (comment-region) and (uncomment-region) now handles part of lines as well as full lines, (continued)
- [elpa] externals/phps-mode 9e62157 338/405: (comment-region) and (uncomment-region) now handles part of lines as well as full lines, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 091ab21 340/405: Passes new unit test for indentation of concatenated equal and multiplication equal assignments, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d27af61 327/405: Fixed bug with incremental lexer were states are missing, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 32f9808 329/405: indent and imenu now triggers incremental lexer if buffer changed, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 365d739 324/405: Changed structure of integration tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 2807902 343/405: Added syntax coloring for %, =, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 1bac28a 352/405: Updated readme with decreased percent for indent, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 2801604 350/405: Added TODO item, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c80aa68 351/405: Added a new failing test for indentation of else expression inside switch, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a8fbe7d 344/405: Improved syntax coloring of =, % and more, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 64e1789 356/405: Fixed indentation were assignments end at next line,
Stefan Monnier <=
- [elpa] externals/phps-mode 83d5de8 355/405: Removed uneccesary debug output in unit test, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode abd78a0 359/405: Work on incremental newline logic, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d8ad25b 341/405: Passes new test indentation of multi-line double-arrow inside assignment, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e7cb803 346/405: Added another indentation test, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode dabe0ea 345/405: Added failing indentation test for multi-dimension array in assignment with double arrows, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d6e6cbc 358/405: Another optimization of line-number-at-pos inside loop, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e681c9c 347/405: Updated color syntax for T_STRING tokens, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c11bcc5 360/405: More work on newline advice, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 282115f 357/405: Using incremental line-number calculation as optimization, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c118f58 342/405: Added TODO items, Stefan Monnier, 2019/07/13