[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode 73b8b4d 297/405: More work on concatenation a
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode 73b8b4d 297/405: More work on concatenation and assignment indent |
Date: |
Sat, 13 Jul 2019 10:00:36 -0400 (EDT) |
branch: externals/phps-mode
commit 73b8b4d088acbc2649121c5ffcd9437a9d13a0d3
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
More work on concatenation and assignment indent
---
phps-mode-functions.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index 5d5d2b7..a70d184 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -457,6 +457,8 @@
(if (or (string= token ";")
(and (string= token ")")
(<= round-bracket-level
in-assignment-round-bracket-level))
+ (and (string= token ",")
+ (<= round-bracket-level
in-assignment-round-bracket-level))
(and (string= token"]")
(<= square-bracket-level
in-assignment-square-bracket-level)))
(progn
@@ -468,7 +470,7 @@
))
(when (and (not after-special-control-structure)
(string= token "="))
- ;; (message "Started assignment")
+ (message "Started assignment")
(setq in-assignment t)
(setq in-assignment-round-bracket-level
round-bracket-level)
(setq in-assignment-square-bracket-level
square-bracket-level)
@@ -671,7 +673,6 @@
(setq first-token-on-line t)
(setq first-token-is-nesting-decrease nil)
(setq first-token-is-inline-html nil)
- (setq in-assignment-level 0)
(setq in-class-declaration-level 0)
(setq class-declaration-started-this-line nil)
(setq in-heredoc-started-this-line nil)
- [elpa] externals/phps-mode 969a4d1 278/405: Fixed syntax for coalesce assignment operator, (continued)
- [elpa] externals/phps-mode 969a4d1 278/405: Fixed syntax for coalesce assignment operator, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode bd08a00 277/405: Added unit test for COALESCING EQUAL token, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a49ce7d 272/405: Added TODO item for lexer to better match re2c, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 552eada 264/405: Tuning of incremental logic, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 6cb1d5a 261/405: Added T_INLINE_HTML lexer token, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d6caab9 269/405: Added support for coalesce_equal token and made lexer structure more similar to re2c, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d51a2c4 276/405: Lexer grammar used same logic as PHP language scanner, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 1e3537c 268/405: Re-factored lexer to be more similar to re2c, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 9748853 267/405: Merged all lexer analysis into one to better match re2c lexer, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode bfeaa74 273/405: Started with changing lexer syntax to be more alike re2c, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 73b8b4d 297/405: More work on concatenation and assignment indent,
Stefan Monnier <=
- [elpa] externals/phps-mode 81c7179 293/405: Fixed indentation bug with assignment of square array in function argument, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 419a812 298/405: More work on debugging indentation with assignment, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode ed36115 288/405: Added TODO item for indentation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 52cfc78 281/405: Added failing indent test, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 46147f4 287/405: Fixed bug with undefined token-end-line-number in new buffers, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 66edaca 286/405: Improved lexing of comment version doc comment, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 55f61b0 296/405: New algorithm for concatenation indentation passes tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 9069d0a 300/405: Concatenation indentation now uses stack, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e639ea3 299/405: Indent passing new concatenation tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 5be3560 291/405: Adding more indent examples from PSR-2, Stefan Monnier, 2019/07/13