maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update grammars

Browse source
This commit is contained in:
Alex Ross 2020-02-03 13:01:47 +01:00
parent 0b312b08f2
commit efa12b2f49
22 changed files with 13338 additions and 13658 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/cpp/cgmanifest.json
View file

@ -6,11 +6,11 @@
"git": {
"name": "jeff-hykin/cpp-textmate-grammar",
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
"commitHash": "666808cab3907fc91ed4d3901060ee6b045cca58"
"commitHash": "5b6f67859e895da83dc242b849480ee04ce7ce38"
}
},
"license": "MIT",
"version": "1.14.15",
"version": "1.14.20",
"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."
},
{

292
extensions/cpp/syntaxes/c.tmLanguage.json
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/72b309aabb63bf14a3cdf0280149121db005d616",
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/85b9008b406cc9d3b1c9e779e94cc071116c8426",
"name": "C",
"scopeName": "source.c",
"patterns": [
@ -464,7 +464,7 @@
]
},
"backslash_escapes": {
"match": "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?] |\n[0-3]\\d{,2}\t |\n[4-7]\\d?\t\t|\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
"match": "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?] |\n[0-3][0-7]{,2}\t |\n[4-7]\\d?\t\t|\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
"name": "constant.character.escape.c"
},
"block": {
@ -690,12 +690,20 @@
"name": "storage.type.class.doxygen.c"
},
{
"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
"captures": {
"1": {
"name": "storage.type.class.doxygen.c"
},
"2": {
"patterns": [
{
"match": "in|out",
"name": "keyword.other.parameter.direction.$0.c"
}
]
},
"3": {
"name": "variable.parameter.c"
}
}
@ -768,12 +776,20 @@
"name": "storage.type.class.doxygen.c"
},
{
"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
"captures": {
"1": {
"name": "storage.type.class.doxygen.c"
},
"2": {
"patterns": [
{
"match": "in|out",
"name": "keyword.other.parameter.direction.$0.c"
}
]
},
"3": {
"name": "variable.parameter.c"
}
}
@ -859,12 +875,20 @@
"name": "storage.type.class.doxygen.c"
},
{
"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
"captures": {
"1": {
"name": "storage.type.class.doxygen.c"
},
"2": {
"patterns": [
{
"match": "in|out",
"name": "keyword.other.parameter.direction.$0.c"
}
]
},
"3": {
"name": "variable.parameter.c"
}
}
@ -2874,95 +2898,219 @@
},
{
"name": "meta.asm.c",
"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)\\s*(\\()",
"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)",
"beginCaptures": {
"1": {
"name": "storage.type.asm.c"
},
"2": {
"name": "storage.modifier.c"
},
"3": {
"name": "punctuation.section.parens.begin.bracket.round.assembly.c"
}
},
"end": "(\\))",
"endCaptures": {
"1": {
"name": "punctuation.section.parens.end.bracket.round.assembly.c"
}
},
"end": "(?!\\G)",
"patterns": [
{
"name": "string.quoted.double.c",
"contentName": "meta.embedded.assembly.c",
"begin": "(R?)(\")",
"beginCaptures": {
"match": "(?:^)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\n|$)",
"captures": {
"1": {
"name": "meta.encoding.c"
"patterns": [
{
"include": "#inline_comment"
}
]
},
"2": {
"name": "punctuation.definition.string.begin.assembly.c"
}
},
"end": "(\")",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.assembly.c"
}
},
"patterns": [
{
"include": "source.asm"
"name": "comment.block.c punctuation.definition.comment.begin.c"
},
{
"include": "source.x86"
"3": {
"name": "comment.block.c"
},
{
"include": "source.x86_64"
},
{
"include": "source.arm"
},
{
"include": "#backslash_escapes"
},
{
"include": "#string_escaped_char"
},
{
"match": "(?=not)possible"
"4": {
"patterns": [
{
"match": "\\*\\/",
"name": "comment.block.c punctuation.definition.comment.end.c"
},
{
"match": "\\*",
"name": "comment.block.c"
}
]
}
]
},
{
"begin": "(\\()",
"beginCaptures": {
"1": {
"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.c"
}
},
"end": "(\\))",
"endCaptures": {
"1": {
"name": "punctuation.section.parens.end.bracket.round.assembly.inner.c"
}
},
"patterns": [
{
"include": "#evaluation_context"
}
]
},
{
"match": ":",
"name": "punctuation.separator.delimiter.colon.assembly.c"
}
},
{
"include": "#comments_context"
},
{
"include": "#comments"
},
{
"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\()",
"beginCaptures": {
"1": {
"name": "punctuation.section.parens.begin.bracket.round.assembly.c"
},
"2": {
"patterns": [
{
"include": "#inline_comment"
}
]
},
"3": {
"name": "comment.block.c punctuation.definition.comment.begin.c"
},
"4": {
"name": "comment.block.c"
},
"5": {
"patterns": [
{
"match": "\\*\\/",
"name": "comment.block.c punctuation.definition.comment.end.c"
},
{
"match": "\\*",
"name": "comment.block.c"
}
]
}
},
"end": "(\\))",
"endCaptures": {
"1": {
"name": "punctuation.section.parens.end.bracket.round.assembly.c"
}
},
"patterns": [
{
"name": "string.quoted.double.c",
"contentName": "meta.embedded.assembly.c",
"begin": "(R?)(\")",
"beginCaptures": {
"1": {
"name": "meta.encoding.c"
},
"2": {
"name": "punctuation.definition.string.begin.assembly.c"
}
},
"end": "(\")",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.assembly.c"
}
},
"patterns": [
{
"include": "source.asm"
},
{
"include": "source.x86"
},
{
"include": "source.x86_64"
},
{
"include": "source.arm"
},
{
"include": "#backslash_escapes"
},
{
"include": "#string_escaped_char"
}
]
},
{
"begin": "(\\()",
"beginCaptures": {
"1": {
"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.c"
}
},
"end": "(\\))",
"endCaptures": {
"1": {
"name": "punctuation.section.parens.end.bracket.round.assembly.inner.c"
}
},
"patterns": [
{
"include": "#evaluation_context"
}
]
},
{
"match": "\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))([a-zA-Z_]\\w*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]",
"captures": {
"1": {
"patterns": [
{
"include": "#inline_comment"
}
]
},
"2": {
"name": "comment.block.c punctuation.definition.comment.begin.c"
},
"3": {
"name": "comment.block.c"
},
"4": {
"patterns": [
{
"match": "\\*\\/",
"name": "comment.block.c punctuation.definition.comment.end.c"
},
{
"match": "\\*",
"name": "comment.block.c"
}
]
},
"5": {
"name": "variable.other.asm.label.c"
},
"6": {
"patterns": [
{
"include": "#inline_comment"
}
]
},
"7": {
"name": "comment.block.c punctuation.definition.comment.begin.c"
},
"8": {
"name": "comment.block.c"
},
"9": {
"patterns": [
{
"match": "\\*\\/",
"name": "comment.block.c punctuation.definition.comment.end.c"
},
{
"match": "\\*",
"name": "comment.block.c"
}
]
}
}
},
{
"match": ":",
"name": "punctuation.separator.delimiter.colon.assembly.c"
},
{
"include": "#comments_context"
},
{
"include": "#comments"
}
]
}
]
}

