github-linguist 5.3.3 → 6.0.0

data/grammars/source.glsl.json

@@ -1,29 +1,6 @@
 {
-  "fileTypes": [
-    "vs",
-    "fs",
-    "gs",
-    "vsh",
-    "fsh",
-    "gsh",
-    "vshader",
-    "fshader",
-    "gshader",
-    "vert",
-    "frag",
-    "geom",
-    "tesc",
-    "tese",
-    "comp",
-    "glsl",
-    "f.glsl",
-    "v.glsl",
-    "g.glsl"
-  ],
-  "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~G",
   "name": "GLSL",
+  "scopeName": "source.glsl",
   "patterns": [
     {
       "include": "#literal"
@@ -32,68 +9,88 @@
       "include": "#operator"
     },
     {
+      "name": "comment.block.glsl",
       "begin": "/\\*",
+      "end": "\\*/",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.block.begin.glsl"
         }
       },
-      "end": "\\*/",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.block.end.glsl"
         }
-      },
-      "name": "comment.block.glsl"
+      }
     },
     {
+      "name": "comment.line.double-slash.glsl",
       "begin": "//",
-      "beginCapture": {
+      "end": "\\n",
+      "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.glsl"
         }
-      },
-      "end": "\\n",
-      "name": "comment.line.double-slash.glsl"
+      }
     },
     {
-      "match": "^\\s*#\\s*(define|undef|if|ifdef|ifndef|else|elif|endif|error|pragma|extension|version|line)\\b",
-      "name": "keyword.directive.preprocessor.glsl"
+      "name": "keyword.directive.preprocessor.glsl",
+      "match": "^\\s*#\\s*(define|undef|if|ifdef|ifndef|else|elif|endif|error|pragma|extension|version|line)\\b"
     },
     {
-      "match": "\\b(__LINE__|__FILE__|__VERSION__|GL_core_profile|GL_es_profile|GL_compatibility_profile)\\b",
-      "name": "constant.macro.predefined.glsl"
+      "name": "constant.macro.predefined.glsl",
+      "match": "\\b(__LINE__|__FILE__|__VERSION__|GL_core_profile|GL_es_profile|GL_compatibility_profile)\\b"
     },
     {
-      "match": "\\b(precision|highp|mediump|lowp)",
-      "name": "storage.modifier.precision.glsl"
+      "name": "storage.modifier.precision.glsl",
+      "match": "\\b(precision|highp|mediump|lowp)"
     },
     {
-      "match": "\\b(break|case|continue|default|discard|do|else|for|if|return|switch|while)\\b",
-      "name": "keyword.control.glsl"
+      "name": "keyword.control.glsl",
+      "match": "\\b(break|case|continue|default|discard|do|else|for|if|return|switch|while)\\b"
     },
     {
-      "match": "\\b(void|bool|int|uint|float|double|vec[2|3|4]|dvec[2|3|4]|bvec[2|3|4]|ivec[2|3|4]|uvec[2|3|4]|mat[2|3|4]|mat2x2|mat2x3|mat2x4|mat3x2|mat3x3|mat3x4|mat4x2|mat4x3|mat4x4|dmat2|dmat3|dmat4|dmat2x2|dmat2x3|dmat2x4|dmat3x2|dmat3x3|dmat3x4|dmat4x2|dmat4x3|dmat4x4|sampler[1|2|3]D|image[1|2|3]D|samplerCube|imageCube|sampler2DRect|image2DRect|sampler[1|2]DArray|image[1|2]DArray|samplerBuffer|imageBuffer|sampler2DMS|image2DMS|sampler2DMSArray|image2DMSArray|samplerCubeArray|imageCubeArray|sampler[1|2]DShadow|sampler2DRectShadow|sampler[1|2]DArrayShadow|samplerCubeShadow|samplerCubeArrayShadow|isampler[1|2|3]D|iimage[1|2|3]D|isamplerCube|iimageCube|isampler2DRect|iimage2DRect|isampler[1|2]DArray|iimage[1|2]DArray|isamplerBuffer|iimageBuffer|isampler2DMS|iimage2DMS|isampler2DMSArray|iimage2DMSArray|isamplerCubeArray|iimageCubeArray|atomic_uint|usampler[1|2|3]D|uimage[1|2|3]D|usamplerCube|uimageCube|usampler2DRect|uimage2DRect|usampler[1|2]DArray|uimage[1|2]DArray|usamplerBuffer|uimageBuffer|usampler2DMS|uimage2DMS|usampler2DMSArray|uimage2DMSArray|usamplerCubeArray|uimageCubeArray|struct)\\b",
-      "name": "storage.type.glsl"
+      "name": "storage.type.glsl",
+      "match": "\\b(void|bool|int|uint|float|double|vec[2|3|4]|dvec[2|3|4]|bvec[2|3|4]|ivec[2|3|4]|uvec[2|3|4]|mat[2|3|4]|mat2x2|mat2x3|mat2x4|mat3x2|mat3x3|mat3x4|mat4x2|mat4x3|mat4x4|dmat2|dmat3|dmat4|dmat2x2|dmat2x3|dmat2x4|dmat3x2|dmat3x3|dmat3x4|dmat4x2|dmat4x3|dmat4x4|sampler[1|2|3]D|image[1|2|3]D|samplerCube|imageCube|sampler2DRect|image2DRect|sampler[1|2]DArray|image[1|2]DArray|samplerBuffer|imageBuffer|sampler2DMS|image2DMS|sampler2DMSArray|image2DMSArray|samplerCubeArray|imageCubeArray|sampler[1|2]DShadow|sampler2DRectShadow|sampler[1|2]DArrayShadow|samplerCubeShadow|samplerCubeArrayShadow|isampler[1|2|3]D|iimage[1|2|3]D|isamplerCube|iimageCube|isampler2DRect|iimage2DRect|isampler[1|2]DArray|iimage[1|2]DArray|isamplerBuffer|iimageBuffer|isampler2DMS|iimage2DMS|isampler2DMSArray|iimage2DMSArray|isamplerCubeArray|iimageCubeArray|atomic_uint|usampler[1|2|3]D|uimage[1|2|3]D|usamplerCube|uimageCube|usampler2DRect|uimage2DRect|usampler[1|2]DArray|uimage[1|2]DArray|usamplerBuffer|uimageBuffer|usampler2DMS|uimage2DMS|usampler2DMSArray|uimage2DMSArray|usamplerCubeArray|uimageCubeArray|struct)\\b"
     },
     {
-      "match": "\\b(layout|attribute|centroid|sampler|patch|const|flat|in|inout|invariant|noperspective|out|smooth|uniform|varying|buffer|shared|coherent|readonly|writeonly)\\b",
-      "name": "storage.modifier.glsl"
+      "name": "storage.modifier.glsl",
+      "match": "\\b(layout|attribute|centroid|sampler|patch|const|flat|in|inout|invariant|noperspective|out|smooth|uniform|varying|buffer|shared|coherent|readonly|writeonly)\\b"
     },
     {
-      "match": "\\b(gl_BackColor|gl_BackLightModelProduct|gl_BackLightProduct|gl_BackMaterial|gl_BackSecondaryColor|gl_ClipDistance|gl_ClipPlane|gl_ClipVertex|gl_Color|gl_DepthRange|gl_DepthRangeParameters|gl_EyePlaneQ|gl_EyePlaneR|gl_EyePlaneS|gl_EyePlaneT|gl_Fog|gl_FogCoord|gl_FogFragCoord|gl_FogParameters|gl_FragColor|gl_FragCoord|gl_FragData|gl_FragDepth|gl_FrontColor|gl_FrontFacing|gl_FrontLightModelProduct|gl_FrontLightProduct|gl_FrontMaterial|gl_FrontSecondaryColor|gl_InstanceID|gl_Layer|gl_LightModel|gl_LightModelParameters|gl_LightModelProducts|gl_LightProducts|gl_LightSource|gl_LightSourceParameters|gl_MaterialParameters|gl_ModelViewMatrix|gl_ModelViewMatrixInverse|gl_ModelViewMatrixInverseTranspose|gl_ModelViewMatrixTranspose|gl_ModelViewProjectionMatrix|gl_ModelViewProjectionMatrixInverse|gl_ModelViewProjectionMatrixInverseTranspose|gl_ModelViewProjectionMatrixTranspose|gl_MultiTexCoord[0-7]|gl_Normal|gl_NormalMatrix|gl_NormalScale|gl_ObjectPlaneQ|gl_ObjectPlaneR|gl_ObjectPlaneS|gl_ObjectPlaneT|gl_Point|gl_PointCoord|gl_PointParameters|gl_PointSize|gl_Position|gl_PrimitiveIDIn|gl_ProjectionMatrix|gl_ProjectionMatrixInverse|gl_ProjectionMatrixInverseTranspose|gl_ProjectionMatrixTranspose|gl_SecondaryColor|gl_TexCoord|gl_TextureEnvColor|gl_TextureMatrix|gl_TextureMatrixInverse|gl_TextureMatrixInverseTranspose|gl_TextureMatrixTranspose|gl_Vertex|gl_VertexID)\\b",
-      "name": "support.variable.glsl"
+      "name": "support.variable.glsl",
+      "match": "\\b(gl_BackColor|gl_BackLightModelProduct|gl_BackLightProduct|gl_BackMaterial|gl_BackSecondaryColor|gl_ClipDistance|gl_ClipPlane|gl_ClipVertex|gl_Color|gl_DepthRange|gl_DepthRangeParameters|gl_EyePlaneQ|gl_EyePlaneR|gl_EyePlaneS|gl_EyePlaneT|gl_Fog|gl_FogCoord|gl_FogFragCoord|gl_FogParameters|gl_FragColor|gl_FragCoord|gl_FragData|gl_FragDepth|gl_FrontColor|gl_FrontFacing|gl_FrontLightModelProduct|gl_FrontLightProduct|gl_FrontMaterial|gl_FrontSecondaryColor|gl_InstanceID|gl_Layer|gl_LightModel|gl_LightModelParameters|gl_LightModelProducts|gl_LightProducts|gl_LightSource|gl_LightSourceParameters|gl_MaterialParameters|gl_ModelViewMatrix|gl_ModelViewMatrixInverse|gl_ModelViewMatrixInverseTranspose|gl_ModelViewMatrixTranspose|gl_ModelViewProjectionMatrix|gl_ModelViewProjectionMatrixInverse|gl_ModelViewProjectionMatrixInverseTranspose|gl_ModelViewProjectionMatrixTranspose|gl_MultiTexCoord[0-7]|gl_Normal|gl_NormalMatrix|gl_NormalScale|gl_ObjectPlaneQ|gl_ObjectPlaneR|gl_ObjectPlaneS|gl_ObjectPlaneT|gl_Point|gl_PointCoord|gl_PointParameters|gl_PointSize|gl_Position|gl_PrimitiveIDIn|gl_ProjectionMatrix|gl_ProjectionMatrixInverse|gl_ProjectionMatrixInverseTranspose|gl_ProjectionMatrixTranspose|gl_SecondaryColor|gl_TexCoord|gl_TextureEnvColor|gl_TextureMatrix|gl_TextureMatrixInverse|gl_TextureMatrixInverseTranspose|gl_TextureMatrixTranspose|gl_Vertex|gl_VertexID)\\b"
     },
     {
-      "match": "\\b(gl_MaxClipPlanes|gl_MaxCombinedTextureImageUnits|gl_MaxDrawBuffers|gl_MaxFragmentUniformComponents|gl_MaxLights|gl_MaxTextureCoords|gl_MaxTextureImageUnits|gl_MaxTextureUnits|gl_MaxVaryingFloats|gl_MaxVertexAttribs|gl_MaxVertexTextureImageUnits|gl_MaxVertexUniformComponents)\\b",
-      "name": "support.constant.glsl"
+      "name": "support.constant.glsl",
+      "match": "\\b(gl_MaxClipPlanes|gl_MaxCombinedTextureImageUnits|gl_MaxDrawBuffers|gl_MaxFragmentUniformComponents|gl_MaxLights|gl_MaxTextureCoords|gl_MaxTextureImageUnits|gl_MaxTextureUnits|gl_MaxVaryingFloats|gl_MaxVertexAttribs|gl_MaxVertexTextureImageUnits|gl_MaxVertexUniformComponents)\\b"
     },
     {
-      "match": "\\b(abs|acos|all|any|asin|atan|ceil|clamp|cos|cross|degrees|dFdx|dFdy|distance|dot|equal|exp|exp2|faceforward|floor|fract|ftransform|fwidth|greaterThan|greaterThanEqual|inversesqrt|length|lessThan|lessThanEqual|log|log2|matrixCompMult|max|min|mix|mod|noise[1-4]|normalize|not|notEqual|outerProduct|pow|radians|reflect|refract|shadow1D|shadow1DLod|shadow1DProj|shadow1DProjLod|shadow2D|shadow2DLod|shadow2DProj|shadow2DProjLod|sign|sin|smoothstep|sqrt|step|tan|texture1D|texture1DLod|texture1DProj|texture1DProjLod|texture2D|texture2DLod|texture2DProj|texture2DProjLod|texture3D|texture3DLod|texture3DProj|texture3DProjLod|textureCube|textureCubeLod|transpose)\\b",
-      "name": "support.function.glsl"
+      "name": "support.function.glsl",
+      "match": "\\b(abs|acos|all|any|asin|atan|ceil|clamp|cos|cross|degrees|dFdx|dFdy|distance|dot|equal|exp|exp2|faceforward|floor|fract|ftransform|fwidth|greaterThan|greaterThanEqual|inversesqrt|length|lessThan|lessThanEqual|log|log2|matrixCompMult|max|min|mix|mod|noise[1-4]|normalize|not|notEqual|outerProduct|pow|radians|reflect|refract|shadow1D|shadow1DLod|shadow1DProj|shadow1DProjLod|shadow2D|shadow2DLod|shadow2DProj|shadow2DProjLod|sign|sin|smoothstep|sqrt|step|tan|texture1D|texture1DLod|texture1DProj|texture1DProjLod|texture2D|texture2DLod|texture2DProj|texture2DProjLod|texture3D|texture3DLod|texture3DProj|texture3DProjLod|textureCube|textureCubeLod|transpose)\\b"
     }
   ],
   "repository": {
+    "arithmetic-operator": {
+      "name": "keyword.operator.arithmetic.glsl",
+      "match": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(\\+|\\-|\\*|\\/|\\%)(?![/=\\-+!*%\u003c\u003e\u0026|^~.])"
+    },
+    "assignment-operator": {
+      "name": "keyword.operator.assignment.glsl",
+      "match": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(\\+|\\-|\\*|\\%|\\/|\u003c\u003c|\u003e\u003e|\u0026|\\^|\\|)?=(?![/=\\-+!*%\u003c\u003e\u0026|^~.])"
+    },
+    "bitwise-operator": {
+      "name": "keyword.operator.bitwise.glsl",
+      "match": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(~|\u0026|\\||\\^|\u003c\u003c|\u003e\u003e)(?![/=\\-+!*%\u003c\u003e\u0026|^~.])"
+    },
+    "comparative-operator": {
+      "name": "keyword.operator.comparative.glsl",
+      "match": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])((=|!)=|(\u003c|\u003e)=?)(?![/=\\-+!*%\u003c\u003e\u0026|^~.])"
+    },
+    "increment-decrement-operator": {
+      "name": "keyword.operator.increment-or-decrement.glsl",
+      "match": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(\\+\\+|\\-\\-)(?![/=\\-+!*%\u003c\u003e\u0026|^~.])"
+    },
     "literal": {
       "patterns": [
         {
@@ -101,6 +98,14 @@
         }
       ]
     },
