Update grammars

This commit is contained in:
Alex Ross 2019-12-10 12:34:44 +01:00
parent e9671e46eb
commit c45e6cc623
14 changed files with 363 additions and 336 deletions

View file

@ -6,11 +6,11 @@
"git": {
"name": "jeff-hykin/cpp-textmate-grammar",
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
"commitHash": "fedd206d1b2803f31a278e9b5f098ce4bc76e532"
"commitHash": "666808cab3907fc91ed4d3901060ee6b045cca58"
}
},
"license": "MIT",
"version": "1.14.13",
"version": "1.14.15",
"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
},
{

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/fedd206d1b2803f31a278e9b5f098ce4bc76e532",
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/72b309aabb63bf14a3cdf0280149121db005d616",
"name": "C",
"scopeName": "source.c",
"patterns": [
@ -583,7 +583,7 @@
},
"case_statement": {
"name": "meta.conditional.case.c",
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)case(?!\\w))",
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
"beginCaptures": {
"1": {
"patterns": [
@ -946,7 +946,7 @@
},
"default_statement": {
"name": "meta.conditional.case.c",
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)default(?!\\w))",
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
"beginCaptures": {
"1": {
"patterns": [
@ -2772,7 +2772,7 @@
}
},
"static_assert": {
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
"beginCaptures": {
"1": {
"patterns": [
@ -3051,7 +3051,7 @@
},
"switch_conditional_parentheses": {
"name": "meta.conditional.switch.c",
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
"beginCaptures": {
"1": {
"patterns": [
@ -3099,7 +3099,7 @@
},
"switch_statement": {
"name": "meta.block.switch.c",
"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)switch(?!\\w)))",
"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
"beginCaptures": {
"1": {
"name": "meta.head.switch.c"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -6,7 +6,7 @@
"git": {
"name": "dotnet/csharp-tmLanguage",
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
"commitHash": "ad7514e8d78542a6ee37f6187091cd4102eb3797"
"commitHash": "572697a2c2267430010b3534281f73337144e94f"
}
},
"license": "MIT",

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/ad7514e8d78542a6ee37f6187091cd4102eb3797",
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/572697a2c2267430010b3534281f73337144e94f",
"name": "C#",
"scopeName": "source.cs",
"patterns": [
@ -2498,7 +2498,7 @@
},
"interpolation": {
"name": "meta.interpolation.cs",
"begin": "(?<=[^\\{])((?:\\{\\{)*)(\\{)(?=[^\\{])",
"begin": "(?<=[^\\{]|^)((?:\\{\\{)*)(\\{)(?=[^\\{])",
"beginCaptures": {
"1": {
"name": "string.quoted.double.cs"

View file

@ -6,11 +6,11 @@
"git": {
"name": "atom/language-java",
"repositoryUrl": "https://github.com/atom/language-java",
"commitHash": "123beb50115b0bfb0db8f2325df6d05fb8a016a8"
"commitHash": "0facf7cbe02cda460db1160fd730f2e57bf15c36"
}
},
"license": "MIT",
"version": "0.31.3"
"version": "0.31.4"
}
],
"version": 1

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/atom/language-java/commit/123beb50115b0bfb0db8f2325df6d05fb8a016a8",
"version": "https://github.com/atom/language-java/commit/0facf7cbe02cda460db1160fd730f2e57bf15c36",
"name": "Java",
"scopeName": "source.java",
"patterns": [
@ -209,7 +209,7 @@
"name": "keyword.control.new.java"
}
},
"end": "(?=;|\\)|,|:|}|\\+|\\-|\\*|\\/|%|!|&|\\||=)",
"end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
"patterns": [
{
"include": "#comments"
@ -269,7 +269,7 @@
]
},
"class": {
"begin": "(?=\\w?[\\w\\s]*\\b(?:class|(?<!@)interface|enum)\\s+\\w+)",
"begin": "(?=\\w?[\\w\\s]*\\b(?:class|(?<!@)interface|enum)\\s+[\\w$]+)",
"end": "}",
"endCaptures": {
"0": {
@ -296,7 +296,7 @@
"name": "entity.name.type.class.java"
}
},
"match": "(class|(?<!@)interface|enum)\\s+(\\w+)",
"match": "(class|(?<!@)interface|enum)\\s+([\\w$]+)",
"name": "meta.class.identifier.java"
},
{
@ -696,52 +696,64 @@
"include": "#comments"
},
{
"begin": "(\\w+)\\s*({)",
"begin": "\\b(\\w+)\\b",
"beginCaptures": {
"1": {
"name": "constant.other.enum.java"
},
"2": {
"name": "punctuation.bracket.curly.java"
}
},
"end": "\\}",
"end": "(,)|(?=;|})",
"endCaptures": {
"0": {
"name": "punctuation.bracket.curly.java"
"1": {
"name": "punctuation.separator.delimiter.java"
}
},
"patterns": [
{
"include": "#class-body"
}
]
},
{
"begin": "(\\w+)\\s*(\\()",
"beginCaptures": {
"1": {
"name": "constant.other.enum.java"
"include": "#comments-javadoc"
},
"2": {
"name": "punctuation.bracket.round.java"
}
},
"end": "\\)",
"endCaptures": {
"0": {
"name": "punctuation.bracket.round.java"
}
},
"patterns": [
{
"include": "#code"
"include": "#comments"
},
{
"begin": "\\(",
"beginCaptures": {
"0": {
"name": "punctuation.bracket.round.java"
}
},
"end": "\\)",
"endCaptures": {
"0": {
"name": "punctuation.bracket.round.java"
}
},
"patterns": [
{
"include": "#code"
}
]
},
{
"begin": "{",
"beginCaptures": {
"0": {
"name": "punctuation.bracket.curly.java"
}
},
"end": "}",
"endCaptures": {
"0": {
"name": "punctuation.bracket.curly.java"
}
},
"patterns": [
{
"include": "#class-body"
}
]
}
]
},
{
"match": "\\b\\w+\\b",
"name": "constant.other.enum.java"
}
]
},
@ -1472,7 +1484,7 @@
]
},
{
"begin": "\\b(catch)\\b\\s*(?=\\(\\s*[^\\s]+\\s*[^)]+\\))",
"begin": "\\b(catch)\\b",
"beginCaptures": {
"1": {
"name": "keyword.control.catch.java"
@ -1486,6 +1498,9 @@
},
"name": "meta.catch.java",
"patterns": [
{
"include": "#comments"
},
{
"begin": "\\(",
"beginCaptures": {
@ -1508,19 +1523,31 @@
"include": "#storage-modifiers"
},
{
"match": "\\|",
"name": "punctuation.catch.separator.java"
},
{
"match": "([a-zA-Z$_][\\.a-zA-Z0-9$_]*)\\s*(\\w+)?",
"captures": {
"1": {
"begin": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
"beginCaptures": {
"0": {
"name": "storage.type.java"
},
"2": {
"name": "variable.parameter.java"
}
}
},
"end": "(\\|)|(?=\\))",
"endCaptures": {
"1": {
"name": "punctuation.catch.separator.java"
}
},
"patterns": [
{
"include": "#comments"
},
{
"match": "\\w+",
"captures": {
"0": {
"name": "variable.parameter.java"
}
}
}
]
}
]
},

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/dc5fe357ee5582244b798917a5fc9d7cd73e6220",
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/2e0fded599d7b85b78692dee3d96e8a4710a5c57",
"name": "JavaScript (with React support)",
"scopeName": "source.js",
"patterns": [
@ -27,12 +27,6 @@
"repository": {
"statements": {
"patterns": [
{
"include": "#string"
},
{
"include": "#comment"
},
{
"include": "#declaration"
},
@ -53,6 +47,12 @@
},
{
"include": "#punctuation-semicolon"
},
{
"include": "#string"
},
{
"include": "#comment"
}
]
},

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/dc5fe357ee5582244b798917a5fc9d7cd73e6220",
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/2e0fded599d7b85b78692dee3d96e8a4710a5c57",
"name": "JavaScript (with React support)",
"scopeName": "source.js.jsx",
"patterns": [
@ -27,12 +27,6 @@
"repository": {
"statements": {
"patterns": [
{
"include": "#string"
},
{
"include": "#comment"
},
{
"include": "#declaration"
},
@ -53,6 +47,12 @@
},
{
"include": "#punctuation-semicolon"
},
{
"include": "#string"
},
{
"include": "#comment"
}
]
},

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/e3091a421bdcad527018c897652ded47585cbd12",
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/8fbbc11a6bb917f287bbe21d0573454020599547",
"name": "Markdown",
"scopeName": "text.html.markdown",
"patterns": [
@ -2623,4 +2623,4 @@
"name": "markup.inline.raw.string.markdown"
}
}
}
}

View file

@ -6,7 +6,7 @@
"git": {
"name": "TypeScript-TmLanguage",
"repositoryUrl": "https://github.com/Microsoft/TypeScript-TmLanguage",
"commitHash": "dc5fe357ee5582244b798917a5fc9d7cd73e6220"
"commitHash": "2e0fded599d7b85b78692dee3d96e8a4710a5c57"
}
},
"license": "MIT",

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/dc5fe357ee5582244b798917a5fc9d7cd73e6220",
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/2e0fded599d7b85b78692dee3d96e8a4710a5c57",
"name": "TypeScript",
"scopeName": "source.ts",
"patterns": [
@ -27,12 +27,6 @@
"repository": {
"statements": {
"patterns": [
{
"include": "#string"
},
{
"include": "#comment"
},
{
"include": "#declaration"
},
@ -53,6 +47,12 @@
},
{
"include": "#punctuation-semicolon"
},
{
"include": "#string"
},
{
"include": "#comment"
}
]
},

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/dc5fe357ee5582244b798917a5fc9d7cd73e6220",
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/2e0fded599d7b85b78692dee3d96e8a4710a5c57",
"name": "TypeScriptReact",
"scopeName": "source.tsx",
"patterns": [
@ -27,12 +27,6 @@
"repository": {
"statements": {
"patterns": [
{
"include": "#string"
},
{
"include": "#comment"
},
{
"include": "#declaration"
},
@ -53,6 +47,12 @@
},
{
"include": "#punctuation-semicolon"
},
{
"include": "#string"
},
{
"include": "#comment"
}
]
},