11668
extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

14741
extensions/cpp/syntaxes/cpp.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

12
extensions/cpp/test/colorize-results/test-78769_cpp.json
View file

@ -331,7 +331,7 @@
},
{
"c": " ",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp",
"r": {
"dark_plus": "meta.preprocessor: #569CD6",
"light_plus": "meta.preprocessor: #0000FF",
@ -342,7 +342,7 @@
},
{
"c": "public",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp storage.type.modifier.access.public.cpp",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp storage.type.modifier.access.public.cpp",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
@ -353,7 +353,7 @@
},
{
"c": " ",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp",
"r": {
"dark_plus": "meta.preprocessor: #569CD6",
"light_plus": "meta.preprocessor: #0000FF",
@ -364,7 +364,7 @@
},
{
"c": "base",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.qualified_type.cpp entity.name.type.cpp",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp meta.qualified_type.cpp entity.name.type.cpp",
"r": {
"dark_plus": "entity.name.type: #4EC9B0",
"light_plus": "entity.name.type: #267F99",
@ -375,7 +375,7 @@
},
{
"c": " ",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp",
"r": {
"dark_plus": "meta.preprocessor: #569CD6",
"light_plus": "meta.preprocessor: #0000FF",
@ -386,7 +386,7 @@
},
{
"c": "\\",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp constant.character.escape.line-continuation.cpp",
"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp constant.character.escape.line-continuation.cpp",
"r": {
"dark_plus": "constant.character.escape: #D7BA7D",
"light_plus": "constant.character.escape: #FF0000",

6
extensions/cpp/test/colorize-results/test-80644_cpp.json
View file

@ -375,7 +375,7 @@
},
{
"c": "1",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization.cpp constant.numeric.decimal.cpp",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization constant.numeric.decimal.cpp",
"r": {
"dark_plus": "constant.numeric: #B5CEA8",
"light_plus": "constant.numeric: #098658",
@ -474,7 +474,7 @@
},
{
"c": "3",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization.cpp constant.numeric.decimal.cpp",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization constant.numeric.decimal.cpp",
"r": {
"dark_plus": "constant.numeric: #B5CEA8",
"light_plus": "constant.numeric: #098658",
@ -527,4 +527,4 @@
"hc_black": "default: #FFFFFF"
}
}
]
]

26
extensions/cpp/test/colorize-results/test_cc.json
View file

@ -122,7 +122,7 @@
},
{
"c": "%d",
"t": "source.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
"t": "source.cpp string.quoted.double.cpp constant.other.placeholder",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@ -430,7 +430,7 @@
},
{
"c": "%d",
"t": "source.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
"t": "source.cpp string.quoted.double.cpp constant.other.placeholder",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@ -474,7 +474,7 @@
},
{
"c": "user_candidate",
"t": "source.cpp meta.bracket.square.access.cpp variable.other.object.cpp",
"t": "source.cpp meta.bracket.square.access variable.other.object",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@ -485,7 +485,7 @@
},
{
"c": "[",
"t": "source.cpp meta.bracket.square.access.cpp punctuation.definition.begin.bracket.square.cpp",
"t": "source.cpp meta.bracket.square.access punctuation.definition.begin.bracket.square",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -496,7 +496,7 @@
},
{
"c": "i",
"t": "source.cpp meta.bracket.square.access.cpp",
"t": "source.cpp meta.bracket.square.access",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -507,7 +507,7 @@
},
{
"c": "]",
"t": "source.cpp meta.bracket.square.access.cpp punctuation.definition.end.bracket.square.cpp",
"t": "source.cpp meta.bracket.square.access punctuation.definition.end.bracket.square",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -727,7 +727,7 @@
},
{
"c": "O",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp entity.name.type.parameter.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp entity.name.type.parameter.cpp",
"r": {
"dark_plus": "entity.name.type: #4EC9B0",
"light_plus": "entity.name.type: #267F99",
@ -738,7 +738,7 @@
},
{
"c": " ",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -749,7 +749,7 @@
},
{
"c": "obj",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp variable.parameter.cpp",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@ -1464,7 +1464,7 @@
},
{
"c": "%s",
"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp constant.other.placeholder",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@ -1486,7 +1486,7 @@
},
{
"c": "%s",
"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp constant.other.placeholder",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
@ -1805,7 +1805,7 @@
},
{
"c": "movw $0x38, %ax; ltr %ax",
"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp meta.embedded.assembly.cpp",
"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp meta.embedded.assembly",
"r": {
"dark_plus": "meta.embedded.assembly: #CE9178",
"light_plus": "meta.embedded.assembly: #A31515",
@ -1979,4 +1979,4 @@
"hc_black": "default: #FFFFFF"
}
}
]
]

32
extensions/cpp/test/colorize-results/test_cpp.json
View file

@ -485,7 +485,7 @@
},
{
"c": "int",
"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
@ -496,7 +496,7 @@
},
{
"c": ",",
"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp punctuation.separator.delimiter.comma.cpp",
"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp punctuation.separator.delimiter.comma.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -507,7 +507,7 @@
},
{
"c": "int",
"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
@ -793,7 +793,7 @@
},
{
"c": "int",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
@ -804,7 +804,7 @@
},
{
"c": " ",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -815,7 +815,7 @@
},
{
"c": "x",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp variable.parameter.cpp",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@ -826,7 +826,7 @@
},
{
"c": ",",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp punctuation.separator.delimiter.comma.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp punctuation.separator.delimiter.comma.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -837,7 +837,7 @@
},
{
"c": " ",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -848,7 +848,7 @@
},
{
"c": "int",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
@ -859,7 +859,7 @@
},
{
"c": " ",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -870,7 +870,7 @@
},
{
"c": "y",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp variable.parameter.cpp",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@ -1123,7 +1123,7 @@
},
{
"c": "long",
"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
@ -1134,7 +1134,7 @@
},
{
"c": " ",
"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload.cpp meta.parameter.cpp",
"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload meta.parameter.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -1145,7 +1145,7 @@
},
{
"c": "double",
"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
"r": {
"dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF",
@ -1519,7 +1519,7 @@
},
{
"c": "movl %a %b",
"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp meta.embedded.assembly.cpp",
"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp meta.embedded.assembly",
"r": {
"dark_plus": "meta.embedded.assembly: #CE9178",
"light_plus": "meta.embedded.assembly: #A31515",
@ -2430,4 +2430,4 @@
"hc_black": "default: #FFFFFF"
}
}
]
]

