[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/yaml-mode 68fecb5 118/124: Exclude newline from `yaml-nest
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/yaml-mode 68fecb5 118/124: Exclude newline from `yaml-nested-map-re` |
Date: |
Sun, 29 Aug 2021 11:36:25 -0400 (EDT) |
branch: elpa/yaml-mode
commit 68fecb5f0dec712a10c8655df6881392a4613617
Author: Vasilij Schneidermann <mail@vasilij.de>
Commit: Vasilij Schneidermann <mail@vasilij.de>
Exclude newline from `yaml-nested-map-re`
---
test-files/test-nested-map-single-line-match.yaml | 6 ++++++
yaml-mode.el | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/test-files/test-nested-map-single-line-match.yaml
b/test-files/test-nested-map-single-line-match.yaml
new file mode 100644
index 0000000..1465344
--- /dev/null
+++ b/test-files/test-nested-map-single-line-match.yaml
@@ -0,0 +1,6 @@
+# indent on line "bar: baz" should not go deeper than "foo: bar"
+a:
+ foo: bar
+ bar: baz
+b:
+ 1
diff --git a/yaml-mode.el b/yaml-mode.el
index 4914218..cb86652 100644
--- a/yaml-mode.el
+++ b/yaml-mode.el
@@ -151,7 +151,7 @@ that key is pressed to begin a block literal."
"Regexp indicating the beginning of a scalar context.")
(defconst yaml-nested-map-re
- (concat "[^#]*: *\\(?:&.*\\|{ *\\|" yaml-tag-re " *\\)?$")
+ (concat "[^#\n]*: *\\(?:&.*\\|{ *\\|" yaml-tag-re " *\\)?$")
"Regexp matching a line beginning a YAML nested structure.")
(defconst yaml-block-literal-base-re " *[>|][-+0-9]* *\\(?:\n\\|\\'\\)"
- [nongnu] elpa/yaml-mode 9d5a888 025/124: Merge pull request #6 from gvalkov/yaml-file-type, (continued)
- [nongnu] elpa/yaml-mode 9d5a888 025/124: Merge pull request #6 from gvalkov/yaml-file-type, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode a87ab36 046/124: add RECRUITMENTS, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode dcdcd81 049/124: Add myself as maintainer, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6ddd552 058/124: Merge pull request #34 from antalk2/again-p2, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 75c8f36 064/124: Unhighlight foo#bar tokens, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 1cff904 067/124: fix regex in adding yaml-mode to auto-mode-alist, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 3fc5a33 094/124: Mark block literals to unfontify quotes in them, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 41adb32 112/124: Merge pull request #77 from dgutov/single-quote-fixup, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode fea2fb0 114/124: Mention the bug report, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 97a58b3 109/124: Make sure not to pre-fill ppss cache with wrong entries, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 68fecb5 118/124: Exclude newline from `yaml-nested-map-re`,
ELPA Syncer <=
- [nongnu] elpa/yaml-mode e142e65 008/124: added newline, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode f68472b 024/124: automatically enable yaml-mode for *.yaml files, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode cf171f4 026/124: `checkdoc' nits (including the `checkdoc-autoload' extension)., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode e2befd8 027/124: Merge pull request #7 from SamB/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6d40a1d 033/124: resolved conflict, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode d1b8be6 039/124: Merge pull request #23 from Wilfred/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 11df403 044/124: Merge pull request #30 from rhoml/enable-eyaml, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 85d5c63 050/124: allow dash-newline to start a sequence, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6590b19 060/124: add copy of GPLv2, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 4ae92a7 062/124: Define keymap and syntax table properly, ELPA Syncer, 2021/08/29