+    "logical-operator": {
+      "name": "keyword.operator.arithmetic.glsl",
+      "match": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(!|\u0026\u0026|\\|\\||\\^\\^)(?![/=\\-+!*%\u003c\u003e\u0026|^~.])"
+    },
+    "numeric-literal": {
+      "name": "constant.numeric.glsl",
+      "match": "\\b([0-9][0-9_]*)(\\.([0-9][0-9_]*))?([eE][+/-]?([0-9][0-9_]*))?\\b"
+    },
     "operator": {
       "patterns": [
         {
@@ -126,39 +131,9 @@
         }
       ]
     },
-    "numeric-literal": {
-      "match": "\\b([0-9][0-9_]*)(\\.([0-9][0-9_]*))?([eE][+/-]?([0-9][0-9_]*))?\\b",
-      "name": "constant.numeric.glsl"
-    },
-    "arithmetic-operator": {
-      "match": "(?<![/=\\-+!*%<>&|\\^~.])(\\+|\\-|\\*|\\/|\\%)(?![/=\\-+!*%<>&|^~.])",
-      "name": "keyword.operator.arithmetic.glsl"
-    },
-    "increment-decrement-operator": {
-      "match": "(?<![/=\\-+!*%<>&|\\^~.])(\\+\\+|\\-\\-)(?![/=\\-+!*%<>&|^~.])",
-      "name": "keyword.operator.increment-or-decrement.glsl"
-    },
-    "bitwise-operator": {
-      "match": "(?<![/=\\-+!*%<>&|\\^~.])(~|&|\\||\\^|<<|>>)(?![/=\\-+!*%<>&|^~.])",
-      "name": "keyword.operator.bitwise.glsl"
-    },
-    "assignment-operator": {
-      "match": "(?<![/=\\-+!*%<>&|\\^~.])(\\+|\\-|\\*|\\%|\\/|<<|>>|&|\\^|\\|)?=(?![/=\\-+!*%<>&|^~.])",
-      "name": "keyword.operator.assignment.glsl"
-    },
-    "comparative-operator": {
-      "match": "(?<![/=\\-+!*%<>&|\\^~.])((=|!)=|(<|>)=?)(?![/=\\-+!*%<>&|^~.])",
-      "name": "keyword.operator.comparative.glsl"
-    },
-    "logical-operator": {
-      "match": "(?<![/=\\-+!*%<>&|\\^~.])(!|&&|\\|\\||\\^\\^)(?![/=\\-+!*%<>&|^~.])",
-      "name": "keyword.operator.arithmetic.glsl"
-    },
     "ternary-operator": {
-      "match": "(\\?|:)",
-      "name": "keyword.operator.ternary.glsl"
+      "name": "keyword.operator.ternary.glsl",
+      "match": "(\\?|:)"
     }
