[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode e8a8d41 204/405: Merged remote changes
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode e8a8d41 204/405: Merged remote changes |
Date: |
Sat, 13 Jul 2019 10:00:13 -0400 (EDT) |
branch: externals/phps-mode
commit e8a8d41fd9435f34aba2661b56da4d688289c6c4
Merge: 8947e6e 2d4646f
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Merged remote changes
---
phps-mode-functions.el | 13 +++++++++++++
phps-mode-test-functions.el | 5 ++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index ff64e48..d54953c 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -238,17 +238,30 @@
(progn
(setq line-contained-nesting-increase t)
(when
after-special-control-structure-first-on-line
+<<<<<<< HEAD
(setq alternative-control-structure-level
(1+ alternative-control-structure-level))))
+=======
+ (setq first-token-is-nesting-decrease t)))
+>>>>>>> 2d4646f2f1e8faf4a79f6b36f30140c233592430
(when (equal
after-special-control-structure-token 'T_SWITCH)
(setq alternative-control-structure-level (1+
alternative-control-structure-level))
(setq allow-custom-column-increment t))
+<<<<<<< HEAD
(setq alternative-control-structure-level (1+
alternative-control-structure-level))
(setq line-contained-nesting-increase t)
(when
after-special-control-structure-first-on-line
(setq first-token-is-nesting-increase t))))
+=======
+
+ (setq alternative-control-structure-level (1+
alternative-control-structure-level))
+ (setq line-contained-nesting-increase t)
+ (when
after-special-control-structure-first-on-line
+ (setq first-token-is-nesting-increase t))))
+
+>>>>>>> 2d4646f2f1e8faf4a79f6b36f30140c233592430
;; (message "Started inline control-structure after %s
at %s" after-special-control-structure-token token)
(setq in-inline-control-structure t)
(setq temp-pre-indent (1+ column-level))))
diff --git a/phps-mode-test-functions.el b/phps-mode-test-functions.el
index 077598b..ef110cc 100644
--- a/phps-mode-test-functions.el
+++ b/phps-mode-test-functions.el
@@ -112,6 +112,7 @@
)
+<<<<<<< HEAD
(defun phps-mode-test-functions-get-lines-indent-multi-line-assignments ()
"Test for multi-line assignments."
@@ -148,6 +149,8 @@
)
+=======
+>>>>>>> 2d4646f2f1e8faf4a79f6b36f30140c233592430
(defun phps-mode-test-functions-get-lines-indent-inline-if ()
"Test for inline if indentations."
@@ -184,7 +187,7 @@
(phps-mode-test-with-buffer
"<?php\nif (true):\n echo 'Something';\nelseif (true\n && true):\n
echo 'Something';\nelse:\n echo 'Something else';\n echo 'Something else
again';\nendif;\necho true;\n"
"Alternative control structures with multi-line elseif 2"
- (should (equal '((1 (0 0)) (2 (0 0)) (3 (1 0)) (4 (0 0)) (5 (0 0)) (6 (1
0)) (7 (0 0)) (8 (1 0)) (9 (1 0)) (10 (0 0)) (11 (0 0)))
(phps-mode-test-functions--hash-to-list
(phps-mode-functions-get-lines-indent)))))
+ (should (equal '((1 (0 0)) (2 (0 0)) (3 (1 0)) (4 (0 0)) (5 (1 0)) (6 (1
0)) (7 (0 0)) (8 (1 0)) (9 (1 0)) (10 (0 0)) (11 (0 0)))
(phps-mode-test-functions--hash-to-list
(phps-mode-functions-get-lines-indent)))))
)
- [elpa] externals/phps-mode 9201d1c 246/405: Imenu index now handles functions with optional arguments, (continued)
- [elpa] externals/phps-mode 9201d1c 246/405: Imenu index now handles functions with optional arguments, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 2c3239a 187/405: Adding new failing tests for indentation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d9a0119 183/405: Optimized indentation code by removing unused variables, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a0cbcd1 186/405: More work on indentation of multi-line IF-expressions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d7c5f67 190/405: More work on nesting-stack, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 253839f 170/405: Added indentation unit tests for concatenated strings outside assignments, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e38794b0 197/405: More conceptual work on algorithm for inline control structures, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 9db28d9 185/405: Added verbose flag for unit tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 2a1ed52 196/405: Optimized algorithm for indentation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a30c3f6 177/405: More work on indentation tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e8a8d41 204/405: Merged remote changes,
Stefan Monnier <=
- [elpa] externals/phps-mode faa4e00 201/405: Started on conceptually describing algorithm for multi-line assignment indentation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 874701d 195/405: Work on alternative and inline control structure syntax with new algorithm, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode ec69d07 193/405: Added a failing class declaration indentation case, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 164b77e 205/405: Unit test for alternative control syntax passes with new algorithm, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e8658c8 192/405: New indentation algorithm now passes class unit tests, started on indentation document, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode ba9d8a0 199/405: More organization of tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 86404c8 207/405: New algorithm now passes tests for alternative control structure, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 8b4c188 188/405: Now able to detect indent change of scope with same nesting level, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 91715f6 217/405: Added another test for multi-line function arguments, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 75c4af4 214/405: Fixed indentation for lines wrapped in scripting open/close, Stefan Monnier, 2019/07/13