about summary refs log tree commit diff
path: root/editors/code/src
diff options
context:
space:
mode:
authorKirill Bulatov <mail4score@gmail.com>2020-03-21 00:01:47 +0200
committerKirill Bulatov <mail4score@gmail.com>2020-03-30 13:39:14 +0300
commit8a23bec2cdd008ff04cb01cdcca1f379f53156a3 (patch)
treec1983eda59834d7abb76ef851d4c1995f9176785 /editors/code/src
parent332799d914bdd35740c25c27f5bac7e4b3cba6c7 (diff)
downloadrust-8a23bec2cdd008ff04cb01cdcca1f379f53156a3.tar.gz
rust-8a23bec2cdd008ff04cb01cdcca1f379f53156a3.zip
Style fixes
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/client.ts4
-rw-r--r--editors/code/src/ctx.ts4
-rw-r--r--editors/code/src/inlay_hints.ts4
3 files changed, 7 insertions, 5 deletions
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 0d0832c44fc..34965e2fbcf 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -5,7 +5,7 @@ import { Config } from './config';
 import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed';
 import { SemanticTokensFeature, DocumentSemanticsTokensSignature } from 'vscode-languageclient/lib/semanticTokens.proposed';
 
-export function configToOptions(config: Config): object {
+export function configToServerOptions(config: Config): object {
     return {
         publishDecorations: !config.highlightingSemanticTokens,
         lruCapacity: config.lruCapacity,
@@ -50,7 +50,7 @@ export async function createClient(config: Config, serverPath: string): Promise<
 
     const clientOptions: lc.LanguageClientOptions = {
         documentSelector: [{ scheme: 'file', language: 'rust' }],
-        initializationOptions: configToOptions(config),
+        initializationOptions: configToServerOptions(config),
         traceOutputChannel,
         middleware: {
             // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 934638c6df9..d2f49cd23d3 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
 
 import { Config } from './config';
-import { createClient, configToOptions } from './client';
+import { createClient, configToServerOptions } from './client';
 import { isRustEditor, RustEditor } from './util';
 
 export class Ctx {
@@ -20,7 +20,7 @@ export class Ctx {
         const res = new Ctx(config, extCtx, client, serverPath);
         res.pushCleanup(client.start());
         await client.onReady();
-        client.onRequest('workspace/configuration', _ => [configToOptions(config)]);
+        client.onRequest('workspace/configuration', _ => [configToServerOptions(config)]);
         return res;
     }
 
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index 542d1f3672b..98663e0e326 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -18,6 +18,8 @@ export function activateInlayHints(ctx: Ctx) {
                 return this.dispose();
             }
             if (!this.updater) this.updater = new HintsUpdater(ctx);
+
+            this.updater.syncCacheAndRenderHints();
         },
         dispose() {
             this.updater?.dispose();
@@ -124,7 +126,7 @@ class HintsUpdater implements Disposable {
         this.syncCacheAndRenderHints();
     }
 
-    private syncCacheAndRenderHints() {
+    public syncCacheAndRenderHints() {
         // FIXME: make inlayHints request pass an array of files?
         this.sourceFiles.forEach((file, uri) => this.fetchHints(file).then(hints => {
             if (!hints) return;