[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/typescript-mode d1ddaad259 089/222: Fix indentation of con
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/typescript-mode d1ddaad259 089/222: Fix indentation of continued expressions. |
Date: |
Sun, 6 Feb 2022 16:59:21 -0500 (EST) |
branch: elpa/typescript-mode
commit d1ddaad259f0c9f7ef02d7de1d70d1d2f161fe57
Author: Louis-Dominique Dubeau <ldd@lddubeau.com>
Commit: Louis-Dominique Dubeau <ldd@lddubeau.com>
Fix indentation of continued expressions.
The previous algorithm would get tripped if the first part of a
continued expression ended with a one-line comment. This comit fixes
the issue.
---
test-files/indentation-reference-document.ts | 4 ++++
typescript-mode.el | 20 ++++++++++++++++----
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/test-files/indentation-reference-document.ts
b/test-files/indentation-reference-document.ts
index ff05f05e21..2ebed78697 100644
--- a/test-files/indentation-reference-document.ts
+++ b/test-files/indentation-reference-document.ts
@@ -487,3 +487,7 @@ function foo12(): void {
a: {},
});
}
+
+const a =
+ 1; // Blah
+const b = 2;
diff --git a/typescript-mode.el b/typescript-mode.el
index abb9af2a43..d2d73ff8e7 100644
--- a/typescript-mode.el
+++ b/typescript-mode.el
@@ -880,7 +880,20 @@ This function invokes `re-search-backward' but treats the
buffer
as if strings, preprocessor macros, and comments have been
removed.
-If invoked while inside a macro, treat the macro as normal text."
+If invoked while inside a macro, treat the macro as normal text.
+
+IMPORTANT NOTE: searching for \"\\n\" with this function to find
+line breaks will generally not work, because the final newline of
+a one-line comment is considered to be part of the comment and
+will be skipped. Take the following code:
+
+ let a = 1;
+ let b = 2; // Foo
+ let c = 3;
+
+If the point is in the last line, searching back for \"\\n\" will
+skip over the line with \"let b\". The newline found will be the
+one at the end of the line with \"let a\"."
(let ((saved-point (point))
(search-expr
(cond ((null count)
@@ -1947,9 +1960,8 @@ See `font-lock-keywords'.")
;; "continuation".
(not (looking-at "\\.\\.\\."))
(or (typescript--looking-at-operator-p)
- (and (typescript--re-search-backward "\n" nil t)
- (progn
- (skip-chars-backward " \t")
+ (and (progn
+ (typescript--backward-syntactic-ws)
(or (bobp) (backward-char))
(and (> (point) (point-min))
(save-excursion (backward-char) (not (looking-at
"[/*]/")))
- [nongnu] elpa/typescript-mode 7f1cde0a90 221/222: Make c-comment-line-break-function work as expected., (continued)
- [nongnu] elpa/typescript-mode 7f1cde0a90 221/222: Make c-comment-line-break-function work as expected., ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 438fc968bf 016/222: Highlight set and get keyword, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode b6e993513c 015/222: Merge pull request #10 from nahuel/patch-1, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 09123ba690 002/222: prepare for melpa, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode abc0751c0e 025/222: Merge pull request #22 from josteink/master, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 5931f2776d 049/222: Add keyof keyword., ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 782e8dd32e 071/222: Add fontification support for jsdoc/typedoc tags., ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode f6d28c7a0d 073/222: Remove the fontification hack., ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 4b69ca57f5 080/222: Simplify regexp literal, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 7249d76e2d 097/222: Merge pull request #64 from dakra/master, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode d1ddaad259 089/222: Fix indentation of continued expressions.,
ELPA Syncer <=
- [nongnu] elpa/typescript-mode 526f307ca8 101/222: Fontify yield and yield* as keyword, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 67d67f0c20 099/222: Typo in the readme, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode b5e3f2a8a6 100/222: Merge pull request #68 from GeertVL/patch-1, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode a5f342e539 160/222: Add snake_cased function call to regression test suite, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 6eaddf6c17 162/222: Drop the custom insert-and-indent code in favor of electric-indent., ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 0fc7297870 184/222: Add compilation-mode support for ng lint too., ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode b6cd68ae77 177/222: Add test-cases for type-highlights supported so far., ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode 102587e458 183/222: Merge pull request #132 from jkdufair/master, ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode e6f68ab2dd 198/222: Fontify basic types over keywords., ELPA Syncer, 2022/02/06
- [nongnu] elpa/typescript-mode fb44319479 197/222: Merge pull request #125 from Fuco1/fix/prefer-constant-over-keyword, ELPA Syncer, 2022/02/06