33
extensions/go/syntaxes/go.tmLanguage.json
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/better-go-syntax/commit/54ff898316f8647d77ffcf83880a9556445326f1",
"version": "https://github.com/jeff-hykin/better-go-syntax/commit/302b427373ba8390786723a99f6cdf8e38833159",
"name": "Go",
"scopeName": "source.go",
"patterns": [
@ -149,14 +149,7 @@
}
},
{
"comment": "Floating-point literals",
"match": "(\\.\\d+([Ee][-+]\\d+)?i?)\\b|\\b\\d+\\.\\d*(([Ee][-+]\\d+)?i?\\b)?",
"name": "constant.numeric.floating-point.go"
},
{
"comment": "Integers",
"match": "\\b((0x[0-9a-fA-F]+)|(0[0-7]+i?)|(\\d+([Ee]\\d+)?i?)|(\\d+[Ee][-+]\\d+i?))\\b",
"name": "constant.numeric.integer.go"
"include": "#numeric_literals"
},
{
"comment": "Language constants",
@ -259,7 +252,7 @@
}
},
{
"match": "\\w+(?:,\\s*\\w+)*(?=\\s*:=)",
"match": "\\b\\w+(?:,\\s*\\w+)*(?=\\s*:=)",
"captures": {
"0": {
"patterns": [
@ -594,7 +587,7 @@
"string_placeholder": {
"patterns": [
{
"match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGsp]",
"match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGspw]",
"name": "constant.other.placeholder.go"
}
]
@ -678,6 +671,24 @@
]
}
]
},
"numeric_literals": {
"patterns": [
{
"include": "#float"
},
{
"include": "#integer"
}
]
},
"float": {
"match": "(\\.\\d+([Ee][-+]\\d+)?i?)\\b|\\b\\d+\\.\\d*(([Ee][-+]\\d+)?i?\\b)?",
"name": "constant.numeric.floating-point.go"
},
"integer": {
"match": "\\b((0x[0-9a-fA-F]+)|(0[0-7]+i?)|(\\d+([Ee]\\d+)?i?)|(\\d+[Ee][-+]\\d+i?))\\b",
"name": "constant.numeric.integer.go"
}
}
}

