Merge #1010

1010: Change enableCargoWatchOnStartup to have three states r=matklad a=vipentti

This fixes #1005.

Defaults to `ask` which prompts users each time whether to start `cargo watch`
or not. `enabled` always starts `cargo watch` and `disabled` does not.

Co-authored-by: Ville Penttinen <[email protected]>

1 files changed, 5 insertions, 3 deletions

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index d8795f3b0..420589068 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -4,12 +4,14 @@ import { Server } from './server';
 
 const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
 
+export type CargoWatchOptions = 'ask' | 'enabled' | 'disabled';
+
 export class Config {
     public highlightingOn = true;
     public enableEnhancedTyping = true;
     public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server';
     public showWorkspaceLoadedNotification = true;
-    public enableCargoWatchOnStartup = true;
+    public enableCargoWatchOnStartup: CargoWatchOptions = 'ask';
 
     private prevEnhancedTyping: null | boolean = null;
 
@@ -71,9 +73,9 @@ export class Config {
         }
 
         if (config.has('enableCargoWatchOnStartup')) {
-            this.enableCargoWatchOnStartup = config.get<boolean>(
+            this.enableCargoWatchOnStartup = config.get<CargoWatchOptions>(
                 'enableCargoWatchOnStartup',
-                true
+                'ask'
             );
         }
     }