1 files changed, 17 insertions, 19 deletions

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index ccb0ee2b7..ec2790b63 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -16,25 +16,25 @@ export interface CargoFeatures {
 }
 
 export class Config {
-    public highlightingOn = true;
-    public rainbowHighlightingOn = false;
-    public enableEnhancedTyping = true;
-    public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server';
-    public lruCapacity: null | number = null;
-    public displayInlayHints = true;
-    public maxInlayHintLength: null | number = null;
-    public excludeGlobs = [];
-    public useClientWatching = true;
-    public featureFlags = {};
+    highlightingOn = true;
+    rainbowHighlightingOn = false;
+    enableEnhancedTyping = true;
+    raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server';
+    lruCapacity: null | number = null;
+    displayInlayHints = true;
+    maxInlayHintLength: null | number = null;
+    excludeGlobs = [];
+    useClientWatching = true;
+    featureFlags = {};
     // for internal use
-    public withSysroot: null | boolean = null;
-    public cargoWatchOptions: CargoWatchOptions = {
+    withSysroot: null | boolean = null;
+    cargoWatchOptions: CargoWatchOptions = {
         enable: true,
         arguments: [],
         command: '',
         allTargets: true,
     };
-    public cargoFeatures: CargoFeatures = {
+    cargoFeatures: CargoFeatures = {
         noDefaultFeatures: false,
         allFeatures: true,
         features: [],
@@ -43,14 +43,12 @@ export class Config {
     private prevEnhancedTyping: null | boolean = null;
     private prevCargoFeatures: null | CargoFeatures = null;
 
-    constructor() {
-        vscode.workspace.onDidChangeConfiguration(_ =>
-            this.userConfigChanged(),
-        );
-        this.userConfigChanged();
+    constructor(ctx: vscode.ExtensionContext) {
+        vscode.workspace.onDidChangeConfiguration(_ => this.refresh(), ctx.subscriptions);
+        this.refresh();
     }
 
-    public userConfigChanged() {
+    private refresh() {
         const config = vscode.workspace.getConfiguration('rust-analyzer');
 
         let requireReloadMessage = null;