[elpa] externals/phps-mode c453932f32 139/212: Added TODO item

[Christian Johansson]

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

    Added TODO item
---
 phps-mode-indent.el | 51 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index 420e811238..c8a4d1db39 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -215,6 +215,9 @@
                    (previous-line-starts-with-closing-bracket
                     (phps-mode-indent--string-starts-with-closing-bracket
                      previous-line-string))
+                   (previous-line-ends-with-closing-bracket
+                    (phps-mode-indent--string-ends-with-closing-bracket
+                     previous-line-string))
                    (previous-line-starts-with-opening-doc-comment
                     (phps-mode-indent--string-starts-with-opening-doc-comment
                      previous-line-string))
@@ -828,7 +831,6 @@
                  new-indentation
                  (- new-indentation tab-width tab-width)))
 
-               ;; TODO Fix this
                ;; 'name' =>
                ;;     $myObject->getName(),
                ;; 'age' =>
@@ -852,11 +854,11 @@
                 (end-of-line)
                 (forward-char -1)
 
-                (message
-                 "at-line-start: %S"
-                 (buffer-substring-no-properties
-                  (line-beginning-position)
-                  (line-end-position)))
+                ;; (message
+                ;;  "at-line-start: %S"
+                ;;  (buffer-substring-no-properties
+                ;;   (line-beginning-position)
+                ;;   (line-end-position)))
 
                 (let ((not-found t)
                       (reference-line)
@@ -969,17 +971,17 @@
                      (phps-mode-indent--string-indentation
                       reference-line)))
 
-                  (message "is-array: %S" is-array)
-                  (message "is-function: %S" is-function)
-                  (message "not-found: %S" not-found)
-                  (message "reference-line: %S" reference-line)
-                  (message "reference-indentation: %S" reference-indentation)
-                  (message
-                   "at-line-end: %S"
-                   (buffer-substring-no-properties
-                    (line-beginning-position)
-                    (line-end-position)))
-                  (message "is-declared-on-same-line-p: %S" 
is-declared-on-same-line-p)
+                  ;; (message "is-array: %S" is-array)
+                  ;; (message "is-function: %S" is-function)
+                  ;; (message "not-found: %S" not-found)
+                  ;; (message "reference-line: %S" reference-line)
+                  ;; (message "reference-indentation: %S" 
reference-indentation)
+                  ;; (message
+                  ;;  "at-line-end: %S"
+                  ;;  (buffer-substring-no-properties
+                  ;;   (line-beginning-position)
+                  ;;   (line-end-position)))
+                  ;; (message "is-declared-on-same-line-p: %S" 
is-declared-on-same-line-p)
 
                   (when reference-indentation
                     (setq
@@ -1364,12 +1366,25 @@
                ;; ölöas
                ;; EOD
                ;; ));
+               ;; TODO Should backtrack to were bracket started
+               ;; TODO and use indentation from that line
                ((and
                  current-line-starts-with-closing-bracket
                  (not previous-line-ends-with-opening-bracket))
                 (setq
                  new-indentation
-                 (- new-indentation tab-width)))
+                 (- new-indentation tab-width))
+
+                ;; if (
+                ;;     myFunction(
+                ;;         'random')
+                ;; ) {
+                (when (and
+                       previous-line-ends-with-closing-bracket
+                       (not previous-line-starts-with-closing-bracket))
+                  (setq
+                   new-indentation
+                   (- new-indentation tab-width))))
 
                ;; /**
                ;;  * here