summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang-tools-extra/clangd/clients/clangd-vscode/package.json5
-rw-r--r--clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts10
2 files changed, 11 insertions, 4 deletions
diff --git a/clang-tools-extra/clangd/clients/clangd-vscode/package.json b/clang-tools-extra/clangd/clients/clangd-vscode/package.json
index 52e59141b9f..c2ef3f853e2 100644
--- a/clang-tools-extra/clangd/clients/clangd-vscode/package.json
+++ b/clang-tools-extra/clangd/clients/clangd-vscode/package.json
@@ -89,6 +89,11 @@
"clangd.trace": {
"type": "string",
"description": "Names a file that clangd should log a performance trace to, in chrome trace-viewer JSON format."
+ },
+ "clangd.semanticHighlighting": {
+ "type": "boolean",
+ "default": "false",
+ "description": "Enable semantic highlighting in clangd"
}
}
},
diff --git a/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts b/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts
index 4cd7b0e51e0..330cf7ac262 100644
--- a/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts
+++ b/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts
@@ -109,12 +109,14 @@ export function activate(context: vscode.ExtensionContext) {
const clangdClient = new ClangdLanguageClient('Clang Language Server',
serverOptions, clientOptions);
- const semanticHighlightingFeature =
+ if (getConfig<boolean>('semanticHighlighting')) {
+ const semanticHighlightingFeature =
new semanticHighlighting.SemanticHighlightingFeature(clangdClient,
- context);
- context.subscriptions.push(
+ context);
+ context.subscriptions.push(
vscode.Disposable.from(semanticHighlightingFeature));
- clangdClient.registerFeature(semanticHighlightingFeature);
+ clangdClient.registerFeature(semanticHighlightingFeature);
+ }
console.log('Clang Language Server is now active!');
context.subscriptions.push(clangdClient.start());
context.subscriptions.push(vscode.commands.registerCommand(
OpenPOWER on IntegriCloud