branch: externals/phps-mode
commit daff4ad5e0d49593375f46181fcfd4eb8dd24a89
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
More work on indentation
---
phps-mode-indent.el | 316 +++++++++++++++++++++++-------------------
test/phps-mode-test-indent.el | 1 +
2 files changed, 171 insertions(+), 146 deletions(-)
diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index 4e85d52a40..c693027643 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -10,163 +10,187 @@
;;; Code:
-(defun phps-mode-indent-line (&optional point)
- "Apply alternative indentation at POINT here."
- (unless point
- (setq point (point)))
- (let ((new-indentation 0)
- (point-at-end-of-line (equal point (line-end-position))))
- (save-excursion
- (let ((line-number (line-number-at-pos point))
- (move-length 0)
- (line-is-empty t)
- line-beginning-position
- line-end-position
- line-string
- current-line-string)
- (goto-char point)
- (setq
- current-line-string
- (buffer-substring-no-properties
- (line-beginning-position)
- (line-end-position))
- )
- (if (> line-number 1)
- (progn
- (while (and
- (> line-number 0)
- line-is-empty)
- (forward-line -1)
- (setq line-number (1- line-number))
- (beginning-of-line)
- (setq line-beginning-position (line-beginning-position))
- (setq line-end-position (line-end-position))
- (setq
- line-string
- (buffer-substring-no-properties line-beginning-position
line-end-position))
- (setq line-is-empty (string-match-p "^[ \t\f\r\n]*$"
line-string))
- (setq move-length (1+ move-length)))
-
- (unless line-is-empty
- (let* ((old-indentation (current-indentation))
- (current-line-starts-with-closing-bracket
(phps-mode-indent--string-starts-with-closing-bracket-p current-line-string))
- (line-starts-with-closing-bracket
(phps-mode-indent--string-starts-with-closing-bracket-p line-string))
- (line-starts-with-opening-doc-comment
(phps-mode-indent--string-starts-with-opening-doc-comment-p line-string))
- (line-ends-with-assignment
(phps-mode-indent--string-ends-with-assignment-p line-string))
- (line-ends-with-opening-bracket
(phps-mode-indent--string-ends-with-opening-bracket-p line-string))
- (line-ends-with-terminus
(phps-mode-indent--string-ends-with-terminus-p line-string))
- (bracket-level
(phps-mode-indent--get-string-brackets-count line-string)))
- (setq new-indentation old-indentation)
- (goto-char point)
-
- (when (> bracket-level 0)
- (if (< bracket-level tab-width)
- (setq new-indentation (+ new-indentation 1))
- (setq new-indentation (+ new-indentation tab-width))))
-
- (when (= bracket-level -1)
- (setq new-indentation (1- new-indentation)))
-
- (when (and (= bracket-level 0)
- 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 line-starts-with-opening-doc-comment
- (setq new-indentation (+ new-indentation 1)))
-
- (when (and
- line-ends-with-assignment
- (<= bracket-level 0))
- (setq new-indentation (+ new-indentation tab-width)))
-
- (when (and
- line-ends-with-opening-bracket
- (< bracket-level 0))
- (setq new-indentation (+ new-indentation tab-width)))
-
- (when line-ends-with-terminus
- ;; Back-trace buffer from previous line
- ;; Determine if semi-colon ended an assignment or
bracket-less command or not
- (forward-line (* -1 move-length))
- (end-of-line)
- (forward-char -1)
- (let ((not-found t)
- (is-assignment nil)
- (parenthesis-level 0)
- (is-bracket-less-command nil))
- (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
- (and
- (or
- (and
- is-assignment
- (> bracket-level -1))
- is-bracket-less-command)
- (not (= line-number (line-number-at-pos))))
- ;; NOTE stuff like $var = array(\n 4\n);\n
- ;; will end assignment but also decrease bracket-level
- (setq new-indentation (- new-indentation tab-width))))
-
- (goto-char point))
-
- ;; Decrease indentation if current line decreases in bracket
level
- (when (< new-indentation 0)
- (setq new-indentation 0))
-
- (indent-line-to new-indentation))))
- (indent-line-to 0))))
- ;; Only move to end of line if point is the current point and is at end of
line
- (when (equal point (point))
- (if point-at-end-of-line
- (end-of-line)
- (back-to-indentation)))
- new-indentation))
-
-(defun phps-mode-indent--get-string-brackets-count (string)
- "Get bracket count for STRING."
+(defun phps-mode-indent-line (&optional initial-point)
+ "Apply alternative indentation at INITIAL-POINT here."
+ (let ((point))
+ (if initial-point
+ (setq point initial-point)
+ (setq point (point)))
+
+ (let ((new-indentation 0)
+ (point-at-end-of-line (equal point (line-end-position))))
+ (save-excursion
+ (let ((move-length 0)
+ (line-is-empty-p t)
+ (line-beginning-position)
+ (line-end-position)
+ (line-string)
+ (current-line-string))
+
+ (when initial-point
+ (goto-char point))
+
+ ;; Current line is line at initial point
+ (setq
+ current-line-string
+ (buffer-substring-no-properties
+ (line-beginning-position)
+ (line-end-position)))
+
+ (message "Current line: %S" current-line-string)
+
+ ;; Try to find previous non-empty line
+ (while (and
+ (= (forward-line -1) 0)
+ line-is-empty-p)
+ (beginning-of-line)
+ (setq
+ line-beginning-position (line-beginning-position))
+ (setq
+ line-end-position (line-end-position))
+ (setq
+ line-string
+ (buffer-substring-no-properties line-beginning-position
line-end-position))
+ (setq
+ line-is-empty-p (string-match-p "^[ \t\f\r\n]*$" line-string))
+ (setq
+ move-length (1+ move-length)))
+
+ (message "Previous non-empty line: %S" line-string)
+
+ (if line-is-empty-p
+ (indent-line-to 0)
+ (let* ((old-indentation (current-indentation))
+ (current-line-starts-with-closing-bracket
(phps-mode-indent--string-starts-with-closing-bracket-p current-line-string))
+ (line-starts-with-closing-bracket
(phps-mode-indent--string-starts-with-closing-bracket-p line-string))
+ (line-starts-with-opening-doc-comment
(phps-mode-indent--string-starts-with-opening-doc-comment-p line-string))
+ (line-ends-with-assignment
(phps-mode-indent--string-ends-with-assignment-p line-string))
+ (line-ends-with-opening-bracket
(phps-mode-indent--string-ends-with-opening-bracket-p line-string))
+ (line-ends-with-terminus
(phps-mode-indent--string-ends-with-terminus-p line-string))
+ (bracket-level (phps-mode-indent--get-string-brackets-count
line-string))
+ (line-ends-with-implements-p (string-match-p "[\t
]+implements$" line-string)))
+ (setq new-indentation old-indentation)
+ (goto-char point)
+
+ (when line-ends-with-implements-p
+ (setq bracket-level (+ tab-width)))
+
+ (when (> bracket-level 0)
+ (if (< bracket-level tab-width)
+ (setq new-indentation (+ new-indentation 1))
+ (setq new-indentation (+ new-indentation tab-width))))
+
+ (when (= bracket-level -1)
+ (setq new-indentation (1- new-indentation)))
+
+ (when (and (= bracket-level 0)
+ 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 line-starts-with-opening-doc-comment
+ (setq new-indentation (+ new-indentation 1)))
+
+ (when (and
+ line-ends-with-assignment
+ (<= bracket-level 0))
+ (setq new-indentation (+ new-indentation tab-width)))
+
+ (when (and
+ line-ends-with-opening-bracket
+ (< bracket-level 0))
+ (setq new-indentation (+ new-indentation tab-width)))
+
+ (when line-ends-with-terminus
+ ;; Back-trace buffer from previous line
+ ;; Determine if semi-colon ended an assignment or bracket-less
command or not
+ (forward-line (* -1 move-length))
+ (end-of-line)
+ (forward-char -1)
+ (let ((not-found t)
+ (is-assignment nil)
+ (parenthesis-level 0)
+ (is-bracket-less-command nil))
+ (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
+ (and
+ (or
+ (and
+ is-assignment
+ (> bracket-level -1))
+ is-bracket-less-command))
+
+ ;; NOTE stuff like $var = array(\n 4\n);\n
+ ;; will end assignment but also decrease bracket-level
+ (setq new-indentation (- new-indentation tab-width))))
+
+ (goto-char point))
+
+ ;; Decrease indentation if current line decreases in bracket
level
+ (when (< new-indentation 0)
+ (setq new-indentation 0))
+
+ (indent-line-to new-indentation)))))
+ ;; Only move to end of line if point is the current point and is at end
of line
+ (when (equal point (point))
+ (if point-at-end-of-line
+ (end-of-line)
+ (back-to-indentation)))
+ new-indentation)))
+
+(defun phps-mode-indent--get-string-brackets-count
+ (string &optional html-mode)
+ "Get bracket count for STRING optionally in HTML-MODE."
(let ((bracket-level 0)
(start 0)
(line-is-empty
- (string-match-p "^[ \t\f\r\n]*$" string)))
+ (string-match-p "^[ \t\f\r\n]*$" string))
+ (test-string "\\([\]{}()[]\\|^[\t ]/\\*\\*\\|^[\t\\* ]*\\*/\\)"))
+ (when html-mode
+ (setq
+ test-string
+ "\\([\]{}()[]\\|<[a-zA-Z]+\\|</[a-zA-Z]+\\|/>\\|^[\t ]/\\*\\*\\|^[\t\\*
]*\\*/\\)"))
(unless line-is-empty
- (while (string-match
- "\\([\]{}()[]\\|<[a-zA-Z]+\\|</[a-zA-Z]+\\|/>\\|^[\t
]/\\*\\*\\|^[\t\\* ]*\\*/\\)"
- string
- start)
- (setq start (match-end 0))
+ ;; (message "string: %S" string)
+ (while
+ (string-match
+ test-string
+ string
+ start)
+ (setq
+ start
+ (match-end 0))
(let ((bracket (substring string (match-beginning 0) (match-end 0))))
+ ;; (message "bracket: %S from %S" bracket string)
(cond
((or
(string= bracket "{")
(string= bracket "[")
(string= bracket "(")
- (string= bracket "<")
- (string-match "<[a-zA-Z]+" bracket))
+ (string= bracket "<"))
(setq bracket-level (+ bracket-level tab-width)))
- ((string-match "^[\t\\* ]*\\*/" bracket )
+ ((string-match "^[\t\\* ]*\\*/" bracket)
(setq bracket-level (- bracket-level 1)))
- ((or
- (string-match "^/\\*\\*" bracket)
- (string-match "^[\t ]*\\*" bracket))
+ ((string-match "^[\t ]/\\*\\*" bracket)
(setq bracket-level (+ bracket-level 1)))
(t
(setq bracket-level (- bracket-level tab-width)))))))
@@ -182,7 +206,7 @@
(defun phps-mode-indent--string-ends-with-opening-bracket-p (string)
"Get bracket count for STRING."
- (string-match-p "\\([\[{(]\\|<[a-zA-Z]+\\)[\t ]*$" string))
+ (string-match-p "\\([\[{(]\\|<[a-zA-Z]+\\|[\t ]+implements\\)[\t ]*$"
string))
(defun phps-mode-indent--string-ends-with-assignment-p (string)
"Get bracket count for STRING."
diff --git a/test/phps-mode-test-indent.el b/test/phps-mode-test-indent.el
index f5ee27e694..92fc0475dc 100644
--- a/test/phps-mode-test-indent.el
+++ b/test/phps-mode-test-indent.el
@@ -29,6 +29,7 @@
(phps-mode-test--with-buffer
string
name
+ (message "Initial buffer:\n%S" string)
(phps-mode-test-indent--indent-whole-buffer)
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(message "Indented buffer:\n%S" buffer-contents)