2
extensions/hlsl/cgmanifest.json
View file

@ -6,7 +6,7 @@
"git": {
"name": "shaders-tmLanguage",
"repositoryUrl": "https://github.com/tgjones/shaders-tmLanguage",
"commitHash": "cd1ef40f549f9ce2b9e6b73498688de114a85382"
"commitHash": "87c0dca3a39170dbd7ee7e277db4f915fb2de14a"
}
},
"license": "MIT",

16
extensions/hlsl/syntaxes/hlsl.tmLanguage.json
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/tgjones/shaders-tmLanguage/commit/cd1ef40f549f9ce2b9e6b73498688de114a85382",
"version": "https://github.com/tgjones/shaders-tmLanguage/commit/87c0dca3a39170dbd7ee7e277db4f915fb2de14a",
"name": "HLSL",
"scopeName": "source.hlsl",
"patterns": [
@ -19,16 +19,20 @@
"end": "$"
},
{
"name": "constant.numeric.hlsl",
"match": "\\b([0-9]+\\.?[0-9]*)\\b"
"name": "constant.numeric.decimal.hlsl",
"match": "\\b[0-9]+\\.[0-9]*(F|f)?\\b"
},
{
"name": "constant.numeric.hlsl",
"match": "\\b(\\.[0-9]+)\\b"
"name": "constant.numeric.decimal.hlsl",
"match": "(\\.([0-9]+)(F|f)?)\\b"
},
{
"name": "constant.numeric.decimal.hlsl",
"match": "\\b([0-9]+(F|f)?)\\b"
},
{
"name": "constant.numeric.hex.hlsl",
"match": "\\b(0x[0-9A-F]+)\\b"
"match": "\\b(0(x|X)[0-9a-fA-F]+)\\b"
},
{
"name": "constant.language.hlsl",

4
extensions/log/cgmanifest.json
View file

@ -6,11 +6,11 @@
"git": {
"name": "vscode-logfile-highlighter",
"repositoryUrl": "https://github.com/emilast/vscode-logfile-highlighter",
"commitHash": "e90aa2554b439827f125fd60ff6d7773fc582fcc"
"commitHash": "fbe9797ea7889ee55def6da8dee86ba625ca9759"
}
},
"license": "MIT",
"version": "2.5.0"
"version": "2.6.0"
}
],
"version": 1

