Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update cpp and objective c grammars

Browse Source
This commit is contained in:
Alex Ross
2021-07-13 11:43:19 +02:00
parent 36e5f758d2
commit 6e2b7dda7a
8 changed files with 421 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
extensions/objective-c/syntaxes/objective-c++.tmLanguage.json
View File

@@ -1,10 +1,10 @@
{
"information_for_contributors": [
"This file has been converted from https://github.com/jeff-hykin/cpp-textmate-grammar/blob/master//syntaxes/objcpp.tmLanguage.json",
"This file has been converted from https://github.com/jeff-hykin/cpp-textmate-grammar/blob/master/syntaxes/objcpp.tmLanguage.json",
"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/11b4b4e2abf581d0f3c6c90ac6632d1b2f974c67",
"name": "Objective-C++",
"scopeName": "source.objcpp",
"patterns": [
@@ -286,10 +286,10 @@
"name": "support.constant.cocoa.objcpp"
},
{
"include": "#c_lang"
"include": "#bracketed_content"
},
{
"include": "#bracketed_content"
"include": "#c_lang"
}
],
"repository": {
@@ -502,7 +502,11 @@
"name": "keyword.other.typedef.objcpp"
},
{
"match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
"match": "\\bin\\b",
"name": "keyword.other.in.objcpp"
},
{
"match": "\\b(const|extern|register|restrict|static|volatile|inline|__block)\\b",
"name": "storage.modifier.objcpp"
},
{
@@ -530,6 +534,9 @@
{
"include": "#strings"
},
{
"include": "#special_variables"
},
{
"begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+\t# define\n((?<id>[a-zA-Z_$][\\w$]*))\t # macro name\n(?:\n (\\()\n\t(\n\t \\s* \\g<id> \\s*\t\t # first argument\n\t ((,) \\s* \\g<id> \\s*)* # additional arguments\n\t (?:\\.\\.\\.)?\t\t\t# varargs ellipsis?\n\t)\n (\\))\n)?",
"beginCaptures": {
@@ -6613,9 +6620,6 @@
{
"include": "#property_directive"
},
{
"include": "#special_variables"
},
{
"include": "#method_super"
},
@@ -7001,7 +7005,7 @@
"name": "meta.property-with-attributes.objcpp",
"patterns": [
{
"match": "\\b(getter|setter|readonly|readwrite|assign|retain|copy|nonatomic|strong|weak)\\b",
"match": "\\b(getter|setter|readonly|readwrite|assign|retain|copy|nonatomic|atomic|strong|weak|nonnull|nullable|null_resettable|null_unspecified|class|direct)\\b",
"name": "keyword.other.property.attribute.objcpp"
}
]
@@ -7051,7 +7055,7 @@
]
},
"protocol_type_qualifier": {
"match": "\\b(in|out|inout|oneway|bycopy|byref)\\b",
"match": "\\b(in|out|inout|oneway|bycopy|byref|nonnull|nullable|_Nonnull|_Nullable|_Null_unspecified)\\b",
"name": "storage.modifier.protocol.objcpp"
},
"special_variables": {
@@ -7095,4 +7099,4 @@
]
}
}
}
}

26
extensions/objective-c/syntaxes/objective-c.tmLanguage.json
View File

@@ -1,10 +1,10 @@
{
"information_for_contributors": [
"This file has been converted from https://github.com/jeff-hykin/cpp-textmate-grammar/blob/master//syntaxes/objc.tmLanguage.json",
"This file has been converted from https://github.com/jeff-hykin/cpp-textmate-grammar/blob/master/syntaxes/objc.tmLanguage.json",
"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/11b4b4e2abf581d0f3c6c90ac6632d1b2f974c67",
"name": "Objective-C",
"scopeName": "source.objc",
"patterns": [
@@ -283,10 +283,10 @@
"name": "support.constant.cocoa.objc"
},
{
"include": "#c_lang"
"include": "#bracketed_content"
},
{
"include": "#bracketed_content"
"include": "#c_lang"
}
],
"repository": {
@@ -499,7 +499,11 @@
"name": "keyword.other.typedef.objc"
},
{
"match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
"match": "\\bin\\b",
"name": "keyword.other.in.objc"
},
{
"match": "\\b(const|extern|register|restrict|static|volatile|inline|__block)\\b",
"name": "storage.modifier.objc"
},
{
@@ -527,6 +531,9 @@
{
"include": "#strings"
},
{
"include": "#special_variables"
},
{
"begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+\t# define\n((?<id>[a-zA-Z_$][\\w$]*))\t # macro name\n(?:\n (\\()\n\t(\n\t \\s* \\g<id> \\s*\t\t # first argument\n\t ((,) \\s* \\g<id> \\s*)* # additional arguments\n\t (?:\\.\\.\\.)?\t\t\t# varargs ellipsis?\n\t)\n (\\))\n)?",
"beginCaptures": {
@@ -3121,9 +3128,6 @@
{
"include": "#property_directive"
},
{
"include": "#special_variables"
},
{
"include": "#method_super"
},
@@ -3509,7 +3513,7 @@
"name": "meta.property-with-attributes.objc",
"patterns": [
{
"match": "\\b(getter|setter|readonly|readwrite|assign|retain|copy|nonatomic|strong|weak)\\b",
"match": "\\b(getter|setter|readonly|readwrite|assign|retain|copy|nonatomic|atomic|strong|weak|nonnull|nullable|null_resettable|null_unspecified|class|direct)\\b",
"name": "keyword.other.property.attribute.objc"
}
]
@@ -3559,7 +3563,7 @@
]
},
"protocol_type_qualifier": {
"match": "\\b(in|out|inout|oneway|bycopy|byref)\\b",
"match": "\\b(in|out|inout|oneway|bycopy|byref|nonnull|nullable|_Nonnull|_Nullable|_Null_unspecified)\\b",
"name": "storage.modifier.protocol.objc"
},
"special_variables": {
@@ -3603,4 +3607,4 @@
]
}
}
}
}