1 files changed, 30 insertions, 57 deletions

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index e131f09df..ec2790b63 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -1,18 +1,11 @@
 import * as vscode from 'vscode';
 
-import { Server } from './server';
-
 const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
 
-export type CargoWatchStartupOptions = 'ask' | 'enabled' | 'disabled';
-export type CargoWatchTraceOptions = 'off' | 'error' | 'verbose';
-
 export interface CargoWatchOptions {
-    enableOnStartup: CargoWatchStartupOptions;
-    arguments: string;
+    enable: boolean;
+    arguments: string[];
     command: string;
-    trace: CargoWatchTraceOptions;
-    ignore: string[];
     allTargets: boolean;
 }
 
@@ -23,27 +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 = {
-        enableOnStartup: 'ask',
-        trace: 'off',
-        arguments: '',
+    withSysroot: null | boolean = null;
+    cargoWatchOptions: CargoWatchOptions = {
+        enable: true,
+        arguments: [],
         command: '',
-        ignore: [],
         allTargets: true,
     };
-    public cargoFeatures: CargoFeatures = {
+    cargoFeatures: CargoFeatures = {
         noDefaultFeatures: false,
         allFeatures: true,
         features: [],
@@ -52,15 +43,14 @@ 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;
 
         if (config.has('highlightingOn')) {
@@ -73,10 +63,6 @@ export class Config {
             ) as boolean;
         }
 
-        if (!this.highlightingOn && Server) {
-            Server.highlighter.removeHighlights();
-        }
-
         if (config.has('enableEnhancedTyping')) {
             this.enableEnhancedTyping = config.get(
                 'enableEnhancedTyping',
@@ -100,23 +86,17 @@ export class Config {
                 RA_LSP_DEBUG || (config.get('raLspServerPath') as string);
         }
 
-        if (config.has('enableCargoWatchOnStartup')) {
-            this.cargoWatchOptions.enableOnStartup = config.get<
-                CargoWatchStartupOptions
-            >('enableCargoWatchOnStartup', 'ask');
-        }
-
-        if (config.has('trace.cargo-watch')) {
-            this.cargoWatchOptions.trace = config.get<CargoWatchTraceOptions>(
-                'trace.cargo-watch',
-                'off',
+        if (config.has('cargo-watch.enable')) {
+            this.cargoWatchOptions.enable = config.get<boolean>(
+                'cargo-watch.enable',
+                true,
             );
         }
 
         if (config.has('cargo-watch.arguments')) {
-            this.cargoWatchOptions.arguments = config.get<string>(
+            this.cargoWatchOptions.arguments = config.get<string[]>(
                 'cargo-watch.arguments',
-                '',
+                [],
             );
         }
 
@@ -127,13 +107,6 @@ export class Config {
             );
         }
 
-        if (config.has('cargo-watch.ignore')) {
-            this.cargoWatchOptions.ignore = config.get<string[]>(
-                'cargo-watch.ignore',
-                [],
-            );
-        }
-
         if (config.has('cargo-watch.allTargets')) {
             this.cargoWatchOptions.allTargets = config.get<boolean>(
                 'cargo-watch.allTargets',
@@ -190,9 +163,9 @@ export class Config {
             (this.cargoFeatures.allFeatures !==
                 this.prevCargoFeatures.allFeatures ||
                 this.cargoFeatures.noDefaultFeatures !==
-                    this.prevCargoFeatures.noDefaultFeatures ||
+                this.prevCargoFeatures.noDefaultFeatures ||
                 this.cargoFeatures.features.length !==
-                    this.prevCargoFeatures.features.length ||
+                this.prevCargoFeatures.features.length ||
                 this.cargoFeatures.features.some(
                     (v, i) => v !== this.prevCargoFeatures!.features[i],
                 ))