mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3322 from matklad/semantic-tokens-config

Browse Source 
Config to switch to semantic tokens
This commit is contained in:
Aleksey Kladov 2020-02-26 16:05:11 +01:00 committed by GitHub
commit 640ede4ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/code/package.json
View File

@ -168,6 +168,11 @@
"type": "object",
"title": "Rust Analyzer",
"properties": {
"rust-analyzer.highlighting.semanticTokens": {
"type": "boolean",
"default": false,
"description": "Use proposed semantic tokens API for syntax highlighting"
},
"rust-analyzer.highlightingOn": {
"type": "boolean",
"default": false,

7
editors/code/src/client.ts
View File

@ -27,7 +27,7 @@ export async function createClient(config: Config, serverPath: string): Promise<
const clientOptions: lc.LanguageClientOptions = {
documentSelector: [{ scheme: 'file', language: 'rust' }],
initializationOptions: {
publishDecorations: true,
publishDecorations: !config.highlightingSemanticTokens,
lruCapacity: config.lruCapacity,
maxInlayHintLength: config.maxInlayHintLength,
cargoWatchEnable: cargoWatchOpts.enable,
@ -84,7 +84,10 @@ export async function createClient(config: Config, serverPath: string): Promise<
// Here we want to just enable CallHierarchyFeature since it is available on stable.
// Note that while the CallHierarchyFeature is stable the LSP protocol is not.
res.registerFeature(new CallHierarchyFeature(res));
res.registerFeature(new SemanticTokensFeature(res));
if (config.highlightingSemanticTokens) {
res.registerFeature(new SemanticTokensFeature(res));
}
return res;
}

2
editors/code/src/config.ts
View File

@ -22,6 +22,7 @@ export class Config {
private static readonly requiresReloadOpts = [
"cargoFeatures",
"cargo-watch",
"highlighting.semanticTokens"
]
.map(opt => `${Config.rootSection}.${opt}`);
@ -143,6 +144,7 @@ export class Config {
// We don't do runtime config validation here for simplicity. More on stackoverflow:
// https://stackoverflow.com/questions/60135780/what-is-the-best-way-to-type-check-the-configuration-for-vscode-extension
get highlightingSemanticTokens() { return this.cfg.get("highlighting.semanticTokens") as boolean; }
get highlightingOn() { return this.cfg.get("highlightingOn") as boolean; }
get rainbowHighlightingOn() { return this.cfg.get("rainbowHighlightingOn") as boolean; }
get lruCapacity() { return this.cfg.get("lruCapacity") as null | number; }

4
editors/code/src/main.ts
View File

@ -89,7 +89,9 @@ export async function activate(context: vscode.ExtensionContext) {
activateStatusDisplay(ctx);
activateHighlighting(ctx);
if (!ctx.config.highlightingSemanticTokens) {
activateHighlighting(ctx);
}
activateInlayHints(ctx);
}