Skip to content

Cherry pick into release for 0.24.1 #3946

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 19, 2019
Merged

Cherry pick into release for 0.24.1 #3946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a369ede
Update changelog for 0.24.1 release (#3945)
Colengms Jul 19, 2019
0c4c83e
Improve scope names used by Enhanced Colorization (#3896)
Colengms Jul 18, 2019
779f2ce
Fix issue with didClose received after didOpen (#3844)
Colengms Jul 4, 2019
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: 39 additions & 39 deletions Documentation/LanguageServer/colorization.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,32 @@ Colors are associated with [TextMate scopes](https://macromates.com/manual/en/la

| Token | Scope |
| ------------- |:-------------:|
| Class Template | entity.name.class.template |
| Class Template | entity.name.type.class.templated |
| Enumerator | variable.other.enummember |
| Event (C++/CLI) | variable.other.event |
| Function | entity.name.function |
| Function Template | entity.name.function.template |
| Generic Type (C++/CLI) | entity.name.class.generic |
| Function Template | entity.name.function.templated |
| Generic Type (C++/CLI) | entity.name.type.class.generic |
| Global Variable | variable.other.global |
| Label | entity.name.label |
| Local Variable | variable.other.local |
| Macro | entity.name.function.preprocessor |
| Member Field | variable.other.member |
| Member Field | variable.other.property |
| Member Function | entity.name.function.member |
| Member Operator | keyword.operator.member |
| Namespace | entity.name.type.namespace |
| Namespace | entity.name.namespace |
| New / Delete | keyword.operator.new |
| Operator Function | entity.name.function.operator |
| Operator Overload Function | entity.name.function.operator |
| Operator Overload Member | entity.name.function.operator.member |
| Parameter | variable.parameter |
| Property (C++/CLI) | variable.other.property |
| Reference Type (C++/CLI) | entity.name.class.reference |
| Static Member Field | variable.other.member.static |
| Property (C++/CLI) | variable.other.property.cli |
| Reference Type (C++/CLI) | entity.name.type.class.reference |
| Static Member Field | variable.other.property.static |
| Static Member Function | entity.name.function.member.static |
| Type | entity.name.type |
| User-Defined Literal - Number | entity.name.user-defined-literal.number |
| User-Defined Literal - Raw | entity.name.user-defined-literal |
| User-Defined Literal - String | entity.name.user-defined-literal.string |
| Value Type (C++/CLI) | entity.name.class.value |
| Type | entity.name.type.class |
| User-Defined Literal - Number | entity.name.operator.custom-literal.number |
| User-Defined Literal - Raw | entity.name.operator.custom-literal |
| User-Defined Literal - String | entity.name.operator.custom-literal.string |
| Value Type (C++/CLI) | entity.name.type.class.value |

Many of the tokens recognized by IntelliSense do not directly map to existing scopes in the VS Code's default C/C++ TextMate grammar, so are likely not colored by existing VS Code themes.

Expand All @@ -55,7 +55,7 @@ Colors can also be overridden globally, in settings:
"editor.tokenColorCustomizations": {
"textMateRules": [
{
"scope": "entity.name.type",
"scope": "entity.name.type.class",
"settings": {
"foreground": "#FF0000",
"fontStyle": "italic bold underline"
Expand All @@ -70,7 +70,7 @@ Or, overridden on a per-theme basis:
"[Visual Studio Dark]": {
"textMateRules": [
{
"scope": "entity.name.type",
"scope": "entity.name.type.class",
"settings": {
"foreground": "#FF0000",
"fontStyle": "italic bold underline"
Expand Down Expand Up @@ -171,19 +171,19 @@ Use the following to augment the Visual Studio Dark theme to match what Visual S
}
},
{
"scope": "entity.name.type",
"scope": "entity.name.type.class",
"settings": {
"foreground": "#4EC9B0"
}
},
{
"scope": "entity.name.class.reference",
"scope": "entity.name.type.class.reference",
"settings": {
"foreground": "#4EC9B0"
}
},
{
"scope": "entity.name.class.value",
"scope": "entity.name.type.class.value",
"settings": {
"foreground": "#4EC9B0"
}
Expand All @@ -201,7 +201,7 @@ Use the following to augment the Visual Studio Dark theme to match what Visual S
}
},
{
"scope": "variable.other.member",
"scope": "variable.other.property",
"settings": {
"foreground": "#DADADA"
}
Expand All @@ -213,7 +213,7 @@ Use the following to augment the Visual Studio Dark theme to match what Visual S
}
},
{
"scope": "variable.other.member.static",
"scope": "variable.other.property.static",
"settings": {
"foreground": "#C8C8C8"
}
Expand All @@ -225,19 +225,19 @@ Use the following to augment the Visual Studio Dark theme to match what Visual S
}
},
{
"scope": "entity.name.class.template",
"scope": "entity.name.type.class.templated",
"settings": {
"foreground": "#4EC9B0"
}
},
{
"scope": "entity.name.class.generic",
"scope": "entity.name.type.class.generic",
"settings": {
"foreground": "#4EC9B0"
}
},
{
"scope": "entity.name.function.template",
"scope": "entity.name.function.templated",
"settings": {
"foreground": "#C8C8C8"
}
Expand All @@ -255,19 +255,19 @@ Use the following to augment the Visual Studio Dark theme to match what Visual S
}
},
{
"scope": "entity.name.user-defined-literal",
"scope": "entity.name.operator.custom-literal",
"settings": {
"foreground": "#DADADA"
}
},
{
"scope": "entity.name.user-defined-literal.string",
"scope": "entity.name.operator.custom-literal.string",
"settings": {
"foreground": "#D69D85"
}
},
{
"scope": "entity.name.user-defined-literal.number",
"scope": "entity.name.operator.custom-literal.number",
"settings": {
"foreground": "#B5CEA8"
}
Expand Down Expand Up @@ -386,19 +386,19 @@ Use the following to augment the Visual Studio Light theme to match what Visual
}
},
{
"scope": "entity.name.type",
"scope": "entity.name.type.class",
"settings": {
"foreground": "#2B91AF"
}
},
{
"scope": "entity.name.class.reference",
"scope": "entity.name.type.class.reference",
"settings": {
"foreground": "#2B91AF"
}
},
{
"scope": "entity.name.class.value",
"scope": "entity.name.type.class.value",
"settings": {
"foreground": "#2B91AF"
}
Expand All @@ -416,7 +416,7 @@ Use the following to augment the Visual Studio Light theme to match what Visual
}
},
{
"scope": "variable.other.member",
"scope": "variable.other.property",
"settings": {
"foreground": "#000000"
}
Expand All @@ -428,7 +428,7 @@ Use the following to augment the Visual Studio Light theme to match what Visual
}
},
{
"scope": "variable.other.member.static",
"scope": "variable.other.property.static",
"settings": {
"foreground": "#000000"
}
Expand All @@ -440,19 +440,19 @@ Use the following to augment the Visual Studio Light theme to match what Visual
}
},
{
"scope": "entity.name.class.template",
"scope": "entity.name.type.class.templated",
"settings": {
"foreground": "#2B91AF"
}
},
{
"scope": "entity.name.class.generic",
"scope": "entity.name.type.class.generic",
"settings": {
"foreground": "#2B91AF"
}
},
{
"scope": "entity.name.function.template",
"scope": "entity.name.function.templated",
"settings": {
"foreground": "#000000"
}
Expand All @@ -470,19 +470,19 @@ Use the following to augment the Visual Studio Light theme to match what Visual
}
},
{
"scope": "entity.name.user-defined-literal",
"scope": "entity.name.operator.custom-literal",
"settings": {
"foreground": "#000000"
}
},
{
"scope": "entity.name.user-defined-literal.string",
"scope": "entity.name.operator.custom-literal.string",
"settings": {
"foreground": "#A31515"
}
},
{
"scope": "entity.name.user-defined-literal.number",
"scope": "entity.name.operator.custom-literal.number",
"settings": {
"foreground": "#000000"
}
Expand Down
5 changes: 5 additions & 0 deletions Extension/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# C/C++ for Visual Studio Code Change Log

## Version 0.24.1: July 22, 2019
### Bug Fixes
* Fix an issue with the Outline not being populated when a file is opened. [#3877](https://github.com/microsoft/vscode-cpptools/issues/3877)
* Update scopes used by semantic colorization. [PR# 3896](https://github.com/microsoft/vscode-cpptools/pull/3896)

## Version 0.24.0: July 3, 2019
### New Features
* Semantic colorization [Documentation](https://github.com/microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/colorization.md) [#230](https://github.com/microsoft/vscode-cpptools/issues/230)
Expand Down
Loading