8
extensions/log/syntaxes/log.tmLanguage.json
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/emilast/vscode-logfile-highlighter/commit/e90aa2554b439827f125fd60ff6d7773fc582fcc",
"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/fbe9797ea7889ee55def6da8dee86ba625ca9759",
"name": "Log file",
"scopeName": "text.log",
"patterns": [
@ -33,7 +33,7 @@
"name": "markup.changed log.debug"
},
{
"match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE)\\b|(?i)\\b(info|information)\\:",
"match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE|II)\\b|(?i)\\b(info|information)\\:",
"name": "markup.inserted log.info"
},
{
@ -45,7 +45,7 @@
"name": "markup.inserted log.info"
},
{
"match": "\\b(WARNING|WARN|Warn)\\b|(?i)\\b(warning)\\:",
"match": "\\b(WARNING|WARN|Warn|WW)\\b|(?i)\\b(warning)\\:",
"name": "markup.deleted log.warning"
},
{
@ -57,7 +57,7 @@
"name": "markup.deleted log.warning"
},
{
"match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|Error)\\b|(?i)\\b(error)\\:",
"match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|FATAL|Error|EE)\\b|(?i)\\b(error)\\:",
"name": "string.regexp, strong log.error"
},
{

2
extensions/objective-c/cgmanifest.json
View file

@ -6,7 +6,7 @@
"git": {
"name": "jeff-hykin/cpp-textmate-grammar",
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
"commitHash": "bc7dedd28eebe52b374744d3fb34d77ff441569e"
"commitHash": "d62c0002b4c36c1c5add356ecc6f478bc2d416e1"
}
},
"license": "MIT",

2
extensions/objective-c/syntaxes/objective-c++.tmLanguage.json
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/bc7dedd28eebe52b374744d3fb34d77ff441569e",
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/d62c0002b4c36c1c5add356ecc6f478bc2d416e1",
"name": "Objective-C++",
"scopeName": "source.objcpp",
"patterns": [

2
extensions/objective-c/syntaxes/objective-c.tmLanguage.json
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/bc7dedd28eebe52b374744d3fb34d77ff441569e",
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/d62c0002b4c36c1c5add356ecc6f478bc2d416e1",
"name": "Objective-C",
"scopeName": "source.objc",
"patterns": [

4
extensions/php/cgmanifest.json
View file

@ -6,11 +6,11 @@
"git": {
"name": "language-php",
"repositoryUrl": "https://github.com/atom/language-php",
"commitHash": "b95dc79f30084c25547397ab41388af154e69895"
"commitHash": "96368115562c38ab3a203a03c4e26cca80fa2a10"
}
},
"license": "MIT",
"version": "0.44.3"
"version": "0.44.4"
}
],
"version": 1

