Merge pull request #1315 from matbesancon/patch-1

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

diff --git a/runtime/syntax/yaml.yaml b/runtime/syntax/yaml.yaml
index 9a397ea047b70138902c70055ec1affbf9d53d10..b6cef3f1c8c0c80a945112c72e80062abbbaa9e2 100644 (file)
--- a/runtime/syntax/yaml.yaml
+++ b/runtime/syntax/yaml.yaml
@@ -1,19 +1,35 @@
 filetype: yaml
 
-detect: 
+detect:
     filename: "\\.ya?ml$"
     header: "%YAML"
 
 rules:
     - type: "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
-    - constant.bool.true: "\\b(YES|yes|Y|y|ON|on)\\b"
-    - constant.bool.false: "\\b(NO|no|N|n|OFF|off)\\b"
-    - constant.bool.true: "\\b(true)\\b"
-    - constant.bool.false: "\\b(false)\\b"
-    - statement: ":[[:space:]]|\\[|\\]|:[[:space:]]+[|>]|^[[:space:]]*- "
+    - 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\\.\\/]+[[:space:]]*:\\s+)|([-\\w\\.\\/]+[[:space:]]*:$)"
-    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
-    - comment: "(^|[[:space:]])#([^{].*)?$"
-    - special: "^---|^\\.\\.\\.|^%YAML|^%TAG"
-    - indent-char.whitespace: "  $"
+    - type: "[-.\\w]+:"
+    - statement: ":"
+    - special:  "(^---|^\\.\\.\\.|^%YAML|^%TAG)"
+
+    - constant.string:
+        start: "(^| )\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "(^| )'"
+        end: "'"
+        skip: "(\\\\.)|('')"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+
+