emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/phps-mode 9ac4797803 09/15: Passed indentation test for


From: Christian Johansson
Subject: [elpa] externals/phps-mode 9ac4797803 09/15: Passed indentation test for line after comment block
Date: Fri, 4 Mar 2022 14:13:03 -0500 (EST)

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

    Passed indentation test for line after comment block
---
 TODO.md             | 21 ++++-----------------
 phps-mode-indent.el | 14 +++++++-------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/TODO.md b/TODO.md
index ebc8a95cac..55f13d9588 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,20 +1,12 @@
 # TODO
 
-## Indentation
+## Code intelligence
 
-* Case
+* Fix race-condition in incremental parser when running asynchronous using 
threads
 
-```php
-<?php
-if (true) {
-    /*
-    was here
-    */
-    echo 'there';
-}
-```
+Perform an edit while an incremental parse is going to reproduce
 
-## Code intelligence
+Fix by reloading file or running C-r to rescan and clear cache
 
 * Bookkeeping of chained object operators like WC()->cart->subtotal
 * Bookkeeping of variables inside classes with multiple methods seems to not 
work
@@ -22,8 +14,3 @@ if (true) {
 * Catch signaling from AST-generation, bookkeeping and imenu generation
 * Imenu-generation of conditionally defined functions and classes
 * Bookkeeping of class properties inside condition lists
-* Fix race-condition in incremental parser when running asynchronous using 
threads
-
-Perform an edit while an incremental parse is going to reproduce
-
-Fix by reloading file or running C-r to rescan and clear cache
diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index 2fc87c2ca5..250dbc6352 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -373,7 +373,6 @@
       (end-of-line)
       (let ((not-found-bracket-start t)
             (parenthesis-level 0)
-            (string-concatenation)
             (found-chain-on-this-line)
             (reference-line-previous)
             (reference-line-delta)
@@ -394,9 +393,6 @@
              ((string-match-p
                "\\(^[\ t]*\\.\\|\\.[\t ]*$\\)"
                match)
-              (setq
-               string-concatenation
-               t)
               (setq
                not-found-bracket-start
                nil))
@@ -1166,9 +1162,13 @@
                 (setq
                  match-type
                  'line-after-ending-of-doc-comment)
-                (setq
-                 new-indentation
-                 (1- new-indentation)))
+                (save-excursion
+                  (when (and
+                         (search-backward-regexp "/\\*" nil t)
+                         (looking-at-p "/\\*\\*"))
+                    (setq
+                     new-indentation
+                     (1- new-indentation)))))
 
                ;; LINE AFTER CONTINUATION OF DOC-COMMENT
                ;; /**



reply via email to

[Prev in Thread] Current Thread [Next in Thread]