-  },
-  "scopeName": "source.glsl",
-  "uuid": "D0FD1B52-F137-4FBA-A148-B8A893CD948C"
-}
+  }
+}

data/grammars/source.gn.json

@@ -1,81 +1,66 @@
 {
-  "scopeName": "source.gn",
   "name": "gn",
-  "fileTypes": [
-    "gn",
-    "gni"
-  ],
-  "firstLineMatch": "(?xi)\n# Emacs modeline\n-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n  gn\n(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n|\n# Vim modeline\n(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n  gn\n(?=\\s|:|$)",
+  "scopeName": "source.gn",
   "patterns": [
     {
       "include": "#main"
     }
   ],
   "repository": {
-    "main": {
+    "array": {
+      "name": "meta.array.gn",
+      "begin": "\\[",
+      "end": "\\]",
       "patterns": [
         {
-          "include": "#comment"
-        },
-        {
-          "include": "#number"
-        },
-        {
-          "include": "#condition"
-        },
-        {
-          "include": "#function-call"
-        },
-        {
-          "include": "#keywords"
-        },
-        {
-          "include": "#string"
-        },
-        {
-          "include": "#variable"
-        },
-        {
-          "include": "#operators"
-        },
-        {
-          "include": "#array"
-        },
-        {
-          "include": "#brackets"
-        },
-        {
-          "include": "#separators"
+          "include": "$self"
         },
         {
-          "include": "#scope"
+          "name": "variable.reference.gn",
+          "match": "\\w+"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.begin.bracket.square.gn"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.end.bracket.square.gn"
+        }
+      }
     },
-    "separators": {
+    "brackets": {
+      "begin": "\\(",
+      "end": "\\)",
       "patterns": [
         {
-          "name": "punctuation.separator.list.comma.gn",
-          "match": ","
+          "include": "$self"
         },
         {
-          "name": "punctuation.delimiter.property.period.gn",
-          "match": "\\."
+          "name": "variable.reference.gn",
+          "match": "\\w+"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.begin.bracket.round.gn"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.end.bracket.round.gn"
+        }
+      }
     },
     "comment": {
       "name": "comment.line.number-sign.gn",
       "begin": "#",
       "end": "$",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.comment.gn"
-        }
-      },
       "patterns": [
         {
-          "match": "(?<=TODO)(\\()\\s*(\\w+)\\s*(\\))\\s*:",
+          "match": "(?\u003c=TODO)(\\()\\s*(\\w+)\\s*(\\))\\s*:",
           "captures": {
             "1": {
               "name": "punctuation.section.begin.bracket.round.todo"
@@ -88,42 +73,83 @@
             }
           }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.gn"
+        }
+      }
     },
     "condition": {
       "name": "meta.condition.gn",
       "begin": "(if|else)\\s*(?=\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.$1.gn"
-        }
-      },
-      "end": "(?<=\\))",
+      "end": "(?\u003c=\\))",
       "patterns": [
         {
           "begin": "\\G\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "$self"
+            },
+            {
+              "name": "variable.reference.gn",
+              "match": "\\w+"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.condition.begin.bracket.round.gn"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.condition.end.bracket.round.gn"
             }
-          },
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.$1.gn"
+        }
+      }
+    },
+    "function-call": {
+      "name": "meta.function-call.gn",
+      "begin": "\\s*(?!if|else|foreach|true|false)(\\w+)\\s*(?=\\()",
+      "end": "(?\u003c=\\))",
+      "patterns": [
+        {
+          "name": "meta.parameters.gn",
+          "begin": "\\G\\(",
+          "end": "\\)",
           "patterns": [
             {
               "include": "$self"
             },
             {
-              "match": "\\w+",
-              "name": "variable.reference.gn"
+              "name": "variable.argument.parameter.gn",
+              "match": "\\w+"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.parameters.begin.bracket.round.gn"
             }
-          ]
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.parameters.end.bracket.round.gn"
+            }
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.gn"
+        }
+      }
     },
     "keywords": {
       "patterns": [
@@ -137,61 +163,43 @@
         }
       ]
     },
