branch: externals/phps-mode
commit f880ba2d62797c72c66bfdf61d4d4356320c28e0
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Improved indentation on lines after assignment that ends with closing
bracket
---
phps-mode-indent.el | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index 11a62503f9..7c8c82a2b6 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -712,18 +712,28 @@
reference-line))
(reference-bracket-level2
(phps-mode-indent--get-string-brackets-count
- reference-line2)))
+ reference-line2))
+ (reference-contains-assignment
+ (string-match-p
+ "^[\t ]*$[a-zA-Z0-9_]+[\t ]*[^=!]*=\\($\\|[\t
]+.*[^,;]$\\)"
+ reference-line)))
;; if (
;; (is_array($data)
;; && !empty($data['index'])
;; && (is_a($data['index'], 'Index')
;; || is_a($data['Index'], 'Index2')))
;; || is_a($data, 'WC_Index')
+ ;; or
+ ;; $copies = method_exists($object, 'get_copies')
+ ;; ? true
;; (message "reference-bracket-level: %S"
reference-bracket-level)
;; (message "reference-bracket-level2: %S"
reference-bracket-level2)
- (when (and
- (> reference-bracket-level 0)
- (> reference-bracket-level
reference-bracket-level2))
+
+ (when (or
+ reference-contains-assignment
+ (and
+ (> reference-bracket-level 0)
+ (> reference-bracket-level
reference-bracket-level2)))
(setq
new-indentation
(+ new-indentation tab-width))))
