branch: elpa/yaml-mode
commit 831ef3a04e4d32ec3fa3d77a54dc7e7bc5b6fd81
Merge: 68fecb5 04c30ea
Author: Vasilij Schneidermann <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #81 from strutt/master
Fix propertization for sequences of mappings with literal block
---
...yntax-highlighting-list-of-dicts-containing-literal-block.yaml | 8 ++++++++
yaml-mode.el | 2 ++
2 files changed, 10 insertions(+)
diff --git
a/test-files/test-syntax-highlighting-list-of-dicts-containing-literal-block.yaml
b/test-files/test-syntax-highlighting-list-of-dicts-containing-literal-block.yaml
new file mode 100644
index 0000000..2682f14
--- /dev/null
+++
b/test-files/test-syntax-highlighting-list-of-dicts-containing-literal-block.yaml
@@ -0,0 +1,8 @@
+# Propertized incorrectly prior to PR
+example:
+ - key1: Correctly propertized
+ key2: |
+ Correctly propertized.
+ - key3: |
+ Correctly propertized
+ key4: Incorrectly propertized as part of preceding yaml-literal-block
diff --git a/yaml-mode.el b/yaml-mode.el
index cb86652..97ddff3 100644
--- a/yaml-mode.el
+++ b/yaml-mode.el
@@ -322,6 +322,8 @@ artificially limited to the value of
(unless (looking-at yaml-blank-line-re)
(setq min-level (min min-level (current-indentation))))
(forward-line -1))
+ (when (looking-at-p " *- ")
+ (setq min-level (- min-level 2)))
(cond
((and (< (current-indentation) min-level)
(looking-at yaml-block-literal-re))
