Skip to content

Commit f2519af

Browse files
hokeinsam-mccall
andauthored
Remove legacy semantic-highlighting client code. (#273)
* Remove legacy semantic-highlighting client code. The legacy semantic-highlighting support has been dropped since clangd13. * Also drop obsolete dependencies Co-authored-by: Sam McCall <[email protected]>
1 parent 0636e48 commit f2519af

File tree

5 files changed

+22
-626
lines changed

5 files changed

+22
-626
lines changed

package-lock.json

Lines changed: 1 addition & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646
"dependencies": {
4747
"@clangd/install": "0.1.4",
4848
"abort-controller": "^3.0.0",
49-
"jsonc-parser": "^2.1.0",
50-
"vscode-languageclient": "7.1.0-next.1",
51-
"vscode-languageserver-types": "3.16.0"
49+
"vscode-languageclient": "7.1.0-next.1"
5250
},
5351
"devDependencies": {
5452
"@types/glob": "^7.1.1",
@@ -58,9 +56,9 @@
5856
"clang-format": "1.4.0",
5957
"glob": "^7.1.4",
6058
"mocha": "^9.1.3",
59+
"ovsx": "^0.2.1",
6160
"typescript": "^3.8.3",
6261
"vsce": "^1.93.0",
63-
"ovsx": "^0.2.1",
6462
"vscode-test": "^1.3.0"
6563
},
6664
"repository": {
@@ -104,7 +102,8 @@
104102
"clangd.semanticHighlighting": {
105103
"type": "boolean",
106104
"default": true,
107-
"description": "Enable semantic highlighting in clangd."
105+
"description": "Enable semantic highlighting in clangd.",
106+
"deprecationMessage": "Legacy semanticHighlights is no longer supported. Please use `editor.semanticHighlighting.enabled` instead."
108107
},
109108
"clangd.fallbackFlags": {
110109
"type": "array",
@@ -342,24 +341,24 @@
342341
]
343342
},
344343
"colors": [
345-
{
346-
"id": "clangd.inlayHints.foreground",
347-
"description": "Foreground color of inlay hints",
348-
"defaults": {
349-
"dark": "#A0A0A0F0",
350-
"light": "#747474",
351-
"highContrast": "#BEBEBE"
352-
}
353-
},
354-
{
355-
"id": "clangd.inlayHints.background",
356-
"description": "Background color of inlay hints",
357-
"defaults": {
358-
"dark": "#11223300",
359-
"light": "#11223300",
360-
"highContrast": "#11223300"
344+
{
345+
"id": "clangd.inlayHints.foreground",
346+
"description": "Foreground color of inlay hints",
347+
"defaults": {
348+
"dark": "#A0A0A0F0",
349+
"light": "#747474",
350+
"highContrast": "#BEBEBE"
351+
}
352+
},
353+
{
354+
"id": "clangd.inlayHints.background",
355+
"description": "Background color of inlay hints",
356+
"defaults": {
357+
"dark": "#11223300",
358+
"light": "#11223300",
359+
"highContrast": "#11223300"
360+
}
361361
}
362-
}
363362
]
364363
}
365364
}

src/clangd-context.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import * as inlayHints from './inlay-hints';
99
import * as install from './install';
1010
import * as memoryUsage from './memory-usage';
1111
import * as openConfig from './open-config';
12-
import * as semanticHighlighting from './semantic-highlighting';
1312
import * as switchSourceHeader from './switch-source-header';
1413
import * as typeHierarchy from './type-hierarchy';
1514

@@ -151,8 +150,6 @@ export class ClangdContext implements vscode.Disposable {
151150
this.client.createDefaultErrorHandler(
152151
// max restart count
153152
config.get<boolean>('restartAfterCrash') ? /*default*/ 4 : 0);
154-
if (config.get<boolean>('semanticHighlighting'))
155-
semanticHighlighting.activate(this);
156153
this.client.registerFeature(new EnableEditsNearCursorFeature);
157154
typeHierarchy.activate(this);
158155
inlayHints.activate(this);

0 commit comments

Comments
 (0)