-    "string": {
-      "name": "string.quoted.double.gn",
-      "begin": "\"",
-      "end": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.gn"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.gn"
-        }
-      },
+    "main": {
       "patterns": [
         {
-          "name": "constant.character.escape.gn",
-          "match": "\\\\[\"$\\\\]"
+          "include": "#comment"
         },
         {
-          "name": "constant.character.escape.hex.gn",
-          "match": "\\$0x[0-9A-Fa-f]{2}"
+          "include": "#number"
         },
         {
-          "name": "punctuation.separator.build-path.gn",
-          "match": ":(?=\\w+\")"
+          "include": "#condition"
         },
         {
-          "name": "punctuation.definition.build-path.gn",
-          "match": "\\G//"
+          "include": "#function-call"
         },
         {
-          "name": "source.gn.embedded",
-          "begin": "\\${",
-          "end": "}",
-          "contentName": "variable.interpolated.embedded.gn",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.begin.gn"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.end.gn"
-            }
-          }
+          "include": "#keywords"
         },
         {
-          "name": "variable.interpolated.embedded.gn",
-          "match": "(\\$)\\w+",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.variable.embedded.gn"
-            }
-          }
+          "include": "#string"
+        },
+        {
+          "include": "#variable"
+        },
+        {
+          "include": "#operators"
+        },
+        {
+          "include": "#array"
+        },
+        {
+          "include": "#brackets"
+        },
+        {
+          "include": "#separators"
+        },
+        {
+          "include": "#scope"
         }
       ]
     },
