github-linguist 5.3.3 → 6.0.0

data/grammars/source.antlr.json

@@ -1,9 +1,6 @@
 {
-  "fileTypes": [
-    "g"
-  ],
-  "keyEquivalent": "^~A",
   "name": "ANTLR",
+  "scopeName": "source.antlr",
   "patterns": [
     {
       "include": "#strings"
@@ -12,29 +9,14 @@
       "include": "#comments"
     },
     {
-      "begin": "\\boptions\\b",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.other.options.antlr"
-        }
-      },
-      "end": "(?<=\\})",
       "name": "meta.options.antlr",
+      "begin": "\\boptions\\b",
+      "end": "(?\u003c=\\})",
       "patterns": [
         {
+          "name": "meta.options-block.antlr",
           "begin": "\\{",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.section.options.begin.antlr"
-            }
-          },
           "end": "\\}",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.section.options.end.antlr"
-            }
-          },
-          "name": "meta.options-block.antlr",
           "patterns": [
             {
               "include": "#strings"
@@ -43,61 +25,78 @@
               "include": "#comments"
             },
             {
-              "match": "\\b\\d+\\b",
-              "name": "constant.numeric.antlr"
+              "name": "constant.numeric.antlr",
+              "match": "\\b\\d+\\b"
             },
             {
-              "match": "\\b(k|charVocabulary|filter|greedy|paraphrase|exportVocab|buildAST|defaultErrorHandler|language|namespace|namespaceStd|namespaceAntlr|genHashLines)\\b",
-              "name": "variable.other.option.antlr"
+              "name": "variable.other.option.antlr",
+              "match": "\\b(k|charVocabulary|filter|greedy|paraphrase|exportVocab|buildAST|defaultErrorHandler|language|namespace|namespaceStd|namespaceAntlr|genHashLines)\\b"
             },
             {
-              "match": "\\b(true|false)\\b",
-              "name": "constant.language.boolean.antlr"
+              "name": "constant.language.boolean.antlr",
+              "match": "\\b(true|false)\\b"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.options.begin.antlr"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.options.end.antlr"
             }
-          ]
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.options.antlr"
+        }
+      }
     },
     {
+      "name": "meta.definition.class.antlr",
       "begin": "^(class)\\b\\s+(\\w+)",
-      "captures": {
-        "1": {
-          "name": "storage.type.antlr"
-        },
-        "2": {
-          "name": "entity.name.type.class.antlr"
-        }
-      },
       "end": ";",
-      "name": "meta.definition.class.antlr",
       "patterns": [
         {
+          "name": "meta.definition.class.extends.antlr",
           "begin": "\\b(extends)\\b\\s+",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.antlr"
-            }
-          },
           "end": "(?=;)",
-          "name": "meta.definition.class.extends.antlr",
           "patterns": [
             {
-              "match": "\\b(Parser|Lexer|TreeWalker)\\b",
-              "name": "support.class.antlr"
+              "name": "support.class.antlr",
+              "match": "\\b(Parser|Lexer|TreeWalker)\\b"
+            }
+          ],
+          "captures": {
+            "1": {
+              "name": "storage.modifier.antlr"
             }
-          ]
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "storage.type.antlr"
+        },
+        "2": {
+          "name": "entity.name.type.class.antlr"
+        }
+      }
     },
     {
-      "match": "^protected\\b",
-      "name": "storage.modifier.antlr"
+      "name": "storage.modifier.antlr",
+      "match": "^protected\\b"
     },
     {
-      "match": "^[[:upper:]_][[:upper:][:digit:]_]*\\b",
-      "name": "entity.name.type.token.antlr"
+      "name": "entity.name.type.token.antlr",
+      "match": "^[[:upper:]_][[:upper:][:digit:]_]*\\b"
     },
     {
+      "name": "meta.rule.antlr",
+      "match": "^(\\w+)(?:\\s+(returns\\b))?",
       "captures": {
         "1": {
           "name": "entity.name.function.rule.antlr"
@@ -105,13 +104,11 @@
         "2": {
           "name": "keyword.control.antlr"
         }
-      },
-      "match": "^(\\w+)(?:\\s+(returns\\b))?",
-      "name": "meta.rule.antlr"
+      }
     },
     {
-      "match": "\\b[[:upper:]_][[:upper:][:digit:]_]*\\b",
-      "name": "constant.other.token.antlr"
+      "name": "constant.other.token.antlr",
+      "match": "\\b[[:upper:]_][[:upper:][:digit:]_]*\\b"
     },
     {
       "include": "#nested-curly"
@@ -121,180 +118,178 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.antlr",
           "begin": "/\\*",
+          "end": "\\*/",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.antlr"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.antlr"
             }
