[yaml mode] Tweak key regexp

marijnh · marijnh · commit 1d4b525f8127 · 2014-07-21T08:28:29.000+02:00
Issue #2695
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
@@ -80,7 +80,7 @@ CodeMirror.defineMode("yaml", function() {
       }
 
       /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*[^\-:{}"\[\]][^:{}"\[\]]*(?=\s*:($|\s))/i)) {
+      if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)) {
         state.pair = true;
         state.keyCol = stream.indentation();
         return "atom";

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ CodeMirror.defineMode("yaml", function() {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/* pairs (associative arrays) -> key */`
`83`		`- if (!state.pair && stream.match(/^\s[^\-:{}"\[\]][^:{}"\[\]](?=\s*:($\|\s))/i)) {`
	`83`	+ if (!state.pair && stream.match(/^\s(?:[,\[\]{}&!\|>'"%@`][^\s'":]\|[^,\[\]{}#&!\|>'"%@`])[^#]?(?=\s*:($\|\s))/)) {
`84`	`84`	`state.pair = true;`
`85`	`85`	`state.keyCol = stream.indentation();`
`86`	`86`	`return "atom";`