@@ -207,67 +215,15 @@
         }
       ]
     },
-    "variable": {
-      "patterns": [
-        {
-          "name": "variable.assignment.gn",
-          "match": "\\w+(?=\\s*[-+]?=|\\s*[\\[.])"
-        },
-        {
-          "match": "(?<==)\\s*(?!\\d|if|else|foreach|true|false)(\\w+)\\s*(?!\\()",
-          "captures": {
-            "1": {
-              "name": "variable.reference.gn"
-            }
-          }
-        }
-      ]
-    },
-    "function-call": {
-      "name": "meta.function-call.gn",
-      "begin": "\\s*(?!if|else|foreach|true|false)(\\w+)\\s*(?=\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.function.gn"
-        }
-      },
-      "end": "(?<=\\))",
-      "patterns": [
-        {
-          "name": "meta.parameters.gn",
-          "begin": "\\G\\(",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.parameters.begin.bracket.round.gn"
-            }
-          },
-          "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.parameters.end.bracket.round.gn"
-            }
-          },
-          "patterns": [
-            {
-              "include": "$self"
-            },
-            {
-              "match": "\\w+",
-              "name": "variable.argument.parameter.gn"
-            }
-          ]
-        }
-      ]
-    },
     "operators": {
       "patterns": [
         {
           "name": "keyword.operator.comparison.gn",
-          "match": "==|!=|[><]=?"
+          "match": "==|!=|[\u003e\u003c]=?"
         },
         {
           "name": "keyword.operator.logical.gn",
-          "match": "!|[|&]{2}"
+          "match": "!|[|\u0026]{2}"
         },
         {
           "name": "keyword.operator.assignment.gn",
@@ -283,6 +239,11 @@
       "name": "meta.scope.gn",
       "begin": "{",
       "end": "}",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.scope.begin.bracket.curly.gn"
@@ -292,59 +253,93 @@
         "0": {
           "name": "punctuation.scope.begin.bracket.curly.gn"
         }
-      },
+      }
+    },
+    "separators": {
       "patterns": [
         {
-          "include": "$self"
+          "name": "punctuation.separator.list.comma.gn",
+          "match": ","
+        },
+        {
+          "name": "punctuation.delimiter.property.period.gn",
+          "match": "\\."
         }
       ]
     },
