[elpa] externals/phps-mode cd3d1ff: Improved alternative indentation after doc comment blocks

[Christian Johansson]

branch: externals/phps-mode
commit cd3d1ffcf57cd9fa41a8cbe7c3d3fa30db6ccf97
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    Improved alternative indentation after doc comment blocks
---
 phps-mode-lex-analyzer.el           | 6 +++---
 phps-mode.el                        | 4 ++--
 test/phps-mode-test-lex-analyzer.el | 8 ++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index f9a2ecb..8b74245 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -2089,7 +2089,7 @@ SQUARE-BRACKET-LEVEL and ROUND-BRACKET-LEVEL."
          (string-match-p "^[ \t\f\r\n]*$" string)))
     (unless line-is-empty
       (while (string-match
-              "\\([\]{}()[]\\|<[a-zA-Z]+\\|</[a-zA-Z]+\\|/>\\|^/\\*\\*\\|^ 
\\*/\\)"
+              "\\([\]{}()[]\\|<[a-zA-Z]+\\|</[a-zA-Z]+\\|/>\\|^[\t 
]/\\*\\*\\|^[\t\\* ]*\\*/\\)"
               string
               start)
         (setq start (match-end 0))
@@ -2102,11 +2102,11 @@ SQUARE-BRACKET-LEVEL and ROUND-BRACKET-LEVEL."
              (string= bracket "<")
              (string-match "<[a-zA-Z]+" bracket))
             (setq bracket-level (+ bracket-level tab-width)))
-           ((string-match "^ \\*/" bracket )
+           ((string-match "^[\t\\* ]*\\*/" bracket )
             (setq bracket-level (- bracket-level 1)))
            ((or
              (string-match "^/\\*\\*" bracket)
-             (string-match "^ \\*" bracket))
+             (string-match "^[\t ]*\\*" bracket))
             (setq bracket-level (+ bracket-level 1)))
            (t
             (setq bracket-level (- bracket-level tab-width)))))))
diff --git a/phps-mode.el b/phps-mode.el
index 2555c2e..f9758d6 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -5,8 +5,8 @@
 ;; Author: Christian Johansson <address@hidden>
 ;; Maintainer: Christian Johansson <address@hidden>
 ;; Created: 3 Mar 2018
-;; Modified: 15 Apr 2020
-;; Version: 0.3.41
+;; Modified: 16 Apr 2020
+;; Version: 0.3.42
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-phps-mode
 
diff --git a/test/phps-mode-test-lex-analyzer.el 
b/test/phps-mode-test-lex-analyzer.el
index 625574d..9e6d617 100644
--- a/test/phps-mode-test-lex-analyzer.el
+++ b/test/phps-mode-test-lex-analyzer.el
@@ -179,6 +179,14 @@
               "/**\n *\n */\n"))))
 
   (phps-mode-test--with-buffer
+   "/**\n *\n **/\n"
+   "Alternative indentation on line after closing of doc comment block variant 
2"
+   (goto-char 13)
+   (should (equal
+            (phps-mode-lex-analyzer--alternative-indentation)
+            0)))
+
+  (phps-mode-test--with-buffer
    "$var = 'abc';\n// Comment"
    "Alternative indentation on single-line assignment"
    (goto-char 1)