-          },
-          "name": "comment.block.antlr"
+          }
         },
         {
           "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.antlr"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-slash.antlr",
               "begin": "//",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.antlr"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.double-slash.antlr"
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.antlr"
             }
-          ]
+          }
         }
       ]
     },
     "nested-curly": {
+      "name": "source.embedded.java-or-c.antlr",
       "begin": "\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.group.begin.antlr"
-        }
-      },
       "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.group.end.antlr"
-        }
-      },
-      "name": "source.embedded.java-or-c.antlr",
       "patterns": [
         {
-          "match": "\\b(break|case|continue|default|do|else|for|goto|if|_Pragma|return|switch|while)\\b",
-          "name": "keyword.control.java-or-c"
+          "name": "keyword.control.java-or-c",
+          "match": "\\b(break|case|continue|default|do|else|for|goto|if|_Pragma|return|switch|while)\\b"
         },
         {
-          "match": "\\b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\b",
-          "name": "storage.type.java-or-c"
+          "name": "storage.type.java-or-c",
+          "match": "\\b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\b"
         },
         {
-          "match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
-          "name": "storage.modifier.java-or-c"
+          "name": "storage.modifier.java-or-c",
+          "match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b"
         },
         {
-          "match": "\\b(NULL|true|false|TRUE|FALSE)\\b",
-          "name": "constant.language.java-or-c"
+          "name": "constant.language.java-or-c",
+          "match": "\\b(NULL|true|false|TRUE|FALSE)\\b"
         },
         {
-          "match": "\\b(sizeof)\\b",
-          "name": "keyword.operator.sizeof.java-or-c"
+          "name": "keyword.operator.sizeof.java-or-c",
+          "match": "\\b(sizeof)\\b"
         },
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
-          "name": "constant.numeric.java-or-c"
+          "name": "constant.numeric.java-or-c",
+          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
         },
         {
+          "name": "string.quoted.double.java-or-c",
           "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "name": "constant.character.escape.antlr",
+              "match": "\\\\."
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.java-or-c"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.java-or-c"
             }
-          },
-          "name": "string.quoted.double.java-or-c",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.antlr"
-            }
-          ]
+          }
         },
         {
+          "name": "string.quoted.single.java-or-c",
           "begin": "'",
+          "end": "'",
+          "patterns": [
+            {
+              "name": "constant.character.escape.antlr",
+              "match": "\\\\."
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.java-or-c"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.java-or-c"
             }
-          },
-          "name": "string.quoted.single.java-or-c",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.antlr"
-            }
-          ]
+          }
         },
         {
-          "match": "\\bEOF_CHAR\\b",
-          "name": "support.constant.eof-char.antlr"
+          "name": "support.constant.eof-char.antlr",
+          "match": "\\bEOF_CHAR\\b"
         },
         {
           "include": "#comments"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.group.begin.antlr"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.group.end.antlr"
+        }
+      }
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.antlr",
           "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "name": "constant.character.escape.antlr",
+              "match": "\\\\(u[0-9A-Fa-f]{4}|.)"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.antlr"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.antlr"
             }
-          },
-          "name": "string.quoted.double.antlr",
-          "patterns": [
-            {
-              "match": "\\\\(u[0-9A-Fa-f]{4}|.)",
-              "name": "constant.character.escape.antlr"
-            }
-          ]
+          }
         },
         {
+          "name": "string.quoted.single.antlr",
           "begin": "'",
+          "end": "'",
+          "patterns": [
+            {
+              "name": "constant.character.escape.antlr",
+              "match": "\\\\(u[0-9A-Fa-f]{4}|.)"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.antlr"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.antlr"
             }
-          },
-          "name": "string.quoted.single.antlr",
-          "patterns": [
-            {
-              "match": "\\\\(u[0-9A-Fa-f]{4}|.)",
-              "name": "constant.character.escape.antlr"
-            }
-          ]
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.antlr",
-  "uuid": "ACABDECD-4F22-47D9-A5F4-DBA957A2A1CC"
-}
+  }
+}

data/grammars/source.apache-config.json

