github-linguist 5.0.0 → 5.0.2

data/grammars/source.css.less.json

@@ -297,13 +297,13 @@
       "begin": "{",
       "beginCaptures": {
         "0": {
-          "name": "punctuation.section.property-list.begin.css"
+          "name": "punctuation.section.property-list.begin.bracket.curly.css"
         }
       },
       "end": "}",
       "endCaptures": {
         "0": {
-          "name": "punctuation.section.property-list.end.css"
+          "name": "punctuation.section.property-list.end.bracket.curly.css"
         }
       },
       "name": "meta.property-list.css",
@@ -487,7 +487,7 @@
     },
     "commas": {
       "match": ",",
-      "name": "punctuation.separator.list.css"
+      "name": "punctuation.separator.list.comma.css"
     },
     "brace_round": {
       "match": "\\(|\\)",

data/grammars/source.d.json

@@ -73,47 +73,33 @@
       "name": "meta.control.conditional.d"
     },
     {
-      "begin": "(?x)(?<=^|\\}|;)\\s*\n\t\t\t\t\t((?:\\b(public|private|protected|static|final|synchronized|abstract|export|shared)\\b\\s*)*) # modifier\n\t\t\t\t\t(class|interface)\\s+\n\t\t\t\t\t(\\w+)\\s* # identifier\n\t\t\t\t\t(?:\\(\\s*([^\\)]+)\\s*\\)|)\\s* # Template type\n\t\t\t\t\t(?:\n\t\t\t\t\t  \\s*(:)\\s*\n\t\t\t\t\t  (\\w+)\n\t\t\t\t\t  (?:\\s*,\\s*(\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(\\w+))?\n\t\t\t\t\t)? # super class\n\t\t\t\t\t",
+      "begin": "(?x)(?<=^|\\}|;)\\s*\n\t\t\t\t\t(?<meta_modifier>\n\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t(?:(?:\\b(?:public|private|protected|static|final|synchronized|abstract|export|shared)\\b)) |\n\t\t\t\t\t\t\t\t(?:\\b(?:extern)\\b(?:\\s*\\(\\s*(?:(?:(?:C\\+\\+)(?:\\s*,\\s*[A-Za-z_][A-Za-z0-9._]*)?)|\\b(?:C|D|Windows|Pascal|System|Objective-C)\\b)\\s*\\))?)\n\t\t\t\t\t\t\t)\\s*\n\t\t\t\t\t\t)*\n\t\t\t\t\t)\n\t\t\t\t\t(?<structure>class|interface)\\s+\n\t\t\t\t\t(?<identifier>\\w+)\\s* # identifier\n\t\t\t\t\t(?:\\(\\s*(?<template_params>[^\\)]+)\\s*\\)|)\\s* # Template type\n\t\t\t\t\t(?:\n\t\t\t\t\t  \\s*(?<inheritance_separator>:)\\s*\n\t\t\t\t\t  (?<inherited>\\w+)\n\t\t\t\t\t  (?:\\s*,\\s*(?<inherited>\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(?<inherited>\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(?<inherited>\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(?<inherited>\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(?<inherited>\\w+))?\n\t\t\t\t\t  (?:\\s*,\\s*(?<inherited>\\w+))?\n\t\t\t\t\t)? # super class\n\t\t\t\t\t",
       "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.d"
-        },
-        "10": {
-          "name": "entity.other.inherited-class.d"
+        "identifier": {
+          "name": "entity.name.type.class.d"
         },
-        "11": {
-          "name": "entity.other.inherited-class.d"
+        "inheritance_separator": {
+          "name": "punctuation.separator.inheritance.d"
         },
-        "12": {
+        "inherited": {
           "name": "entity.other.inherited-class.d"
         },
-        "13": {
-          "name": "entity.other.inherited-class.d"
+        "meta_modifier": {
+          "patterns": [
+            {
+              "include": "#meta-modifier"
+            }
+          ]
         },
-        "3": {
+        "structure": {
           "name": "storage.type.structure.d"
         },
-        "4": {
-          "name": "entity.name.type.class.d"
-        },
-        "5": {
+        "template_params": {
           "patterns": [
             {
               "include": "$base"
             }
           ]
-        },
-        "6": {
-          "name": "punctuation.separator.inheritance.d"
-        },
-        "7": {
-          "name": "entity.other.inherited-class.d"
-        },
-        "8": {
-          "name": "entity.other.inherited-class.d"
-        },
-        "9": {
-          "name": "entity.other.inherited-class.d"
         }
       },
       "end": "(?={|;)",
@@ -140,18 +126,22 @@
       ]
     },
     {
-      "begin": "(?x)(?<=^|\\}|;)\\s*\n\t\t\t\t\t((?:\\b(public|private|protected|static|final|synchronized|abstract|export|shared)\\b\\s*)*) # modifier\n\t\t\t\t\t(struct)\\s+\n\t\t\t\t\t(\\w+)\\s* # identifier\n\t\t\t\t\t(?:\\(\\s*([^\\)]+)\\s*\\)|)\\s* # Template type\n\t\t\t\t\t",
+      "begin": "(?x)(?<=^|\\}|;)\\s*\n\t\t\t\t\t(?<meta_modifier>\n\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t(?:(?:\\b(?:public|private|protected|static|final|synchronized|abstract|export|shared)\\b)) |\n\t\t\t\t\t\t\t\t(?:\\b(?:extern)\\b(?:\\s*\\(\\s*(?:(?:(?:C\\+\\+)(?:\\s*,\\s*[A-Za-z_][A-Za-z0-9._]*)?)|\\b(?:C|D|Windows|Pascal|System|Objective-C)\\b)\\s*\\))?)\n\t\t\t\t\t\t\t)\\s*\n\t\t\t\t\t\t)*\n\t\t\t\t\t)\n\t\t\t\t\t(?<structure>struct)\\s+\n\t\t\t\t\t(?<identifier>\\w+)\\s*\n\t\t\t\t\t(?:\\(\\s*(?<template_params>[^\\)]+)\\s*\\)|)\\s*\n\t\t\t\t\t",
       "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.d"
+        "identifier": {
+          "name": "entity.name.type.struct.d"
         },
-        "3": {
-          "name": "storage.type.structure.d"
+        "meta_modifier": {
+          "patterns": [
+            {
+              "include": "#meta-modifier"
+            }
+          ]
         },
-        "4": {
-          "name": "entity.name.type.struct.d"
+        "structure": {
+          "name": "storage.type.structure.d"
         },
-        "5": {
+        "template_params": {
           "patterns": [
             {
               "include": "$base"
@@ -272,16 +262,14 @@
     {
       "captures": {
         "1": {
-          "name": "keyword.other.external.d"
-        },
-        "5": {
-          "name": "constant.language.external.d"
-        },
-        "7": {
-          "name": "constant.language.external.d"
+          "patterns": [
+            {
+              "include": "#meta-external"
+            }
+          ]
         }
       },
-      "match": "\\b(extern)\\b(\\s*\\(\\s*(((C\\+\\+)(\\s*,\\s*[A-Za-z_][A-Za-z0-9._]*)?)|(C|D|Windows|Pascal|System))\\s*\\))?",
+      "match": "(\\b(?:extern)\\b(?:\\s*\\(\\s*(?:(?:(?:C\\+\\+)(?:\\s*,\\s*[A-Za-z_][A-Za-z0-9._]*)?)|\\b(?:C|D|Windows|Pascal|System|Objective-C)\\b)\\s*\\))?)",
       "name": "meta.external.d"
     },
     {
@@ -523,6 +511,34 @@
       "match": "(?i:%(\\([a-z_]+\\))?#?0?\\-?[ ]?\\+?([0-9]*|\\*)(\\.([0-9]*|\\*))?[hL]?[a-z%])",
       "name": "constant.other.placeholder.d"
     },
+    "meta-external": {
+      "captures": {
+        "identifier": {
+          "name": "constant.language.external.d"
+        },
+        "keyword": {
+          "name": "keyword.other.external.d"
+        }
+      },
+      "match": "\\b(?<keyword>extern)\\b(\\s*\\(\\s*(?:(?:(?<identifier>C\\+\\+)(?:\\s*,\\s*[A-Za-z_][A-Za-z0-9._]*)?)|(?<identifier>C|D|Windows|Pascal|System|Objective-C))\\s*\\))?",
+      "name": "meta.external.d"
+    },
+    "meta-modifier": {
+      "captures": {
+        "meta_external": {
+          "patterns": [
+            {
+              "include": "#meta-external"
+            }
+          ]
+        },
+        "modifier": {
+          "name": "storage.modifier.d"
+        }
+      },
+      "match": "(?x)\n\t\t\t\t(?:\n\t\t\t\t\t(?<modifier>\\b(?:public|private|protected|static|final|synchronized|abstract|export|shared)\\b) |\n\t\t\t\t\t(?<meta_external>\\b(?:extern)\\b(?:\\s*\\(\\s*(?:(?:(?:C\\+\\+)(?:\\s*,\\s*[A-Za-z_][A-Za-z0-9._]*)?)|\\b(?:C|D|Windows|Pascal|System|Objective-C)\\b)\\s*\\))?)\n\t\t\t\t)\\s*\n\t\t\t",
+      "name": "meta.modifier.d"
+    },
     "regular_expressions": {
       "comment": "Change disabled to 1 to turn off syntax highlighting in “r” strings.",
       "disabled": 1,

data/grammars/source.gn.json

@@ -5,154 +5,297 @@
     "gn",
     "gni"
   ],
-  "injections": {
-    "source.gn": {
-      "patterns": [
-        {
-          "include": "#comment"
-        }
-      ]
-    }
-  },
+  "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|:|$)",
   "patterns": [
     {
-      "include": "#assignment"
-    },
-    {
-      "include": "#function"
+      "include": "#main"
     }
   ],
   "repository": {
-    "comment": {
-      "name": "punctuation.comment.gn",
-      "match": "#[^\\n]*\\n"
+    "main": {
+      "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": "#scope"
+        }
+      ]
     },
-    "string": {
+    "separators": {
       "patterns": [
         {
-          "begin": "\"\"\"",
-          "end": "\"\"\"",
-          "name": "string.quoted.triple.gn"
+          "name": "punctuation.separator.list.comma.gn",
+          "match": ","
         },
         {
-          "match": "(')([^']*)(')",
+          "name": "punctuation.delimiter.property.period.gn",
+          "match": "\\."
+        }
+      ]
+    },
+    "comment": {
+      "name": "comment.line.number-sign.gn",
+      "begin": "#",
+      "end": "$",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.gn"
+        }
+      },
+      "patterns": [
+        {
+          "match": "(?<=TODO)(\\()\\s*(\\w+)\\s*(\\))\\s*:",
           "captures": {
-            "0": {
-              "name": "punctuation.string.single.begin.gn"
-            },
             "1": {
-              "name": "string.quoted.single.gn"
+              "name": "punctuation.section.begin.bracket.round.todo"
             },
             "2": {
-              "name": "punctuation.string.single.end.gn"
+              "name": "storage.type.class.assignee.todo"
+            },
+            "3": {
+              "name": "punctuation.section.end.bracket.round.todo"
             }
           }
-        },
+        }
+      ]
+    },
+    "condition": {
+      "name": "meta.condition.gn",
+      "begin": "(if|else)\\s*(?=\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.$1.gn"
+        }
+      },
+      "end": "(?<=\\))",
+      "patterns": [
         {
-          "match": "(\")([^\"]*)(\")",
-          "captures": {
+          "begin": "\\G\\(",
+          "beginCaptures": {
             "0": {
-              "name": "punctuation.string.double.begin.gn"
-            },
-            "1": {
-              "name": "string.quoted.double.gn"
+              "name": "punctuation.definition.condition.begin.bracket.round.gn"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.condition.end.bracket.round.gn"
+            }
+          },
+          "patterns": [
+            {
+              "include": "$self"
             },
-            "2": {
-              "name": "punctuation.string.double.end.gn"
+            {
+              "match": "\\w+",
+              "name": "variable.reference.gn"
             }
-          }
+          ]
         }
       ]
     },
-    "number": {
-      "match": "\\d+",
-      "captures": {
-        "0": {
-          "name": "constant.numeric.gn"
-        }
-      }
-    },
-    "variable": {
-      "match": "\\w+",
-      "captures": {
-        "0": {
-          "name": "variable.other.gn"
+    "keywords": {
+      "patterns": [
+        {
+          "name": "constant.language.boolean.$1.gn",
+          "match": "\\b(true|false)\\b"
+        },
+        {
+          "name": "keyword.control.$1.gn",
+          "match": "\\b(if|else|foreach)\\b"
         }
-      }
+      ]
     },
-    "function": {
-      "name": "meta.function.gn",
-      "begin": "(\\w+)\\s*(\\()",
+    "string": {
+      "name": "string.quoted.double.gn",
+      "begin": "\"",
+      "end": "\"",
       "beginCaptures": {
-        "1": {
-          "name": "storage.type.function.gn"
-        },
-        "2": {
-          "name": "punctuation.function.parameters.begin.gn"
+        "0": {
+          "name": "punctuation.definition.string.begin.gn"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "punctuation.function.parameters.end.gn"
+          "name": "punctuation.definition.string.end.gn"
         }
       },
       "patterns": [
         {
-          "include": "#argument"
+          "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",
+          "begin": "\\${",
+          "end": "}",
+          "contentName": "variable.interpolated.embedded.gn",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.gn"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.gn"
+            }
+          }
+        },
+        {
+          "name": "variable.interpolated.embedded.gn",
+          "match": "(\\$)\\w+",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.variable.embedded.gn"
+            }
+          }
         }
       ]
     },
-    "argument": {
+    "number": {
       "patterns": [
         {
-          "name": "mata.argument.gn",
-          "begin": "(\\w+)\\s*(=)\\s*",
-          "beginCaptures": {
+          "name": "invalid.illegal.number.gn",
+          "match": "-0+|0+(?=[1-9])"
+        },
+        {
+          "name": "constant.numeric.gn",
+          "match": "-?\\d+"
+        }
+      ]
+    },
+    "variable": {
+      "patterns": [
+        {
+          "name": "variable.assignment.gn",
+          "match": "\\w+(?=\\s*[-+]?=|\\s*[\\[.])"
+        },
+        {
+          "match": "(?<==)\\s*(?!\\d|if|else|foreach|true|false)(\\w+)\\s*(?!\\()",
+          "captures": {
             "1": {
-              "name": "variable.parameter.gn"
-            },
-            "2": {
-              "name": "keyword.operator.assignment.gn"
+              "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": ",|\\n",
+          "end": "\\)",
           "endCaptures": {
             "0": {
-              "name": "punctuation.separator.gn"
+              "name": "punctuation.definition.parameters.end.bracket.round.gn"
             }
           },
           "patterns": [
             {
-              "include": "#expression"
+              "include": "$self"
+            },
+            {
+              "match": "\\w+",
+              "name": "variable.argument.parameter.gn"
             }
           ]
+        }
+      ]
+    },
+    "operators": {
+      "patterns": [
+        {
+          "name": "keyword.operator.comparison.gn",
+          "match": "==|!=|[><]=?"
+        },
+        {
+          "name": "keyword.operator.logical.gn",
+          "match": "!|[|&]{2}"
         },
         {
-          "include": "#expression"
+          "name": "keyword.operator.assignment.gn",
+          "match": "[-+]?="
+        },
+        {
+          "name": "keyword.operator.arithmetic.gn",
+          "match": "-|\\+"
         }
       ]
     },
-    "assignment": {
-      "name": "meta.assignment.gn",
-      "begin": "(\\w+)\\s*(=)\\s*",
+    "scope": {
+      "name": "meta.scope.gn",
+      "begin": "{",
+      "end": "}",
       "beginCaptures": {
-        "1": {
-          "name": "variable.other.gn"
-        },
-        "2": {
-          "name": "keyword.operator.assignment.gn"
+        "0": {
+          "name": "punctuation.scope.begin.bracket.curly.gn"
         }
       },
-      "end": "(;|\\n)",
       "endCaptures": {
         "0": {
-          "name": "punctuation.statement.end.gn"
+          "name": "punctuation.scope.begin.bracket.curly.gn"
         }
       },
       "patterns": [
         {
-          "include": "#expression"
+          "include": "$self"
         }
       ]
     },
@@ -161,86 +304,45 @@
       "begin": "\\[",
       "beginCaptures": {
         "0": {
-          "name": "punctuation.array.begin.gn"
+          "name": "punctuation.section.begin.bracket.square.gn"
         }
       },
       "end": "\\]",
       "endCaptures": {
         "0": {
-          "name": "punctuation.array.end.gn"
+          "name": "punctuation.section.end.bracket.square.gn"
         }
       },
       "patterns": [
         {
-          "include": "#expression"
+          "include": "$self"
         },
         {
-          "match": "\\s*([,])\\s*",
-          "captures": {
-            "1": {
-              "name": "punctuation.separator.gn"
-            }
-          }
+          "match": "\\w+",
+          "name": "variable.reference.gn"
         }
       ]
     },
-    "dictionary": {
-      "name": "meta.dictionary.gn",
-      "begin": "\\{",
+    "brackets": {
+      "begin": "\\(",
       "beginCaptures": {
         "0": {
-          "name": "punctuation.dictionary.begin.gn"
+          "name": "punctuation.section.begin.bracket.round.gn"
         }
       },
-      "end": "\\s*\\}",
+      "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "punctuation.dictionary.end.gn"
+          "name": "punctuation.section.end.bracket.round.gn"
         }
       },
       "patterns": [
         {
-          "include": "#expression"
-        },
-        {
-          "match": "\\s*([,:])\\s*",
-          "captures": {
-            "1": {
-              "name": "punctuation.separator.gn"
-            }
-          }
-        }
-      ]
-    },
-    "expression": {
-      "name": "meta.expression.gn",
-      "contentName": "meta.expression.gn",
-      "patterns": [
-        {
-          "include": "#function"
-        },
-        {
-          "include": "#array"
-        },
-        {
-          "include": "#dictionary"
-        },
-        {
-          "include": "#number"
-        },
-        {
-          "include": "#variable"
-        },
-        {
-          "include": "#string"
+          "include": "$self"
         },
         {
-          "match": "\\+|\\-|\\%",
-          "captures": {
-            "0": {
-              "name": "operator.gn"
-            }
-          }
+          "match": "\\w+",
+          "name": "variable.reference.gn"
         }
       ]
     }