124
extensions/php/syntaxes/php.tmLanguage.json
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-php/commit/b95dc79f30084c25547397ab41388af154e69895",
"version": "https://github.com/atom/language-php/commit/96368115562c38ab3a203a03c4e26cca80fa2a10",
"scopeName": "source.php",
"patterns": [
{
@ -230,7 +230,7 @@
]
},
{
"begin": "(?i)(?:^|(?<=}))\\s*(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)",
"begin": "(?ix)\n(?:\n (?:^|(?<=}))\\s*(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\n |\\b(new)\\s+(class)\\b # anonymous class\n)",
"beginCaptures": {
"1": {
"name": "storage.modifier.${1:/downcase}.php"
@ -240,6 +240,12 @@
},
"3": {
"name": "entity.name.type.class.php"
},
"4": {
"name": "keyword.other.new.php"
},
"5": {
"name": "storage.type.class.php"
}
},
"end": "}|(?=\\?>)",
@ -525,7 +531,61 @@
]
},
{
"begin": "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\\s+\n(?i:\n (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|\n clone|set_state|sleep|wakeup|autoload|invoke|callStatic))\n |(?:(&)?\\s*([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*))\n)\n\\s*(\\()",
"begin": "(?i)\\b(fn)\\s*(?=&?\\s*\\()",
"beginCaptures": {
"1": {
"name": "storage.type.function.php"
}
},
"end": "=>",
"endCaptures": {
"0": {
"name": "punctuation.definition.arrow.php"
}
},
"name": "meta.function.closure.php",
"patterns": [
{
"begin": "(&)?\\s*(\\()",
"beginCaptures": {
"1": {
"name": "storage.modifier.reference.php"
},
"2": {
"name": "punctuation.definition.parameters.begin.bracket.round.php"
}
},
"contentName": "meta.function.parameters.php",
"end": "\\)",
"endCaptures": {
"0": {
"name": "punctuation.definition.parameters.end.bracket.round.php"
}
},
"patterns": [
{
"include": "#function-parameters"
}
]
},
{
"match": "(:)\\s*(\\?)?\\s*((?:\\\\?[a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*)+)\\s*",
"captures": {
"1": {
"name": "keyword.operator.return-value.php"
},
"2": {
"name": "keyword.operator.nullable-type.php"
},
"3": {
"name": "storage.type.php"
}
}
}
]
},
{
"begin": "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\\s+\n(?i:\n (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|\n clone|set_state|sleep|wakeup|autoload|invoke|callStatic|serialize|unserialize))\n |(?:(&)?\\s*([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*))\n)\n\\s*(\\()",
"beginCaptures": {
"1": {
"patterns": [
@ -574,6 +634,44 @@
}
]
},
{
"match": "(?xi)\n((?:(?:public|private|protected|static)(?:\\s+|(?=\\?)))+) # At least one modifier\n(?:(\\?)?\\s* # Optional nullable\n (\\\\?(?:[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)*) # Optional namespace\n ([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))? # Typehinted class name\n\\s+((\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name",
"captures": {
"1": {
"patterns": [
{
"match": "public|private|protected|static",
"name": "storage.modifier.php"
}
]
},
"2": {
"name": "keyword.operator.nullable-type.php"
},
"3": {
"name": "support.other.namespace.php",
"patterns": [
{
"match": "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
"name": "storage.type.php"
},
{
"match": "\\\\",
"name": "punctuation.separator.inheritance.php"
}
]
},
"4": {
"name": "storage.type.php"
},
"5": {
"name": "variable.other.php"
},
"6": {
"name": "punctuation.definition.variable.php"
}
}
},
{
"include": "#invoke-call"
},
@ -667,6 +765,10 @@
"match": "(?i)\\bclone\\b",
"name": "keyword.other.clone.php"
},
{
"match": "\\.\\.\\.",
"name": "keyword.operator.spread.php"
},
{
"match": "\\.=?",
"name": "keyword.operator.string.php"
@ -698,7 +800,7 @@
"name": "keyword.operator.comparison.php"
},
{
"match": "=|\\+=|\\-=|\\*=|/=|%=|&=|\\|=|\\^=|<<=|>>=",
"match": "=|\\+=|\\-=|\\*\\*?=|/=|%=|&=|\\|=|\\^=|<<=|>>=|\\?\\?=",
"name": "keyword.operator.assignment.php"
},
{
@ -710,7 +812,7 @@
"name": "keyword.operator.increment-decrement.php"
},
{
"match": "\\-|\\+|\\*|/|%",
"match": "\\-|\\+|\\*\\*?|/|%",
"name": "keyword.operator.arithmetic.php"
},
{
@ -1959,7 +2061,7 @@
]
},
"instantiation": {
"begin": "(?i)(new)\\s+",
"begin": "(?i)(new)\\s+(?!class\\b)",
"beginCaptures": {
"1": {
"name": "keyword.other.new.php"
@ -2066,19 +2168,19 @@
"numbers": {
"patterns": [
{
"match": "0[xX][0-9a-fA-F]+",
"match": "0[xX][0-9a-fA-F]+(?:_[0-9a-fA-F]+)*",
"name": "constant.numeric.hex.php"
},
{
"match": "0[bB][01]+",
"match": "0[bB][01]+(?:_[01]+)*",
"name": "constant.numeric.binary.php"
},
{
"match": "0[0-7]+",
"match": "0(?:_?[0-7]+)+",
"name": "constant.numeric.octal.php"
},
{
"match": "(?x)\n(?:\n [0-9]*(\\.)[0-9]+(?:[eE][+-]?[0-9]+)?|\n [0-9]+(\\.)[0-9]*(?:[eE][+-]?[0-9]+)?|\n [0-9]+[eE][+-]?[0-9]+\n)",
"match": "(?x)\n(?:\n (?:[0-9]+(?:_[0-9]+)*)?(\\.)[0-9]+(?:_[0-9]+)*(?:[eE][+-]?[0-9]+(?:_[0-9]+)*)?| # .3\n [0-9]+(?:_[0-9]+)*(\\.)(?:[0-9]+(?:_[0-9]+)*)?(?:[eE][+-]?[0-9]+(?:_[0-9]+)*)?| # 3.\n [0-9]+(?:_[0-9]+)*[eE][+-]?[0-9]+(?:_[0-9]+)* # 2e-3\n)",
"name": "constant.numeric.decimal.php",
"captures": {
"1": {
@ -2090,7 +2192,7 @@
}
},
{
"match": "0|[1-9][0-9]*",
"match": "0|[1-9](?:_?[0-9]+)*",
"name": "constant.numeric.decimal.php"
}
]

4
extensions/r/cgmanifest.json
View file

@ -6,11 +6,11 @@
"git": {
"name": "Ikuyadeu/vscode-R",
"repositoryUrl": "https://github.com/Ikuyadeu/vscode-R",
"commitHash": "1cd3d42a6b2e54276ef2d71fe33bb3fefb1d6cff"
"commitHash": "bc79e9245682ee09b4f0b742b927a37702d91b82"
}
},
"license": "MIT",
"version": "0.5.5"
"version": "1.1.8"
}
],
"version": 1

4
extensions/r/syntaxes/r.tmLanguage.json
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/Ikuyadeu/vscode-R/commit/1cd3d42a6b2e54276ef2d71fe33bb3fefb1d6cff",
"version": "https://github.com/Ikuyadeu/vscode-R/commit/bc79e9245682ee09b4f0b742b927a37702d91b82",
"name": "R",
"scopeName": "source.r",
"patterns": [
@ -417,7 +417,7 @@
"end": "(\\))",
"endCaptures": {
"1": {
"name": "punctuation.definition.parameters.r"
"name": "punctuation.section.parens.end.r"
}
},
"name": "meta.function-call.r",

6
extensions/r/test/colorize-results/test_r.json
View file

@ -639,7 +639,7 @@
},
{
"c": ")",
"t": "source.r meta.function-call.r punctuation.definition.parameters.r",
"t": "source.r meta.function-call.r punctuation.section.parens.end.r",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -716,7 +716,7 @@
},
{
"c": ")",
"t": "source.r meta.function-call.r punctuation.definition.parameters.r",
"t": "source.r meta.function-call.r punctuation.section.parens.end.r",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -1044,4 +1044,4 @@
"hc_black": "default: #FFFFFF"
}
}
]
]

4
extensions/shaderlab/test/colorize-results/test_shader.json
View file

@ -452,7 +452,7 @@
},
{
"c": "1",
"t": "source.shaderlab meta.cgblock constant.numeric.hlsl",
"t": "source.shaderlab meta.cgblock constant.numeric.decimal.hlsl",
"r": {
"dark_plus": "constant.numeric: #B5CEA8",
"light_plus": "constant.numeric: #098658",
@ -571,4 +571,4 @@
"hc_black": "default: #FFFFFF"
}
}
]
]