@@ -1,33 +1,31 @@
 {
-  "fileTypes": [
-    "conf",
-    "htaccess"
-  ],
-  "keyEquivalent": "^~A",
   "name": "Apache",
+  "scopeName": "source.apache-config",
   "patterns": [
     {
       "begin": "(^[ \\t]+)?(?=#)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.apache-config"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.apache-config",
           "begin": "#",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.apache-config"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.apache-config"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.apache-config"
+        }
+      }
     },
     {
+      "name": "meta.tag.any.html",
+      "match": "^[ ]*(\u003c)([a-zA-Z0-9:]+)[^\u003e]*(\u003e(\u003c)/)(\\2)(\u003e)",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag.apache-config"
@@ -47,12 +45,17 @@
         "6": {
           "name": "punctuation.definition.tag.apache-config"
         }
-      },
-      "match": "^[ ]*(<)([a-zA-Z0-9:]+)[^>]*(>(<)/)(\\2)(>)",
-      "name": "meta.tag.any.html"
+      }
     },
     {
-      "begin": "^[ ]*((<)(VirtualHost)(?:[ ]+([^>]+))?(>))",
+      "name": "meta.vhost.apache-config",
+      "begin": "^[ ]*((\u003c)(VirtualHost)(?:[ ]+([^\u003e]+))?(\u003e))",
+      "end": "^[ ]*((\u003c/)(VirtualHost)[^\u003e]*(\u003e))",
+      "patterns": [
+        {
+          "include": "$base"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "meta.tag.apache-config"
@@ -70,7 +73,6 @@
           "name": "punctuation.definition.tag.apache-config"
         }
       },
-      "end": "^[ ]*((</)(VirtualHost)[^>]*(>))",
       "endCaptures": {
         "1": {
           "name": "meta.tag.apache-config"
@@ -84,16 +86,17 @@
         "4": {
           "name": "punctuation.definition.tag.apache-config"
         }
-      },
-      "name": "meta.vhost.apache-config",
+      }
+    },
+    {
+      "name": "meta.directory.apache-config",
+      "begin": "^[ ]*((\u003c)(Directory(?:Match)?)(?:[ ]+([^\u003e]+))?(\u003e))",
+      "end": "^[ ]*((\u003c/)(Directory(?:Match)?)[^\u003e]*(\u003e))",
       "patterns": [
         {
           "include": "$base"
         }
-      ]
-    },
-    {
-      "begin": "^[ ]*((<)(Directory(?:Match)?)(?:[ ]+([^>]+))?(>))",
+      ],
       "beginCaptures": {
         "1": {
           "name": "meta.tag.apache-config"
@@ -111,7 +114,6 @@
           "name": "punctuation.definition.tag.apache-config"
         }
       },
-      "end": "^[ ]*((</)(Directory(?:Match)?)[^>]*(>))",
       "endCaptures": {
         "1": {
           "name": "meta.tag.apache-config"
@@ -125,16 +127,17 @@
         "4": {
           "name": "punctuation.definition.tag.apache-config"
         }
-      },
-      "name": "meta.directory.apache-config",
+      }
+    },
+    {
+      "name": "meta.location.apache-config",
+      "begin": "^[ ]*((\u003c)(Location(?:Match)?)(?:[ ]+([^\u003e]+))?(\u003e))",
+      "end": "^[ ]*((\u003c/)(Location(?:Match)?)[^\u003e]*(\u003e))",
       "patterns": [
         {
           "include": "$base"
         }
-      ]
-    },
-    {
-      "begin": "^[ ]*((<)(Location(?:Match)?)(?:[ ]+([^>]+))?(>))",
+      ],
       "beginCaptures": {
         "1": {
           "name": "meta.tag.apache-config"
@@ -152,7 +155,6 @@
           "name": "punctuation.definition.tag.apache-config"
         }
       },
