diff options
author | Aleksey Kladov <[email protected]> | 2020-02-26 14:59:30 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-26 14:59:30 +0000 |
commit | 8c0d0894b66ceb1800f09df246ba8fb73b9ceccb (patch) | |
tree | 7cae6824bb51ec420efbd679543513b2bbe8045e | |
parent | 2dee0779e9977e4570122c42ac35c4183bb8e604 (diff) | |
parent | 74125d012e339f1ab7b2be63845d9dc96dab7db1 (diff) |
Merge pull request #3321 from kjeremy/semantic-client
Enable SemanticTokens on the client
-rw-r--r-- | editors/code/package.json | 1 | ||||
-rw-r--r-- | editors/code/src/client.ts | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/editors/code/package.json b/editors/code/package.json index 27e2bbfc3..8a8a74f7c 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -18,6 +18,7 @@ | |||
18 | "engines": { | 18 | "engines": { |
19 | "vscode": "^1.42.0" | 19 | "vscode": "^1.42.0" |
20 | }, | 20 | }, |
21 | "enableProposedApi": true, | ||
21 | "scripts": { | 22 | "scripts": { |
22 | "vscode:prepublish": "tsc && rollup -c", | 23 | "vscode:prepublish": "tsc && rollup -c", |
23 | "package": "vsce package -o rust-analyzer.vsix", | 24 | "package": "vsce package -o rust-analyzer.vsix", |
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index aaf2ef40e..f9dbe34c2 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts | |||
@@ -3,6 +3,7 @@ import * as vscode from 'vscode'; | |||
3 | 3 | ||
4 | import { Config } from './config'; | 4 | import { Config } from './config'; |
5 | import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed'; | 5 | import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed'; |
6 | import { SemanticTokensFeature } from 'vscode-languageclient/lib/semanticTokens.proposed'; | ||
6 | 7 | ||
7 | export async function createClient(config: Config, serverPath: string): Promise<lc.LanguageClient> { | 8 | export async function createClient(config: Config, serverPath: string): Promise<lc.LanguageClient> { |
8 | // '.' Is the fallback if no folder is open | 9 | // '.' Is the fallback if no folder is open |
@@ -83,5 +84,7 @@ export async function createClient(config: Config, serverPath: string): Promise< | |||
83 | // Here we want to just enable CallHierarchyFeature since it is available on stable. | 84 | // Here we want to just enable CallHierarchyFeature since it is available on stable. |
84 | // Note that while the CallHierarchyFeature is stable the LSP protocol is not. | 85 | // Note that while the CallHierarchyFeature is stable the LSP protocol is not. |
85 | res.registerFeature(new CallHierarchyFeature(res)); | 86 | res.registerFeature(new CallHierarchyFeature(res)); |
87 | res.registerFeature(new SemanticTokensFeature(res)); | ||
88 | |||
86 | return res; | 89 | return res; |
87 | } | 90 | } |