[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
;; /**
- [elpa] externals/phps-mode 5fbc73bd43 01/15: Added TODO case, (continued)
- [elpa] externals/phps-mode 5fbc73bd43 01/15: Added TODO case, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode 027b102d71 04/15: Added failing indentation tests, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode b5f38a926f 05/15: More work on indentation around multi-line chained objects, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode 0c9d4d7fe9 08/15: Passing test for indenting multi-line chaining expressions, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode fd36f650e6 10/15: Added TODO items, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode 67c3beb075 12/15: Added TODO item for failing indentation, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode f7f8ea26b1 02/15: Improved cache writing method, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode 9a852fd48e 03/15: Added another failing indentation case, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode 8d77fbdfdb 13/15: Improved indentation around switch case branches, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode d1d1d4b9a7 14/15: Updated version and modified date, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode 9ac4797803 09/15: Passed indentation test for line after comment block,
Christian Johansson <=
- [elpa] externals/phps-mode 5d420ba200 11/15: Formatted TODO-items better, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode 3349852f21 15/15: Added TODO item, Christian Johansson, 2022/03/04
- [elpa] externals/phps-mode f619fe6911 07/15: Started on helper function for calculating indentation for multi-line chaining expressions, Christian Johansson, 2022/03/04