-      "end": "^[ ]*((</)(Location(?:Match)?)[^>]*(>))",
       "endCaptures": {
         "1": {
           "name": "meta.tag.apache-config"
@@ -166,42 +168,31 @@
         "4": {
           "name": "punctuation.definition.tag.apache-config"
         }
-      },
-      "name": "meta.location.apache-config",
-      "patterns": [
-        {
-          "include": "$base"
-        }
-      ]
+      }
     },
     {
+      "name": "source.include.apache-config",
       "begin": "(^Include)",
+      "end": "(\\n)",
+      "patterns": [
+        {
+          "name": "text.include.apache-config",
+          "match": "(.*)"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "support.constant.include.start.apache-config"
         }
       },
-      "end": "(\\n)",
       "endCaptures": {
         "1": {
           "name": "support.constant.include.end.apache-config"
         }
-      },
-      "name": "source.include.apache-config",
-      "patterns": [
-        {
-          "match": "(.*)",
-          "name": "text.include.apache-config"
-        }
-      ]
+      }
     },
     {
       "begin": "^[ ]*\\b(RewriteCond)\\b",
-      "captures": {
-        "1": {
-          "name": "support.constant.rewritecond.apache-config"
-        }
-      },
       "end": "$",
       "patterns": [
         {
@@ -212,38 +203,38 @@
               "include": "#vars"
             },
             {
-              "match": "[^ %\\n]+",
-              "name": "string.regexp.rewrite-test.apache-config"
+              "name": "string.regexp.rewrite-test.apache-config",
+              "match": "[^ %\\n]+"
             },
             {
               "begin": "[ ]+",
               "end": "$",
               "patterns": [
                 {
-                  "match": "[^ %\\n]+",
-                  "name": "string.other.rewrite-condition.apache-config"
+                  "name": "string.other.rewrite-condition.apache-config",
+                  "match": "[^ %\\n]+"
                 },
                 {
+                  "match": "[ ]+(\\[[^\\]]+\\])",
                   "captures": {
                     "1": {
                       "name": "string.regexp.rewrite-operator.apache-config"
                     }
-                  },
-                  "match": "[ ]+(\\[[^\\]]+\\])"
+                  }
                 }
               ]
             }
           ]
         }
