Merge branch 'python-highlight-zero' of https://github.com/a11ce/micro into a11ce...

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

diff --git a/runtime/syntax/json.yaml b/runtime/syntax/json.yaml
index bc8d55b332577261f555e9808007fb93f3e8bad6..c590bd388d00db9416db1090e5b10dcbd147a856 100644 (file)
--- a/runtime/syntax/json.yaml
+++ b/runtime/syntax/json.yaml
@@ -1,18 +1,27 @@
 filetype: json
 
-detect: 
+detect:
     filename: "\\.json$"
     header: "^\\{$"
 
 rules:
-    - constant.number: "\\b[\\-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\\b"
-    - constant.number: "\\b[\\-+]?([0-9]+\\.[0-9]*|[0-9]*\\.[0-9]+)([EePp][+\\-]?[0-9]+)?[fFlL]?"
-    - constant.number: "\\b[\\-+]?([0-9]+[EePp][+\\-]?[0-9]+)[fFlL]?"
-    - constant.bool: "\\b(null)\\b"
-    - constant.bool.true: "\\b(true)\\b"
-    - constant.bool.false: "\\b(false)\\b"
-    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.number: "\\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\\b"
+    - constant.number: "\\b[-+]?([0-9]+\\.[0-9]*|[0-9]*\\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
+    - constant.number: "\\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
+    - constant: "\\b(null)\\b"
+    - constant: "\\b(true|false)\\b"
+    - constant.string: 
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
     - statement: "\\\"(\\\\\"|[^\"])*\\\"[[:space:]]*:\"  \"'(\\'|[^'])*'[[:space:]]*:"
     - constant: "\\\\u[0-9a-fA-F]{4}|\\\\[bfnrt'\"/\\\\]"
-    - indent-char.whitespace: "[[:space:]]+$"
-    - indent-char: "   + +| +  +"