-    "array": {
-      "name": "meta.array.gn",
-      "begin": "\\[",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.begin.bracket.square.gn"
-        }
-      },
-      "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.end.bracket.square.gn"
-        }
-      },
+    "string": {
+      "name": "string.quoted.double.gn",
+      "begin": "\"",
+      "end": "\"",
       "patterns": [
         {
-          "include": "$self"
+          "name": "constant.character.escape.gn",
+          "match": "\\\\[\"$\\\\]"
+        },
+        {
+          "name": "constant.character.escape.hex.gn",
+          "match": "\\$0x[0-9A-Fa-f]{2}"
+        },
+        {
+          "name": "punctuation.separator.build-path.gn",
+          "match": ":(?=\\w+\")"
+        },
+        {
+          "name": "punctuation.definition.build-path.gn",
+          "match": "\\G//"
+        },
+        {
+          "name": "source.gn.embedded",
+          "contentName": "variable.interpolated.embedded.gn",
+          "begin": "\\${",
+          "end": "}",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.gn"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.gn"
+            }
+          }
         },
         {
-          "match": "\\w+",
-          "name": "variable.reference.gn"
+          "name": "variable.interpolated.embedded.gn",
+          "match": "(\\$)\\w+",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.variable.embedded.gn"
+            }
+          }
         }
-      ]
-    },
-    "brackets": {
-      "begin": "\\(",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.section.begin.bracket.round.gn"
+          "name": "punctuation.definition.string.begin.gn"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "punctuation.section.end.bracket.round.gn"
+          "name": "punctuation.definition.string.end.gn"
         }
-      },
+      }
+    },
+    "variable": {
       "patterns": [
         {
-          "include": "$self"
+          "name": "variable.assignment.gn",
+          "match": "\\w+(?=\\s*[-+]?=|\\s*[\\[.])"
         },
         {
-          "match": "\\w+",
-          "name": "variable.reference.gn"
+          "match": "(?\u003c==)\\s*(?!\\d|if|else|foreach|true|false)(\\w+)\\s*(?!\\()",
+          "captures": {
+            "1": {
+              "name": "variable.reference.gn"
+            }
+          }
         }
       ]
     }
   }
-}
+}