[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode 4b4a821e6e 115/212: Started refactor of inden
|
From: |
Christian Johansson |
|
Subject: |
[elpa] externals/phps-mode 4b4a821e6e 115/212: Started refactor of indent code |
|
Date: |
Wed, 26 Jan 2022 01:51:08 -0500 (EST) |
branch: externals/phps-mode
commit 4b4a821e6eee2fac6959f0c01c04bd502fdeaa2c
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
Started refactor of indent code
---
phps-mode-indent.el | 883 ++++++++++++++++++++++++------------------
test/phps-mode-test-indent.el | 4 -
2 files changed, 496 insertions(+), 391 deletions(-)
diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index 5d3f91512b..9d48448496 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -240,216 +240,256 @@
;; (message "Previous non-empty line: %S with indentation: %S"
previous-line-string old-indentation)
;; (message "previous-line-ends-with-terminus: %S"
previous-line-ends-with-terminus)
- (setq new-indentation previous-indentation)
+ (setq
+ new-indentation
+ previous-indentation)
(goto-char point)
- ;; class MyClass implements
- ;; myInterface
- ;; or
- ;; class MyClass extends
- ;; myParent
- (when (string-match-p
- "[\t ]+\\(extends\\|implements\\)$"
- previous-line-string)
- (setq previous-bracket-level (+ tab-width)))
-
- ;; class MyClass
- ;; implements myInterface
- ;; or
- ;; class MyClass
- ;; extends myParent
- ;; or
- ;; class MyClass
- ;; extends myParent
- ;; implements MyInterface
- (when
- (string-match "^[\t ]*\\(extends\\|implements\\)"
current-line-string)
+ ;; (message "\ncurrent-line-string: %S" current-line-string)
+ ;; (message "previous-line-string: %S" previous-line-string)
+ ;; (message "current-line-starts-with-closing-bracket: %S"
current-line-starts-with-closing-bracket)
+ ;; (message "previous-line-ends-with-opening-bracket: %S"
previous-line-ends-with-opening-bracket)
+ ;; (message "previous-bracket-level: %S" previous-bracket-level)
+ ;; (message "previous-indentation: %S" previous-indentation)
+
+
+ ;; Case by case logic below - most specific to most general
+
+ (cond
+
+ ;; class MyClass implements
+ ;; myInterface
+ ;; or
+ ;; class MyClass extends
+ ;; myParent
+ ((string-match-p
+ "[\t ]+\\(extends\\|implements\\)$"
+ previous-line-string)
+ (setq
+ new-indentation
+ (+ new-indentation tab-width)))
+
+ ;; class MyClass
+ ;; implements myInterface
+ ;; or
+ ;; class MyClass
+ ;; extends myParent
+ ;; or
+ ;; class MyClass
+ ;; extends myParent
+ ;; implements MyInterface
+ ((string-match-p
+ "^[\t ]*\\(extends\\|implements\\)"
+ current-line-string)
(when-let ((backwards-string
(phps-mode-indent--backwards-looking-at
"\r+\\([\t ]*\\)class[\r\t ]+[a-zA-Z0-9_]+[\r\t
]+\\(extends[\r\t ]+[a-zA-Z0-9_]+\\)?[\r\t ]*\\(implements[\r\t
]+[a-zA-Z0-9_]+\\)?$")))
- (let ((old-indentation (length (match-string 1
backwards-string))))
- (setq new-indentation (+ old-indentation tab-width)))))
-
- ;; class MyClass implements
- ;; myInterface,
- ;; myInterface2
- ;; {
- (when (and
- current-line-starts-with-opening-bracket
- (string= current-line-starts-with-opening-bracket "{")
- (phps-mode-indent--backwards-looking-at
- "[\r\t ]*implements[\r\t ]+\\([\r\t
]*[\\a-zA-Z_0-9]+,?\\)+[\r\t ]*{$"))
- (setq new-indentation (- new-indentation tab-width)))
-
- ;; if (true)
- ;; echo 'Something';
- ;; or
- ;; while (true)
- ;; echo 'Something';
- ;; or
- ;; if (true):
- ;; echo 'Something';
- ;; or
- ;; while (true):
- ;; echo 'Something';
- ;; or
- ;; for ($i = 0; $i < 10; $i++):
- ;; echo 'Something';
- ;; or
- ;; foreach ($array as $value):
- ;; echo 'Something';
- (when (and
- current-line-ends-with-terminus
- (string= current-line-ends-with-terminus ";")
- (string-match-p
- "^[\t ]*\\(if\\|while\\|for\\|foreach\\)[\t ]*(.+):?$"
- previous-line-string))
- (setq new-indentation (+ new-indentation tab-width)))
-
- ;; $var = 'A line' .
- ;; 'something';
- (when (and
- (string-match-p
- "^[\t ]*$[a-zA-Z0-9]+[\t ]*="
- previous-line-string)
- (not
- (string-match-p
- ";[\t ]*$"
- previous-line-string)))
+ (let ((old-indentation
+ (length
+ (match-string 1 backwards-string))))
+ (setq
+ new-indentation
+ (+ old-indentation tab-width)))))
+
+ ;; class MyClass implements
+ ;; myInterface,
+ ;; myInterface2
+ ;; {
+ ((and
+ current-line-starts-with-opening-bracket
+ (string= current-line-starts-with-opening-bracket "{")
+ (phps-mode-indent--backwards-looking-at
+ "[\r\t ]*implements[\r\t ]+\\([\r\t
]*[\\a-zA-Z_0-9]+,?\\)+[\r\t ]*{$"))
(setq
- previous-bracket-level
- (+ previous-bracket-level tab-width)))
-
- ;; echo 'Something' .
- ;; 'something';
- (when (and
- (string-match-p
- "^[\t ]*\\(echo\\|print\\|return\\|die\\)"
- previous-line-string)
- (not
- (string-match-p
- ";[\t ]*$"
- previous-line-string)))
+ new-indentation
+ (- new-indentation tab-width)))
+
+ ;; if (true)
+ ;; echo 'Something';
+ ;; or
+ ;; while (true)
+ ;; echo 'Something';
+ ;; or
+ ;; if (true):
+ ;; echo 'Something';
+ ;; or
+ ;; while (true):
+ ;; echo 'Something';
+ ;; or
+ ;; for ($i = 0; $i < 10; $i++):
+ ;; echo 'Something';
+ ;; or
+ ;; foreach ($array as $value):
+ ;; echo 'Something';
+ ((and
+ current-line-ends-with-terminus
+ (string= current-line-ends-with-terminus ";")
+ (string-match-p
+ "^[\t ]*\\(if\\|while\\|for\\|foreach\\)[\t ]*(.+):?$"
+ previous-line-string))
+ (setq new-indentation
+ (+ new-indentation tab-width)))
+
+ ;; echo <<<VAR
+ ;; abc
+ ;; or
+ ;; echo <<<'VAR'
+ ;; abc
+ ;; or
+ ;; echo <<<"VAR"
+ ;; abc
+ ((string-match-p
+ "<<<'?\"?[a-zA-Z0-9]+'?\"?$"
+ previous-line-string)
(setq
- previous-bracket-level
- (+ previous-bracket-level tab-width)))
-
- ;; else
- ;; echo 'Something';
- ;; or
- ;; else if (true)
- ;; echo 'Something';
- ;; or
- ;; elseif (true)
- ;; echo 'Something';
- ;; or
- ;; else:
- ;; echo 'Something';
- ;; or
- ;; else if (true):
- ;; echo 'Something';
- ;; or
- ;; elseif (true):
- ;; echo 'Something';
- (when (and
- current-line-ends-with-terminus
- (string=
- current-line-ends-with-terminus
- ";")
- (string-match-p
- "^[\t ]*else\\([\t ]*$\\|.*\\()\\|:\\)$\\)"
- previous-line-string))
+ new-indentation
+ 0))
+
+ ;; $var = 'A line' .
+ ;; 'something';
+ ((and
+ (string-match-p
+ "^[\t ]*$[a-zA-Z0-9]+[\t ]*="
+ previous-line-string)
+ (not
+ (string-match-p
+ ";[\t ]*$"
+ previous-line-string)))
(setq
new-indentation
(+ new-indentation tab-width)))
-
- (when (and
- previous-line-ends-with-terminus
- (string=
- previous-line-ends-with-terminus
- ";"))
-
- ;; if (true)
- ;; echo 'Something';
- ;; else
- ;; or
- ;; if (true):
- ;; echo 'Something';
- ;; else:
- ;; or
- ;; if (true)
- ;; echo 'Something';
- ;; elseif (false)
- ;; or
- ;; if (true):
- ;; echo 'Something';
- ;; elseif (false):
- ;; or
- ;; if (true):
- ;; echo 'Something';
- ;; endif;
- ;; or
- ;; while (true):
- ;; echo 'Something';
- ;; endwhile;
- ;; or
- ;; for ($i = 0; $i < 10; $i++):
- ;; echo 'Something';
- ;; endfor;
- ;; or
- ;; foreach ($array as $value):
- ;; echo 'Something';
- ;; endforeach;
- (when (string-match-p
- "^[\t ]*\\(else:?[\t ]*$\\|else.*):?$\\|endif;[\t
]*$\\|endfor;[\t ]*$\\|endforeach;[\t ]*$\\|endwhile;[\t ]*$\\)"
- current-line-string)
- (setq
- new-indentation
- (-
- new-indentation
- tab-width)))
-
- ;; if (true)
- ;; echo 'Something';
- ;; else
- ;; echo 'Something else';
- ;; echo true;
- ;; or
- ;; if (true)
- ;; echo 'Something';
- ;; echo 'Something else';
- ;; or
- ;; when (true)
- ;; echo 'Something';
- ;; echo 'Afterwards';
- ;; or
- ;; elseif (true)
- ;; echo 'Something';
- ;; echo 'Afterwards';
- (when (string-match-p
- "^[\t ]*\\(else[\t ]*$\\|else.*)[\t
]*$\\|if.*)$\\|while.*)$\\)"
- previous2-line-string)
- (setq
- new-indentation
- (-
- new-indentation
- tab-width)))
-
- )
-
- ;; $variable = array(
- ;; 'random' =>
- ;; 'hello'
- ;; );
- ;; or
- ;; $variable = [
- ;; 'random' =>
- ;; 'hello'
- ;; ];
- (when
+
+ ;; echo 'Something' .
+ ;; 'something';
+ ((and
+ (string-match-p
+ "^[\t ]*\\(echo\\|print\\|return\\|die\\)"
+ previous-line-string)
+ (not
(string-match-p
- "^[\t ]*\\()\\|]\\);[\t ]*$"
- current-line-string)
+ ";[\t ]*$"
+ previous-line-string)))
+ (setq
+ new-indentation
+ (+ new-indentation tab-width)))
+
+ ;; else
+ ;; echo 'Something';
+ ;; or
+ ;; else if (true)
+ ;; echo 'Something';
+ ;; or
+ ;; elseif (true)
+ ;; echo 'Something';
+ ;; or
+ ;; else:
+ ;; echo 'Something';
+ ;; or
+ ;; else if (true):
+ ;; echo 'Something';
+ ;; or
+ ;; elseif (true):
+ ;; echo 'Something';
+ ((and
+ current-line-ends-with-terminus
+ (string=
+ current-line-ends-with-terminus
+ ";")
+ (string-match-p
+ "^[\t ]*else\\([\t ]*$\\|.*\\()\\|:\\)$\\)"
+ previous-line-string))
+ (setq
+ new-indentation
+ (+ new-indentation tab-width)))
+
+ ;; if (true)
+ ;; echo 'Something';
+ ;; else
+ ;; or
+ ;; if (true):
+ ;; echo 'Something';
+ ;; else:
+ ;; or
+ ;; if (true)
+ ;; echo 'Something';
+ ;; elseif (false)
+ ;; or
+ ;; if (true):
+ ;; echo 'Something';
+ ;; elseif (false):
+ ;; or
+ ;; if (true):
+ ;; echo 'Something';
+ ;; endif;
+ ;; or
+ ;; while (true):
+ ;; echo 'Something';
+ ;; endwhile;
+ ;; or
+ ;; for ($i = 0; $i < 10; $i++):
+ ;; echo 'Something';
+ ;; endfor;
+ ;; or
+ ;; foreach ($array as $value):
+ ;; echo 'Something';
+ ;; endforeach;
+ ((and
+ previous-line-ends-with-terminus
+ (string=
+ previous-line-ends-with-terminus
+ ";")
+ (string-match-p
+ "^[\t ]*\\(else:?[\t ]*$\\|else.*):?$\\|endif;[\t
]*$\\|endfor;[\t ]*$\\|endforeach;[\t ]*$\\|endwhile;[\t ]*$\\)"
+ current-line-string))
+ (setq
+ new-indentation
+ (-
+ new-indentation
+ tab-width)))
+
+ ;; if (true)
+ ;; echo 'Something';
+ ;; else
+ ;; echo 'Something else';
+ ;; echo true;
+ ;; or
+ ;; if (true)
+ ;; echo 'Something';
+ ;; echo 'Something else';
+ ;; or
+ ;; when (true)
+ ;; echo 'Something';
+ ;; echo 'Afterwards';
+ ;; or
+ ;; elseif (true)
+ ;; echo 'Something';
+ ;; echo 'Afterwards';
+ ((and
+ previous-line-ends-with-terminus
+ (string=
+ previous-line-ends-with-terminus
+ ";")
+ (string-match-p
+ "^[\t ]*\\(else[\t ]*$\\|else.*)[\t
]*$\\|if.*)$\\|while.*)$\\)"
+ previous2-line-string))
+ (setq
+ new-indentation
+ (-
+ new-indentation
+ tab-width)))
+
+ ;; $variable = array(
+ ;; 'random' =>
+ ;; 'hello'
+ ;; );
+ ;; or
+ ;; $variable = [
+ ;; 'random' =>
+ ;; 'hello'
+ ;; ];
+ ((string-match-p
+ "^[\t ]*\\()\\|]\\);[\t ]*$"
+ current-line-string)
(let ((old-point (point))
(still-looking t)
(bracket-count -1))
@@ -486,30 +526,28 @@
bracket-start-indentation)))
;; Reset point
- (goto-char old-point))
-
- )
-
- ;; echo 'Something'
- ;; . 'more';
- ;; or
- ;; echo
- ;; 'Something'
- ;; . 'more';
- ;; or
- ;; echo 'Something' .
- ;; 'more';
- ;; or
- ;; echo
- ;; 'Something' .
- ;; 'more';
- (when (or
- (string-match-p
- "^[\t ]*\\."
- current-line-string)
- (string-match-p
- "\\.[\t ]*$"
- previous-line-string))
+ (goto-char old-point)))
+
+ ;; echo 'Something'
+ ;; . 'more';
+ ;; or
+ ;; echo
+ ;; 'Something'
+ ;; . 'more';
+ ;; or
+ ;; echo 'Something' .
+ ;; 'more';
+ ;; or
+ ;; echo
+ ;; 'Something' .
+ ;; 'more';
+ ((or
+ (string-match-p
+ "^[\t ]*\\."
+ current-line-string)
+ (string-match-p
+ "\\.[\t ]*$"
+ previous-line-string))
;; If previous line matched ending .
;; we must backtrack at least two lines
@@ -575,61 +613,61 @@
;; Reset point
(goto-char old-point)))
- ;; case true:
- ;; echo 'here';
- ;; or
- ;; case true;
- ;; echo 'here';
- ;; or
- ;; default:
- ;; echo 'here';
- ;; or
- ;; default;
- ;; echo 'here';
- (when (and
- (not
- (string-match-p
- "^[\t ]*\\(case[\t ]+\\|default\\)"
- current-line-string))
- (or
- (string-match-p
- "^[\t ]*case[\t ]+.*\\(;\\|:\\)[\t ]*$"
- previous-line-string)
- (string-match-p
- "^[\t ]*default.*\\(;\\|:\\)[\t ]*$"
- previous-line-string)))
+ ;; case true:
+ ;; echo 'here';
+ ;; or
+ ;; case true;
+ ;; echo 'here';
+ ;; or
+ ;; default:
+ ;; echo 'here';
+ ;; or
+ ;; default;
+ ;; echo 'here';
+ ((and
+ (not
+ (string-match-p
+ "^[\t ]*\\(case[\t ]+\\|default\\)"
+ current-line-string))
+ (or
+ (string-match-p
+ "^[\t ]*case[\t ]+.*\\(;\\|:\\)[\t ]*$"
+ previous-line-string)
+ (string-match-p
+ "^[\t ]*default.*\\(;\\|:\\)[\t ]*$"
+ previous-line-string)))
(setq
- previous-bracket-level
- (+ previous-bracket-level tab-width)))
-
- ;; case true:
- ;; echo 'here';
- ;; case false:
- ;; or
- ;; case true:
- ;; echo 'here';
- ;; default:
- (when (and
- (not previous-line-ends-with-opening-bracket)
- (not (string-match-p ":[\t ]*$" previous-line-string))
- (or
- (string-match-p
- "^[\t ]*case[\t ]+.*\\(;\\|:\\)[\t ]*$"
- current-line-string)
- (string-match-p
- "^[\t ]*default.*\\(;\\|:\\)[\t ]*$"
- current-line-string)))
+ new-indentation
+ (+ new-indentation tab-width)))
+
+ ;; case true:
+ ;; echo 'here';
+ ;; case false:
+ ;; or
+ ;; case true:
+ ;; echo 'here';
+ ;; default:
+ ((and
+ (not previous-line-ends-with-opening-bracket)
+ (not (string-match-p ":[\t ]*$" previous-line-string))
+ (or
+ (string-match-p
+ "^[\t ]*case[\t ]+.*\\(;\\|:\\)[\t ]*$"
+ current-line-string)
+ (string-match-p
+ "^[\t ]*default.*\\(;\\|:\\)[\t ]*$"
+ current-line-string)))
(setq
new-indentation
(- new-indentation tab-width)))
- ;; switch ($condition) {
- ;; case true:
- ;; echo 'here';
- ;; }
- (when (and
- current-line-starts-with-closing-bracket
- (string= current-line-starts-with-closing-bracket "}"))
+ ;; switch ($condition) {
+ ;; case true:
+ ;; echo 'here';
+ ;; }
+ ((and
+ current-line-starts-with-closing-bracket
+ (string= current-line-starts-with-closing-bracket "}"))
(let ((old-point (point))
(end-of-switch-statement))
(when (search-backward-regexp "[{}]" nil t)
@@ -645,82 +683,65 @@
end-of-switch-statement
t))))
(goto-char old-point)
- (when end-of-switch-statement
+
+ ;; Ignore cases like
+ ;; if (true) {
+ ;; }
+ ;; or
+ ;; switch($var) {
+ ;; }
+ (unless previous-line-ends-with-opening-bracket
+
+ ;; if (true) {
+ ;; echo 'here';
(setq
new-indentation
- (- new-indentation tab-width))))))
-
- ;; switch (blala):
- ;; case bla:
- ;; echo 'bla';
- ;; endswitch;
- (when (and
- (string-match-p
- "^[\t ]*endswitch[\t ]*;[\t ]*$"
- current-line-string)
- (not
- (string-match-p
- "^[\t ]*switch"
- previous-line-string)))
+ (- new-indentation tab-width))
+
+ ;; switch($match) {
+ ;; case 'here':
+ ;; echo 'there';
+ ;; }
+ (when end-of-switch-statement
+ (setq
+ new-indentation
+ (- new-indentation tab-width)))))))
+
+ ;; switch (blala):
+ ;; case bla:
+ ;; echo 'bla';
+ ;; endswitch;
+ ((and
+ (string-match-p
+ "^[\t ]*endswitch[\t ]*;[\t ]*$"
+ current-line-string)
+ (not
+ (string-match-p
+ "^[\t ]*switch"
+ previous-line-string)))
(setq
new-indentation
(- new-indentation tab-width tab-width)))
- ;; switch ($array):
- ;; case 'Something';
- (when (and
- (string-match-p
- "^[\t ]*\\(case.+\\|default\\)\\(;\\|:\\)[\t ]*$"
- current-line-string)
- (string-match-p
- "^[\t ]*\\(switch\\)[\t ]*(.+):$"
- previous-line-string))
- (setq new-indentation (+ new-indentation tab-width)))
-
-
-
- (when (> previous-bracket-level 0)
- (if (< previous-bracket-level tab-width)
- (setq new-indentation (+ new-indentation 1))
- (setq new-indentation (+ new-indentation tab-width))))
-
- (when (= previous-bracket-level -1)
- (setq new-indentation (1- new-indentation)))
-
- (when (and (= previous-bracket-level 0)
- previous-line-starts-with-closing-bracket)
- (setq new-indentation (+ new-indentation tab-width)))
-
- (when current-line-starts-with-closing-bracket
- (setq new-indentation (- new-indentation tab-width)))
-
- (when (and
- previous-line-starts-with-opening-doc-comment
- (not previous-line-starts-with-closing-doc-comment))
- (setq new-indentation (+ new-indentation 1)))
-
- (when (and
- previous-line-ends-with-assignment
- (<= previous-bracket-level 0))
- (setq new-indentation (+ new-indentation tab-width)))
-
- (when (and
- previous-line-ends-with-opening-bracket
- (< previous-bracket-level 0))
- (setq new-indentation (+ new-indentation tab-width)))
-
-
- ;; $var .=
- ;; 'hello';
- ;; echo 'here';
- ;; or
- ;; $var =
- ;; 25;
- ;; echo 'here';
- (when (and
- previous-line-ends-with-terminus
- (string= previous-line-ends-with-terminus ";")
- (not (string-match-p "^[\t ]*\\(echo[\t ]+\\|print[\t
]+\\)" previous-line-string)))
+ ;; $var .=
+ ;; 'hello';
+ ;; echo 'here';
+ ;; or
+ ;; $var =
+ ;; 25;
+ ;; echo 'here';
+ ;; or
+ ;; $var = array(
+ ;; 'here'
+ ;; );
+ ;; echo 'here';
+ ((and
+ previous-line-ends-with-terminus
+ (string= previous-line-ends-with-terminus ";")
+ (not
+ (string-match-p
+ "^[\t ]*\\(echo[\t ]+\\|print[\t ]+\\)"
+ previous-line-string)))
;; Back-trace buffer from previous line
;; Determine if semi-colon ended an multi-line assignment or
bracket-less command or not
@@ -732,62 +753,150 @@
(let ((not-found t)
(is-assignment nil)
(parenthesis-level 0)
- (is-bracket-less-command nil))
+ (is-bracket-less-command nil)
+ (is-same-line-p t))
(while (and
not-found
- (search-backward-regexp
"\\(;\\|{\\|(\\|)\\|=\\|echo[\t ]+\\|print[\t ]+\\)" nil t))
- (let ((match (buffer-substring-no-properties
(match-beginning 0) (match-end 0))))
- (when (string= match ")")
- (setq parenthesis-level (1- parenthesis-level)))
- (when (= parenthesis-level 0)
- (setq is-assignment (string= match "="))
- (setq is-bracket-less-command
- (string-match-p
- "\\(echo[\t ]+\\|print[\t ]+\\)"
- match))
- (setq not-found nil))
-
- (when (string= match "(")
- (setq parenthesis-level (1+ parenthesis-level)))))
-
- ;; If it ended an assignment on a previous line, decrease
indentation
- (when (or
- is-assignment
- is-bracket-less-command)
+ (search-backward-regexp
"\\(;\\|{\\|(\\|)\\|=\\|echo[\t ]+\\|print[\t ]+\\|\n\\)" nil t))
+ (let ((match
+ (buffer-substring-no-properties
+ (match-beginning 0) (match-end 0))))
+ (cond
+ ((string= match "\n")
+ (setq is-same-line-p nil))
+ (t
+ (when (string= match ")")
+ (setq parenthesis-level (1- parenthesis-level)))
+ (when (= parenthesis-level 0)
+ (setq is-assignment (string= match "="))
+ (setq is-bracket-less-command
+ (string-match-p
+ "\\(echo[\t ]+\\|print[\t ]+\\)"
+ match))
+ (setq not-found nil))
+
+ (when (string= match "(")
+ (setq
+ parenthesis-level
+ (1+ parenthesis-level)))))))
+
+ ;; echo 'there' .
+ ;; 'here';
+ ;; echo 'here';
+ ;; or
+ ;; print 'there' .
+ ;; 'here';
+ ;; echo 'here';
+ ;; or
+ ;; $var =
+ ;; 'opkeokoek';
+ ;; echo 'here'
+
+ ;; ignore cases like
+ ;; $var = array(
+ ;; 'here'
+ ;; );
+ ;; echo 'here';
+ (when (and
+ (not is-same-line-p)
+ (or
+ (and
+ is-assignment
+ (= previous-bracket-level 0))
+ is-bracket-less-command))
;; NOTE stuff like $var = array(\n 4\n);\n
;; will end assignment but also decrease
previous-bracket-level
- (setq new-indentation (- new-indentation tab-width))))
+ (setq
+ new-indentation
+ (- new-indentation tab-width))))
(goto-char point))
- ;; echo <<<VAR
- ;; abc
- ;; or
- ;; echo <<<'VAR'
- ;; abc
- ;; or
- ;; echo <<<"VAR"
- ;; abc
- (when
- (string-match-p
- "<<<'?\"?[a-zA-Z0-9]+'?\"?$"
- previous-line-string)
- (setq new-indentation 0))
+ ;; switch ($array):
+ ;; case 'Something';
+ ((and
+ (string-match-p
+ "^[\t ]*\\(case.+\\|default\\)\\(;\\|:\\)[\t ]*$"
+ current-line-string)
+ (string-match-p
+ "^[\t ]*\\(switch\\)[\t ]*(.+):$"
+ previous-line-string))
+ (setq
+ new-indentation
+ (+ new-indentation tab-width)))
+
+ ;; /**
+ ;; *
+ ;; */
+ ;; echo 'here';
+ ((= previous-bracket-level -1)
+ (setq
+ new-indentation
+ (1- new-indentation)))
+
+ ;; /**
+ ;; *
+ ((= previous-bracket-level 1)
+ (setq
+ new-indentation
+ (+ new-indentation 1)))
+
+ ;; array(
+ ;; 'here'
+ ;; or
+ ;; [[
+ ;; 'here'
+ ;; or
+ ;; if (something) {
+ ;; echo 'here';
+ ((>= previous-bracket-level tab-width)
+ (setq
+ new-indentation
+ (+ new-indentation tab-width)))
+
+ ((and (= previous-bracket-level 0)
+ previous-line-starts-with-closing-bracket)
+ (setq
+ new-indentation
+ (+ new-indentation tab-width)))
+
+ ;; [
+ ;; 'hello'
+ ;; ]
+ ;; or
+ ;; array(
+ ;; 'hello'
+ ;; )
+ ((and
+ current-line-starts-with-closing-bracket
+ (not previous-line-ends-with-opening-bracket))
+ (setq
+ new-indentation
+ (- new-indentation tab-width)))
+ ((and
+ previous-line-starts-with-opening-doc-comment
+ (not previous-line-starts-with-closing-doc-comment))
+ (setq
+ new-indentation
+ (+ new-indentation 1)))
- ;; Decrease indentation if current line decreases in bracket
level
- (when (< new-indentation 0)
- (setq new-indentation 0))
+ ((and
+ previous-line-ends-with-assignment
+ (<= previous-bracket-level 0))
+ (setq
+ new-indentation
+ (+ new-indentation tab-width)))
+ ((and
+ previous-line-ends-with-opening-bracket
+ (< previous-bracket-level 0))
+ (setq
+ new-indentation
+ (+ new-indentation tab-width)))
- ;; (message "\ncurrent-line-string: %S" current-line-string)
- ;; (message "current-line-starts-with-closing-bracket: %S"
current-line-starts-with-closing-bracket)
- ;; (message "previous-line-string: %S" previous-line-string)
- ;; (message "previous-line-starts-with-opening-doc-comment: %S"
previous-line-starts-with-opening-doc-comment)
- ;; (message "previous-bracket-level: %S" previous-bracket-level)
- ;; (message "previous-indentation: %S" previous-indentation)
- ;; (message "new-indentation: %S" new-indentation)
+ )
(indent-line-to new-indentation)))))
;; Only move to end of line if point is the current point and is at end
of line
diff --git a/test/phps-mode-test-indent.el b/test/phps-mode-test-indent.el
index 9afe572640..74d2609f23 100644
--- a/test/phps-mode-test-indent.el
+++ b/test/phps-mode-test-indent.el
@@ -479,10 +479,6 @@
"<?php\nif (true) {\n if ($configuration::load(\n
self::getParameter(self::PARAMETER_CONFIGURATION_INTERNAL_FILENAME),\n
self::getParameter(self::PARAMETER_CONFIGURATION_EXTERNAL_FILENAME),\n
self::getParameter(self::PARAMETER_STRUCTURE_INTERNAL_FILENAME),\n
self::getParameter(self::PARAMETER_STRUCTURE_EXTERNAL_FILENAME))\n ) {\n
echo 'was here';\n }\n}\n"
"If expression spanning multiple lines 3")
- (phps-mode-test-indent--should-equal
- "<?php\nif (myFunction(true)\n) {\n echo 'was here';\n}\n"
- "If expression spanning multiple lines 4")
-
(phps-mode-test-indent--should-equal
"<?php\nif (myFunction(\n true)\n) {\n echo 'was here';\n}\n"
"If expression spanning multiple lines 5")
- [elpa] externals/phps-mode c9f715a1fd 093/212: Improved comments, (continued)
- [elpa] externals/phps-mode c9f715a1fd 093/212: Improved comments, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode f0ab7a2cdb 095/212: Passed tests for inline control structures, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 08f57c1d36 107/212: Added TODO item for indent, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 3853ddf32a 099/212: Passed another concatenation test for indentation, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 1ed09d42f5 111/212: Passing another indent test, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode d205d8392f 113/212: Passed another indent test, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 1a62f48783 130/212: Improved indentation in cases with multi-expressions last line does not start with closing bracket, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode a3b9559880 121/212: Improved indent support for nested switch case, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode b4bf3caeb3 118/212: Added TODO note, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode b9956e278f 120/212: Indent support for closing bracket after closing multi-line assignment, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 4b4a821e6e 115/212: Started refactor of indent code,
Christian Johansson <=
- [elpa] externals/phps-mode 20ad1fae08 132/212: Improved indentation arround multi-line object operators, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 5f09905a1a 126/212: Fixed issue with bookkeeping and imenu not being stored, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode dc361309e0 124/212: Passing all indentation tests, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode a62e6be40e 133/212: Fixed indentation on line after print_r, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 5391551287 143/212: Added a new indent test and made it pass, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode ffda8f1b5c 128/212: Added TODO item, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 2ef1168cb1 155/212: Added new failing indentation tests, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 519888fe79 150/212: Added another failing indent test, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 7ec071188a 137/212: Added more indent unit tests for nested function calls, Christian Johansson, 2022/01/26
- [elpa] externals/phps-mode 837412c0e5 140/212: Improved indentation on lines starting with a closing bracket, Christian Johansson, 2022/01/26