Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Semantic Tokens API #5401

Merged
merged 31 commits into from
Jul 1, 2020
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a6aa50a
Work in progress
Colengms Apr 23, 2020
69ca692
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Apr 23, 2020
949759b
Work in progress
Colengms Apr 23, 2020
d70e249
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Apr 27, 2020
747ec85
Work in progress
Colengms Apr 28, 2020
33ebcad
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Apr 30, 2020
0ddb1b9
Work in progress
Colengms Apr 30, 2020
258eb48
Restore some code that shouldn't have been removed
Colengms Apr 30, 2020
8decc80
Merge branch 'master' into coleng/semantic_tokens
Colengms May 1, 2020
27e088d
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms May 8, 2020
f652775
Increase minimum VS Code version requirement to 1.44.0
Colengms May 8, 2020
59946c9
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms May 13, 2020
a6cec7e
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms May 26, 2020
d833e5b
Merge branch 'master' into coleng/semantic_tokens
Colengms May 28, 2020
b77922a
Merge branch 'coleng/semantic_tokens' of https://github.com/microsoft…
Colengms May 28, 2020
12b7081
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Jun 5, 2020
4d85817
Update themes
Colengms Jun 8, 2020
f5dcf96
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Jun 9, 2020
d901d79
Merge branch 'master' into coleng/semantic_tokens
sean-mcmanus Jun 12, 2020
49f8d17
Edit ReadMe.
sean-mcmanus Jun 15, 2020
54314a9
Fix missed spaces.
sean-mcmanus Jun 15, 2020
fa422d5
Merge.
sean-mcmanus Jun 15, 2020
c98970d
Fix linter errors.
sean-mcmanus Jun 15, 2020
4448ab9
Merge branch 'master' into coleng/semantic_tokens
sean-mcmanus Jun 15, 2020
641d661
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Jun 17, 2020
628ea60
Merge branch 'coleng/semantic_tokens' of https://github.com/microsoft…
Colengms Jun 17, 2020
e37b5f4
Enable semantic highlighing by default for C and CPP files
Colengms Jun 29, 2020
5b95f55
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Jun 29, 2020
60861c8
Swtich from using 'type' to 'class' for fallback colors
Colengms Jun 30, 2020
a51c80f
Add our old custom scopes as fallbacks
Colengms Jun 30, 2020
282d01f
Fix issue with json validation
Colengms Jun 30, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 75 additions & 3 deletions Extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"license": "SEE LICENSE IN LICENSE.txt",
"engines": {
"vscode": "^1.43.0"
"vscode": "^1.44.0"
},
"bugs": {
"url": "https://github.com/Microsoft/vscode-cpptools/issues",
Expand Down Expand Up @@ -1495,7 +1495,79 @@
"[Log]": {
"editor.wordWrap": "off"
}
}
},
"semanticTokenTypes": [
{
"id": "referenceType",
"superType": "type",
"description": "A C++/CLI reference type."
},
{
"id": "cliProperty",
"superType": "property",
"description": "A C++/CLI property."
},
{
"id": "genericType",
"superType": "type",
"description": "A C++/CLI generic type."
},
{
"id": "valueType",
"superType": "type",
"description": "A C++/CLI value type."
},
{
"id": "templateFunction",
"superType": "function",
"description": "A template function."
},
{
"id": "templateType",
"superType": "type",
"description": "A template type."
},
{
"id": "operatorOverload",
"superType": "operator",
"description": "An overloaded operator."
},
{
"id": "memberOperatorOverload",
"superType": "operator",
"description": "An overloaded operator member function."
},
{
"id": "newOperator",
"superType": "operator",
"description": "A C++ new or delete operator."
},
{
"id": "customLiteral",
"superType": "number",
"description": "A user-defined literal."
},
{
"id": "numberLiteral",
"superType": "number",
"description": "A user-defined literal number."
},
{
"id": "stringLiteral",
"superType": "string",
"description": "A user-defined literal string."
}
],
"semanticTokenModifiers": [
{
"id": "global",
"description": "Annotates a symbol that is declared in global scope."
},
{
"id": "local",
"description": "Annotates a symbol that is declared in local scope."
}
]
},
"scripts": {
"vscode:prepublish": "yarn run compile",
Expand Down Expand Up @@ -1526,7 +1598,7 @@
"@types/plist": "^3.0.2",
"@types/semver": "^7.1.0",
"@types/tmp": "^0.1.0",
"@types/vscode": "1.43.0",
"@types/vscode": "1.44.0",
"@types/webpack": "^4.39.0",
"@types/which": "^1.3.2",
"@types/yauzl": "^2.9.1",
Expand Down
2 changes: 1 addition & 1 deletion Extension/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"c_cpp.configuration.updateChannel.description": "Set to \"Insiders\" to automatically download and install the latest Insiders builds of the extension, which include upcoming features and bug fixes.",
"c_cpp.configuration.experimentalFeatures.description": "Controls whether \"experimental\" features are usable.",
"c_cpp.configuration.suggestSnippets.description": "If true, snippets are provided by the language server.",
"c_cpp.configuration.enhancedColorization.description": "If enabled, code is colorized based on IntelliSense. This setting has no effect if IntelliSense is disabled or if using the Default High Contrast theme.",
"c_cpp.configuration.enhancedColorization.description": "If enabled, code is colorized based on IntelliSense. This setting only applies if intelliSenseEngine is set to \"Default\".",
"c_cpp.configuration.codeFolding.description": "If enabled, code folding ranges are provided by the language server.",
"c_cpp.configuration.vcpkg.enabled.markdownDescription": "Enable integration services for the [vcpkg dependency manager](https://aka.ms/vcpkg/).",
"c_cpp.configuration.renameRequiresIdentifier.description": "If true, 'Rename Symbol' will require a valid C/C++ identifier.",
Expand Down
Loading