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, 13 insertions, 10 deletions

diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts
index ea2883ad4..420635f41 100644
--- a/editors/code/src/commands/runnables.ts
+++ b/editors/code/src/commands/runnables.ts
@@ -153,22 +153,25 @@ export const autoCargoWatchTask: vscode.Task = {
  * that, when accepted, allow us to `cargo install cargo-watch` and then run it.
  */
 export async function interactivelyStartCargoWatch() {
-    if (!Server.config.enableCargoWatchOnStartup) {
+    if (Server.config.enableCargoWatchOnStartup === 'disabled') {
         return;
     }
 
-    const execPromise = util.promisify(child_process.exec);
-
-    const watch = await vscode.window.showInformationMessage(
-        'Start watching changes with cargo? (Executes `cargo watch`, provides inline diagnostics)',
-        'yes',
-        'no'
-    );
-    if (watch === 'no') {
-        return;
+    if (Server.config.enableCargoWatchOnStartup === 'ask') {
+        const watch = await vscode.window.showInformationMessage(
+            'Start watching changes with cargo? (Executes `cargo watch`, provides inline diagnostics)',
+            'yes',
+            'no'
+        );
+        if (watch === 'no') {
+            return;
+        }
     }
 
+    const execPromise = util.promisify(child_process.exec);
+
     const { stderr } = await execPromise('cargo watch --version').catch(e => e);
+
     if (stderr.includes('no such subcommand: `watch`')) {
         const msg =
             'The `cargo-watch` subcommand is not installed. Install? (takes ~1-2 minutes)';