-      ]
-    },
-    {
-      "begin": "^[ ]*\\b(RewriteRule)\\b",
+      ],
       "captures": {
         "1": {
-          "name": "support.constant.rewriterule.apache-config"
+          "name": "support.constant.rewritecond.apache-config"
         }
-      },
+      }
+    },
+    {
+      "begin": "^[ ]*\\b(RewriteRule)\\b",
       "end": "$",
       "patterns": [
         {
@@ -254,8 +245,8 @@
               "include": "#vars"
             },
             {
-              "match": "[^ %]+",
-              "name": "string.regexp.rewrite-pattern.apache-config"
+              "name": "string.regexp.rewrite-pattern.apache-config",
+              "match": "[^ %]+"
             },
             {
               "begin": "[ ]+",
@@ -265,54 +256,61 @@
                   "include": "#vars"
                 },
                 {
-                  "match": "[^ %\\n]+",
-                  "name": "string.other.rewrite-substitution.apache-config"
+                  "name": "string.other.rewrite-substitution.apache-config",
+                  "match": "[^ %\\n]+"
                 },
                 {
+                  "match": "[ ]+(\\[[^\\]]+\\])",
                   "captures": {
                     "1": {
                       "name": "string.regexp.rewrite-operator.apache-config"
                     }
-                  },
-                  "match": "[ ]+(\\[[^\\]]+\\])"
+                  }
                 }
               ]
             }
           ]
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "support.constant.rewriterule.apache-config"
+        }
+      }
     },
     {
-      "match": "\\b(R(e(sourceConfig|direct(Match|Temp|Permanent)?|qu(ire|estHeader)|ferer(Ignore|Log)|write(Rule|Map|Base|Cond|Options|Engine|Lo(ck|g(Level)?))|admeName|move(Handler|Charset|Type|InputFilter|OutputFilter|Encoding|Language))|Limit(MEM|NPROC|CPU))|Group|XBitHack|M(MapFile|i(nSpare(Servers|Threads)|meMagicFile)|odMimeUsePathInfo|Cache(RemovalAlgorithm|M(inObjectSize|ax(StreamingBuffer|Object(Size|Count)))|Size)|ultiviewsMatch|eta(Suffix|Dir|Files)|ax(RequestsPer(Child|Thread)|MemFree|Spare(Servers|Threads)|Clients|Threads(PerChild)?|KeepAliveRequests))|B(indAddress|S2000Account|rowserMatch(NoCase)?)|S(hmemUIDisUser|c(oreBoardFile|ript(Sock|InterpreterSource|Log(Buffer|Length)?|Alias(Match)?)?)|tart(Servers|Threads)|S(I(StartTag|TimeFormat|UndefinedEcho|E(ndTag|rrorMsg))|L(R(equire(SSL)?|andomSeed)|Mutex|SessionCache(Timeout)?|C(ipherSuite|ertificate(ChainFile|KeyFile|File)|A(Revocation(Path|File)|Certificate(Path|File)))|Options|P(assPhraseDialog|ro(tocol|xy(MachineCertificate(Path|File)|C(ipherSuite|A(Revocation(Path|File)|Certificate(Path|File)))|Protocol|Engine|Verify(Depth)?)))|Engine|Verify(Client|Depth)))|uexecUserGroup|e(ndBufferSize|cureListen|t(Handler|InputFilter|OutputFilter|Env(If(NoCase)?)?)|rver(Root|Signature|Name|T(ype|okens)|Path|Limit|A(dmin|lias)))|atisfy)|H(ostnameLookups|eader(Name)?)|N(o(Cache|Proxy)|umServers|ameVirtualHost|WSSL(TrustedCerts|Upgradeable))|C(h(ildPerUserID|eckSpelling|arset(SourceEnc|Options|Default))|GI(MapExtension|CommandArgs)|o(ntentDigest|okie(Style|Name|Tracking|Domain|Prefix|Expires|Format|Log)|reDumpDirectory)|ustomLog|learModuleList|ache(Root|Gc(MemUsage|Clean|Interval|Daily|Unused)|M(inFileSize|ax(Expire|FileSize))|Size|NegotiatedDocs|TimeMargin|Ignore(NoLastMod|CacheControl)|D(i(sable|rLe(ngth|vels))|efaultExpire)|E(nable|xpiryCheck)|F(ile|orceCompletion)|LastModifiedFactor))|T(hread(sPerChild|StackSize|Limit)|ypesConfig|ime(out|Out)|ransferLog)|I(n(clude|dex(Ignore|O(ptions|rderDefault)))|SAPI(ReadAheadBuffer|CacheFile|FakeAsync|LogNotSupported|AppendLogTo(Errors|Query))|dentityCheck|f(Module|Define)|map(Menu|Base|Default))|O(ptions|rder)|D(irectory(Match|Slash|Index)?|ocumentRoot|e(ny|f(late(MemLevel|BufferSize|CompressionLevel|FilterNote|WindowSize)|ault(Type|Icon|Language)))|av(MinTimeout|DepthInfinity|LockDB)?)|U(se(CanonicalName|r(Dir)?)|nsetEnv)|P(idFile|ort|assEnv|ro(tocol(ReqCheck|Echo)|xy(Re(ceiveBufferSize|quests|mote(Match)?)|Ma(tch|xForwards)|B(lock|adHeader)|Timeout|IOBufferSize|Domain|P(ass(Reverse)?|reserveHost)|ErrorOverride|Via)?))|E(nable(MMAP|Sendfile|ExceptionHook)|BCDIC(Convert(ByType)?|Kludge)|rror(Header|Document|Log)|x(t(endedStatus|Filter(Options|Define))|pires(ByType|Default|Active)|ample))|Virtual(ScriptAlias(IP)?|Host|DocumentRoot(IP)?)|KeepAlive(Timeout)?|F(ile(s(Match)?|ETag)|or(ce(Type|LanguagePriority)|ensicLog)|ancyIndexing)|Win32DisableAcceptEx|L(i(sten(Back(log|Log))?|mit(Request(Body|Field(s(ize)?|Size)|Line)|XMLRequestBody|InternalRecursion|Except)?)|o(c(kFile|ation(Match)?)|ad(Module|File)|g(Format|Level))|DAP(SharedCache(Size|File)|Cache(TTL|Entries)|TrustedCA(Type)?|OpCache(TTL|Entries))|anguagePriority)|A(ssignUserID|nonymous(_(MustGiveEmail|NoUserID|VerifyEmail|LogEmail|Authoritative))?|c(ce(ss(Config|FileName)|pt(Mutex|PathInfo|Filter))|tion)|dd(Module(Info)?|Handler|Charset|Type|I(nputFilter|con(By(Type|Encoding))?)|OutputFilter(ByType)?|De(scription|faultCharset)|Encoding|Language|Alt(By(Type|Encoding))?)|uth(GroupFile|Name|Type|D(B(GroupFile|M(GroupFile|Type|UserFile|Authoritative)|UserFile|Authoritative)|igest(GroupFile|ShmemSize|N(cCheck|once(Format|Lifetime))|Domain|Qop|File|Algorithm))|UserFile|LDAP(RemoteUserIsDN|GroupAttribute(IsDN)?|Bind(DN|Password)|C(harsetConfig|ompareDNOnServer)|DereferenceAliases|Url|Enabled|FrontPageHack|Authoritative)|Authoritative)|l(ias(Match)?|low(CONNECT|Override|EncodedSlashes)?)|gentLog)|MIMEMagicFile|WSGI(.[^ ]+))\\b",
-      "name": "support.constant.apache-config"
+      "name": "support.constant.apache-config",
+      "match": "\\b(R(e(sourceConfig|direct(Match|Temp|Permanent)?|qu(ire|estHeader)|ferer(Ignore|Log)|write(Rule|Map|Base|Cond|Options|Engine|Lo(ck|g(Level)?))|admeName|move(Handler|Charset|Type|InputFilter|OutputFilter|Encoding|Language))|Limit(MEM|NPROC|CPU))|Group|XBitHack|M(MapFile|i(nSpare(Servers|Threads)|meMagicFile)|odMimeUsePathInfo|Cache(RemovalAlgorithm|M(inObjectSize|ax(StreamingBuffer|Object(Size|Count)))|Size)|ultiviewsMatch|eta(Suffix|Dir|Files)|ax(RequestsPer(Child|Thread)|MemFree|Spare(Servers|Threads)|Clients|Threads(PerChild)?|KeepAliveRequests))|B(indAddress|S2000Account|rowserMatch(NoCase)?)|S(hmemUIDisUser|c(oreBoardFile|ript(Sock|InterpreterSource|Log(Buffer|Length)?|Alias(Match)?)?)|tart(Servers|Threads)|S(I(StartTag|TimeFormat|UndefinedEcho|E(ndTag|rrorMsg))|L(R(equire(SSL)?|andomSeed)|Mutex|SessionCache(Timeout)?|C(ipherSuite|ertificate(ChainFile|KeyFile|File)|A(Revocation(Path|File)|Certificate(Path|File)))|Options|P(assPhraseDialog|ro(tocol|xy(MachineCertificate(Path|File)|C(ipherSuite|A(Revocation(Path|File)|Certificate(Path|File)))|Protocol|Engine|Verify(Depth)?)))|Engine|Verify(Client|Depth)))|uexecUserGroup|e(ndBufferSize|cureListen|t(Handler|InputFilter|OutputFilter|Env(If(NoCase)?)?)|rver(Root|Signature|Name|T(ype|okens)|Path|Limit|A(dmin|lias)))|atisfy)|H(ostnameLookups|eader(Name)?)|N(o(Cache|Proxy)|umServers|ameVirtualHost|WSSL(TrustedCerts|Upgradeable))|C(h(ildPerUserID|eckSpelling|arset(SourceEnc|Options|Default))|GI(MapExtension|CommandArgs)|o(ntentDigest|okie(Style|Name|Tracking|Domain|Prefix|Expires|Format|Log)|reDumpDirectory)|ustomLog|learModuleList|ache(Root|Gc(MemUsage|Clean|Interval|Daily|Unused)|M(inFileSize|ax(Expire|FileSize))|Size|NegotiatedDocs|TimeMargin|Ignore(NoLastMod|CacheControl)|D(i(sable|rLe(ngth|vels))|efaultExpire)|E(nable|xpiryCheck)|F(ile|orceCompletion)|LastModifiedFactor))|T(hread(sPerChild|StackSize|Limit)|ypesConfig|ime(out|Out)|ransferLog)|I(n(clude|dex(Ignore|O(ptions|rderDefault)))|SAPI(ReadAheadBuffer|CacheFile|FakeAsync|LogNotSupported|AppendLogTo(Errors|Query))|dentityCheck|f(Module|Define)|map(Menu|Base|Default))|O(ptions|rder)|D(irectory(Match|Slash|Index)?|ocumentRoot|e(ny|f(late(MemLevel|BufferSize|CompressionLevel|FilterNote|WindowSize)|ault(Type|Icon|Language)))|av(MinTimeout|DepthInfinity|LockDB)?)|U(se(CanonicalName|r(Dir)?)|nsetEnv)|P(idFile|ort|assEnv|ro(tocol(ReqCheck|Echo)|xy(Re(ceiveBufferSize|quests|mote(Match)?)|Ma(tch|xForwards)|B(lock|adHeader)|Timeout|IOBufferSize|Domain|P(ass(Reverse)?|reserveHost)|ErrorOverride|Via)?))|E(nable(MMAP|Sendfile|ExceptionHook)|BCDIC(Convert(ByType)?|Kludge)|rror(Header|Document|Log)|x(t(endedStatus|Filter(Options|Define))|pires(ByType|Default|Active)|ample))|Virtual(ScriptAlias(IP)?|Host|DocumentRoot(IP)?)|KeepAlive(Timeout)?|F(ile(s(Match)?|ETag)|or(ce(Type|LanguagePriority)|ensicLog)|ancyIndexing)|Win32DisableAcceptEx|L(i(sten(Back(log|Log))?|mit(Request(Body|Field(s(ize)?|Size)|Line)|XMLRequestBody|InternalRecursion|Except)?)|o(c(kFile|ation(Match)?)|ad(Module|File)|g(Format|Level))|DAP(SharedCache(Size|File)|Cache(TTL|Entries)|TrustedCA(Type)?|OpCache(TTL|Entries))|anguagePriority)|A(ssignUserID|nonymous(_(MustGiveEmail|NoUserID|VerifyEmail|LogEmail|Authoritative))?|c(ce(ss(Config|FileName)|pt(Mutex|PathInfo|Filter))|tion)|dd(Module(Info)?|Handler|Charset|Type|I(nputFilter|con(By(Type|Encoding))?)|OutputFilter(ByType)?|De(scription|faultCharset)|Encoding|Language|Alt(By(Type|Encoding))?)|uth(GroupFile|Name|Type|D(B(GroupFile|M(GroupFile|Type|UserFile|Authoritative)|UserFile|Authoritative)|igest(GroupFile|ShmemSize|N(cCheck|once(Format|Lifetime))|Domain|Qop|File|Algorithm))|UserFile|LDAP(RemoteUserIsDN|GroupAttribute(IsDN)?|Bind(DN|Password)|C(harsetConfig|ompareDNOnServer)|DereferenceAliases|Url|Enabled|FrontPageHack|Authoritative)|Authoritative)|l(ias(Match)?|low(CONNECT|Override|EncodedSlashes)?)|gentLog)|MIMEMagicFile|WSGI(.[^ ]+))\\b"
     },
     {
-      "match": "\\b(access_module|actions_module|action_module|alias_module|anon_auth_module|asis_module|authn_alias_module|authn_anon_module|authn_dbd_module|authn_dbm_module|authn_default_module|authn_file_module|authnz_ldap_module|authz_dbm_module|authz_default_module|authz_groupfile_module|authz_host_module|authz_owner_module|authz_user_module|auth_basic_module|auth_digest_module|auth_module|autoindex_module|bonjour_module|cache_module|cern_meta_module|cgi_module|config_log_module|dav_fs_module|dav_module|dbd_module|dbm_auth_module|deflate_module|digest_module|dir_module|disk_cache_module|dumpio_module|env_module|expires_module|ext_filter_module|fastcgi_module|filter_module|foo_module|headers_module|hfs_apple_module|ident_module|imagemap_module|imap_module|includes_module|include_module|info_module|jk_module|ldap_module|logio_module|log_config_module|log_forensic_module|mem_cache_module|mime_magic_module|mime_module|negotiation_module|perl_module|php4_module|php5_module|proxy_ajp_module|proxy_balancer_module|proxy_connect_module|proxy_ftp_module|proxy_http_module|proxy_module|rendezvous_apple_module|rendezvous_module|rewrite_module|setenvif_module|speling_module|ssl_module|status_module|suexec_module|substitute_module|unique_id_module|userdir_module|usertrack_module|version_module|vhost_alias_module|wsgi_module)\\b",
-      "name": "support.class.apache-config"
+      "name": "support.class.apache-config",
+      "match": "\\b(access_module|actions_module|action_module|alias_module|anon_auth_module|asis_module|authn_alias_module|authn_anon_module|authn_dbd_module|authn_dbm_module|authn_default_module|authn_file_module|authnz_ldap_module|authz_dbm_module|authz_default_module|authz_groupfile_module|authz_host_module|authz_owner_module|authz_user_module|auth_basic_module|auth_digest_module|auth_module|autoindex_module|bonjour_module|cache_module|cern_meta_module|cgi_module|config_log_module|dav_fs_module|dav_module|dbd_module|dbm_auth_module|deflate_module|digest_module|dir_module|disk_cache_module|dumpio_module|env_module|expires_module|ext_filter_module|fastcgi_module|filter_module|foo_module|headers_module|hfs_apple_module|ident_module|imagemap_module|imap_module|includes_module|include_module|info_module|jk_module|ldap_module|logio_module|log_config_module|log_forensic_module|mem_cache_module|mime_magic_module|mime_module|negotiation_module|perl_module|php4_module|php5_module|proxy_ajp_module|proxy_balancer_module|proxy_connect_module|proxy_ftp_module|proxy_http_module|proxy_module|rendezvous_apple_module|rendezvous_module|rewrite_module|setenvif_module|speling_module|ssl_module|status_module|suexec_module|substitute_module|unique_id_module|userdir_module|usertrack_module|version_module|vhost_alias_module|wsgi_module)\\b"
     },
     {
+      "name": "string.quoted.double.apache-config",
       "begin": "\"",
+      "end": "\"(?!\")",
+      "patterns": [
+        {
+          "name": "constant.character.escape.apostrophe.apache",
+          "match": "\"\""
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.apache-config"
         }
       },
-      "end": "\"(?!\")",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.apache-config"
         }
