4 files changed, 10 insertions, 9 deletions

diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index c3a3583b5..ca4319064 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
 import { Server } from './server';
+import { Config } from './config';
 
 export class Ctx {
     private extCtx: vscode.ExtensionContext;
@@ -13,6 +14,10 @@ export class Ctx {
         return Server.client;
     }
 
+    get config(): Config {
+        return Server.config;
+    }
+
     get activeRustEditor(): vscode.TextEditor | undefined {
         const editor = vscode.window.activeTextEditor;
         return editor && editor.document.languageId === 'rust'
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index ced78adc1..0f9271de2 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -12,7 +12,7 @@ export function activateHighlighting(ctx: Ctx) {
     vscode.window.onDidChangeActiveTextEditor(
         async (editor: vscode.TextEditor | undefined) => {
             if (!editor || editor.document.languageId !== 'rust') return;
-            if (!Server.config.highlightingOn) return;
+            if (!ctx.config.highlightingOn) return;
 
             const params: lc.TextDocumentIdentifier = {
                 uri: editor.document.uri.toString(),
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index 4581e2278..fb8f135c3 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -30,9 +30,7 @@ export function activateInlayHints(ctx: Ctx) {
         );
         ctx.pushCleanup(
             vscode.workspace.onDidChangeConfiguration(_ =>
-                hintsUpdater.toggleHintsDisplay(
-                    Server.config.displayInlayHints,
-                ),
+                hintsUpdater.toggleHintsDisplay(ctx.config.displayInlayHints),
             ),
         );
     });
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 45657532e..345ae0685 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -28,13 +28,11 @@ export async function activate(context: vscode.ExtensionContext) {
     ctx.registerCommand('runSingle', commands.runSingle);
     ctx.registerCommand('showReferences', commands.showReferences);
 
-    if (Server.config.enableEnhancedTyping) {
+    if (ctx.config.enableEnhancedTyping) {
         ctx.overrideCommand('type', commands.onEnter);
     }
 
-    const watchStatus = new StatusDisplay(
-        Server.config.cargoWatchOptions.command,
-    );
+    const watchStatus = new StatusDisplay(ctx.config.cargoWatchOptions.command);
     ctx.pushCleanup(watchStatus);
 
     activateHighlighting(ctx);
@@ -63,7 +61,7 @@ export async function activate(context: vscode.ExtensionContext) {
         vscode.window.showErrorMessage(e.message);
     }
 
-    if (Server.config.displayInlayHints) {
+    if (ctx.config.displayInlayHints) {
         activateInlayHints(ctx);
     }
 }