[elpa] externals/phps-mode d85974c2aa 196/212: Improved indentation inside multi-dimensional arrays

[Christian Johansson]

branch: externals/phps-mode
commit d85974c2aa8f2c351bb62db3cbfeae5160800791
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Improved indentation inside multi-dimensional arrays
---
 phps-mode-indent.el           | 60 ++++++++++++++++++++++++++++---------------
 test/phps-mode-test-indent.el |  8 ++++++
 2 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index d9d2c4697d..f3ee0198a4 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -266,17 +266,23 @@
             (forward-char -1)
           (end-of-line)))
       (let ((not-found-bracket-start t)
-            (parenthesis-level 0))
+            (parenthesis-level 0)
+            (same-line-p t))
         (while
             (and
              not-found-bracket-start
              (search-backward-regexp
-              "[][{}()]"
+              "[][{}()\n]"
               nil
               t))
           (let ((match (match-string-no-properties 0)))
             (cond
 
+             ((string= "\n" match)
+              (setq
+               same-line-p
+               nil))
+
              ((or
                (string= "(" match)
                (string= "[" match)
@@ -302,8 +308,10 @@
                parenthesis-level
                (1- parenthesis-level)))
 
-             )))))
-    reference-line))
+             )))
+        (if same-line-p
+            nil
+          reference-line)))))
 
 (defun phps-mode-indent--get-previous-reference-command-line ()
   "Get previous line that is a command (if any)."
@@ -1274,23 +1282,35 @@
                  match-type
                  'line-after-line-that-ends-with-closing-bracket)
                 (forward-line (* -1 move-length1))
-                (when-let
-                    ((reference-line
-                      (phps-mode-indent--get-previous-start-of-bracket-line 
t)))
-                  ;; (message "reference-line: %S" reference-line)
-                  (setq
-                   new-indentation
-                   (phps-mode-indent--string-indentation
-                    reference-line))
+                (let ((reference-line
+                       (phps-mode-indent--get-previous-start-of-bracket-line 
t)))
+                  (if reference-line
+                      (progn
+                        ;; (message "reference-line: %S" reference-line)
+                        (setq
+                         new-indentation
+                         (phps-mode-indent--string-indentation
+                          reference-line)))
 
-                  ;;$copies = method_exists($object, 'get_copies')
-                  ;;     ? $object->get_copies()
-                  (when (string-match-p
-                         "^[\t ]*$[a-zA-Z0-9_]+[\t ]*[^=!]*=\\($\\|[\t 
]+.*[^,;]$\\)"
-                         reference-line)
-                    (setq
-                     new-indentation
-                     (+ new-indentation tab-width)))))
+                    ;; (message "previous-line-string: %S" 
previous-line-string)
+
+                    ;;$copies = method_exists($object, 'get_copies')
+                    ;;     ? $object->get_copies()
+                    ;; or
+                    ;; 'random' => callback($abc)
+                    ;;     || true
+                    (when (or
+                           (string-match-p
+                            "^[\t ]*$[a-zA-Z0-9_]+[\t ]*[^=!]*=\\($\\|[\t 
]+.*[^,;]$\\)"
+                            previous-line-string)
+                           (string-match-p
+                            "=>[^,;]$"
+                            previous-line-string))
+                      (setq
+                       new-indentation
+                       (+
+                        new-indentation
+                        tab-width))))))
 
                ;; LINE AFTER OPENING MULTI-LINE ASSIGNMENT
                ;; $var = 'A line' .
diff --git a/test/phps-mode-test-indent.el b/test/phps-mode-test-indent.el
index b792901b03..15cb37c0c7 100644
--- a/test/phps-mode-test-indent.el
+++ b/test/phps-mode-test-indent.el
@@ -197,6 +197,14 @@
       (phps-mode-indent--get-previous-start-of-bracket-line t)
       "        [array(")))
 
+  (with-temp-buffer
+    (insert "<?php\narray(2, 3)")
+    (goto-char (point-max))
+    (should
+     (equal
+      (phps-mode-indent--get-previous-start-of-bracket-line t)
+      nil)))
+
   (message "Passed tests for indentation helper functions")
 
   )