-      },
-      "name": "string.quoted.double.apache-config",
-      "patterns": [
-        {
-          "match": "\"\"",
-          "name": "constant.character.escape.apostrophe.apache"
-        }
-      ]
+      }
     },
     {
-      "begin": "(</?)([a-zA-Z]+)",
+      "name": "meta.tag.apache-config",
+      "begin": "(\u003c/?)([a-zA-Z]+)",
+      "end": "(/?\u003e)",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag.apache-config"
@@ -320,15 +318,15 @@
         "2": {
           "name": "entity.name.tag.apache-config"
         }
-      },
-      "end": "(/?>)",
-      "name": "meta.tag.apache-config"
+      }
     }
   ],
   "repository": {
     "vars": {
       "patterns": [
         {
+          "name": "support.variable.apache-config",
+          "match": "(%\\{)(?:API_VERSION|AUTH_TYPE|CONN_REMOTE_ADDR|CONTEXT_(?:PREFIX|DOCUMENT_ROOT)|DOCUMENT_ROOT|HTTP(S|_(?:ACCEPT|COOKIE|FORWARDED|HOST|PROXY_CONNECTION|REFERER|USER_AGENT))|IPV6|IS_SUBREQ|REMOTE_(?:ADDR|HOST|IDENT|PORT|USER)|REQUEST_(?:FILENAME|METHOD|SCHEME|URI)|SCRIPT_(?:FILENAME|GROUP|USER)|PATH_INFO|QUERY_STRING|SERVER_(?:ADDR|ADMIN|NAME|PORT|PROTOCOL|SOFTWARE)|THE_REQUEST|TIME_(?:YEAR|MON|DAY|HOUR|MIN|SEC|WDAY)|TIME|(?:ENV|HTTP|LA-F|LA-U|SSL):[^\\}]+)(\\})",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.apache-config"
@@ -336,17 +334,13 @@
             "3": {
               "name": "punctuation.definition.variable.apache-config"
             }
-          },
-          "match": "(%\\{)(?:API_VERSION|AUTH_TYPE|CONN_REMOTE_ADDR|CONTEXT_(?:PREFIX|DOCUMENT_ROOT)|DOCUMENT_ROOT|HTTP(S|_(?:ACCEPT|COOKIE|FORWARDED|HOST|PROXY_CONNECTION|REFERER|USER_AGENT))|IPV6|IS_SUBREQ|REMOTE_(?:ADDR|HOST|IDENT|PORT|USER)|REQUEST_(?:FILENAME|METHOD|SCHEME|URI)|SCRIPT_(?:FILENAME|GROUP|USER)|PATH_INFO|QUERY_STRING|SERVER_(?:ADDR|ADMIN|NAME|PORT|PROTOCOL|SOFTWARE)|THE_REQUEST|TIME_(?:YEAR|MON|DAY|HOUR|MIN|SEC|WDAY)|TIME|(?:ENV|HTTP|LA-F|LA-U|SSL):[^\\}]+)(\\})",
-          "name": "support.variable.apache-config"
+          }
         },
         {
-          "match": "%\\{[^\\}]+\\}",
-          "name": "invalid.illegal.bad-var.apache-config"
+          "name": "invalid.illegal.bad-var.apache-config",
+          "match": "%\\{[^\\}]+\\}"
         }
       ]
     }
-  },
-  "scopeName": "source.apache-config",
-  "uuid": "023D670E-80F1-11D9-9BD1-00039398C572"
-}
+  }
+}