]> git.lizzy.rs Git - micro.git/commitdiff
Merge branch 'master' into patch-1
authorZachary Yedidia <zyedidia@gmail.com>
Mon, 30 Dec 2019 19:24:27 +0000 (14:24 -0500)
committerGitHub <noreply@github.com>
Mon, 30 Dec 2019 19:24:27 +0000 (14:24 -0500)
1  2 
runtime/syntax/javascript.yaml

index f60d90636ffa40c1413e8cb1066a9e4cc913be0e,f0ec9b97710ed0db4f46ee6594bc2256eb763369..24c8736d8c1de927c1b5a4a44ff9b8180d5538a5
@@@ -15,19 -16,17 +16,20 @@@ rules
      - symbol.brackets: "(\\{|\\})"
      - symbol.brackets: "(\\(|\\))"
      - symbol.brackets: "(\\[|\\])"
 -    - symbol.operator: "[-+/*=<>!~%?:&|]"
 -    - statement: "\\b(async|await|break|case|catch|const|continue|debugger|default|delete|do|else|export|finally)\\b"
 -    - statement: "\\b(for|function|class|extends|get|if|import|from|in|of|instanceof|let|new|return|set)\\b"
 -    - statement: "\\b(super|switch|this|throw|try|typeof|var|void|while|with|yield)\\b"
 +    - symbol.operator: "([-+/*=<>!~%?:&|]|[.]{3})"
 +    - statement: "\\b(async|await|break|case|catch|const|continue|debugger|default)\\b"
 +    - statement: "\\b(delete|do|else|export|finally|for|function\\*?|class|extends)\\b"
 +    - statement: "\\b(get|if|import|from|in|of|instanceof|let|new|reject|resolve|return)\\b"
 +    - statement: "\\b(set|super|switch|this|throw|try|typeof|var|void|while|with|yield)\\b"
      # reserved but unassigned
      - error: "\\b(enum|implements|interface|package|private|protected|public|TODO)"
+     - constant: "\\b(globalThis|Infinity|null|undefined|NaN)\\b"
      - constant: "\\b(null|undefined|NaN)\\b"
      - constant: "\\b(true|false)\\b"
 -    - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Math|Map|Set|WeakMap|WeakSet)\\b"
 -    - type: "\\b(Number|Object|RegExp|String)\\b"
 +    - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Generator|Map|Math)\\b"
 +    - type: "\\b(Number|Object|Promise|Proxy|Reflect|RegExp|Set|String|Symbol|WeakMap|WeakSet)\\b"
 +    - type: "\\b(BigInt64Array|BigUint64Array|Float32Array|Float64Array|Int16Array)\\b"
-     - type: "\\b(Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray)\\b"
++
      # - constant: "/[^*]([^/]|(\\\\/))*[^\\\\]/[gim]*"
      - constant: "\\\\[0-7][0-7]?[0-7]?|\\\\x[0-9a-fA-F]+|\\\\[bfnrt'\"\\?\\\\]"
      - comment: "^#!.*/(env +)?node( |$)"