Merge branch 'master' into highlight-nimscript

[micro.git] / runtime / syntax / yaml.yaml

diff --git a/runtime/syntax/yaml.yaml b/runtime/syntax/yaml.yaml
index a2a529f5a902f0f73e224df934f3f97e4105cc89..b6cef3f1c8c0c80a945112c72e80062abbbaa9e2 100644 (file)
--- a/runtime/syntax/yaml.yaml
+++ b/runtime/syntax/yaml.yaml
@@ -6,22 +6,24 @@ detect:
 
 rules:
     - type: "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
-    - constant:  "\\b(YES|yes|Y|y|ON|on|NO|no|N|n|OFF|off)\\b"
-    - constant: "\\b(true|false)\\b"
+    - constant:  "\\b(YES|yes|Y|y|ON|on|TRUE|True|true|NO|no|N|n|OFF|off|FALSE|False|false)\\b"
     - statement: "(:[[:space:]]|\\[|\\]|:[[:space:]]+[|>]|^[[:space:]]*- )"
     - identifier: "[[:space:]][\\*&][A-Za-z0-9]+"
-    - type: "([-\\w]+:\\s+)|([-\\w]+:$)"
+    - type: "[-.\\w]+:"
+    - statement: ":"
     - special:  "(^---|^\\.\\.\\.|^%YAML|^%TAG)"
 
     - constant.string:
-        start: "\""
-        end: "(?<!\\\\)\""
+        start: "(^| )\""
+        end: "\""
+        skip: "\\\\."
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
-        start: "'"
-        end: "(?<!\\\\)'"
+        start: "(^| )'"
+        end: "'"
+        skip: "(\\\\.)|('')"
         rules:
             - constant.specialChar: "\\\\."