Add support for skipping and remove need for lookbehind

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

diff --git a/runtime/syntax/javascript.yaml b/runtime/syntax/javascript.yaml
index 0e862e5a27d2e4b9f7a374988fca496a170ab601..79afd3e53a60398a047c2c70d0fe9f213d13e4ae 100644 (file)
--- a/runtime/syntax/javascript.yaml
+++ b/runtime/syntax/javascript.yaml
@@ -1,24 +1,43 @@
 filetype: javascript
 
-detect: 
+detect:
     filename: "\\.js$"
 
 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.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]?"
     - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
     - statement: "\\b(break|case|catch|continue|default|delete|do|else|finally)\\b"
     - statement: "\\b(for|function|get|if|in|instanceof|new|return|set|switch)\\b"
     - statement: "\\b(switch|this|throw|try|typeof|var|void|while|with)\\b"
-    - constant.bool: "\\b(null|undefined|NaN)\\b"
-    - constant.bool: "\\b(true|false)\\b"
+    - constant: "\\b(null|undefined|NaN)\\b"
+    - constant: "\\b(true|false)\\b"
     - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Math)\\b"
     - type: "\\b(Number|Object|RegExp|String)\\b"
-    - symbol.operator: "[\\-+/*=<>!~%?:&|]"
+    - statement: "[-+/*=<>!~%?:&|]"
     - constant: "/[^*]([^/]|(\\\\/))*[^\\\\]/[gim]*"
     - constant: "\\\\[0-7][0-7]?[0-7]?|\\\\x[0-9a-fA-F]+|\\\\[bfnrt'\"\\?\\\\]"
-    - comment: "(^|[[:space:]])//.*"
-    - comment: "/\\*.+\\*/"
-    - todo: "TODO:?"
-    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules: []
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+