From 4722e6d491a29bdb077fc01aa8c5bdc734282c69 Mon Sep 17 00:00:00 2001
From: Aleksei Sidorov <aleksei.sidorov@xdev.re>
Date: Mon, 24 Jun 2019 13:02:20 +0300
Subject: Introduce cargo-watch.check-command

---
 editors/code/src/config.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'editors/code/src/config.ts')

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 3024546d2..85366fc34 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 
 import { Server } from './server';
+import { strict } from 'assert';
 
 const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
 
@@ -10,6 +11,7 @@ export type CargoWatchTraceOptions = 'off' | 'error' | 'verbose';
 export interface CargoWatchOptions {
     enableOnStartup: CargoWatchStartupOptions;
     checkArguments: string;
+    checkCommand: string;
     trace: CargoWatchTraceOptions;
 }
 
@@ -23,7 +25,8 @@ export class Config {
     public cargoWatchOptions: CargoWatchOptions = {
         enableOnStartup: 'ask',
         trace: 'off',
-        checkArguments: ''
+        checkArguments: '',
+        checkCommand: ''
     };
 
     private prevEnhancedTyping: null | boolean = null;
@@ -110,6 +113,14 @@ export class Config {
                 ''
             );
         }
+
+        if (config.has('cargo-watch.check-command')) {
+            this.cargoWatchOptions.checkCommand = config.get<string>(
+                'cargo-watch.check-command', 
+                ''
+            );
+        }
+
         if (config.has('lruCapacity')) {
             this.lruCapacity = config.get('lruCapacity') as number;
         }
-- 
cgit v1.2.3


From b1bc629b83c65c0a3cc0e47a3f55969b9bab950e Mon Sep 17 00:00:00 2001
From: Aleksei Sidorov <aleksei.sidorov@xdev.re>
Date: Mon, 24 Jun 2019 13:33:37 +0300
Subject: Fix tslints

---
 editors/code/src/config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'editors/code/src/config.ts')

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 85366fc34..db46874dc 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 
-import { Server } from './server';
 import { strict } from 'assert';
+import { Server } from './server';
 
 const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
 
@@ -116,7 +116,7 @@ export class Config {
 
         if (config.has('cargo-watch.check-command')) {
             this.cargoWatchOptions.checkCommand = config.get<string>(
-                'cargo-watch.check-command', 
+                'cargo-watch.check-command',
                 ''
             );
         }
-- 
cgit v1.2.3


From c40ee089f221aa1be74614d7ad875488030e55ff Mon Sep 17 00:00:00 2001
From: Aleksey Sidorov <alekseysidorov@users.noreply.github.com>
Date: Mon, 24 Jun 2019 13:35:11 +0300
Subject: Apply suggestions from code review

Co-Authored-By: Aleksey Kladov <aleksey.kladov@gmail.com>
---
 editors/code/src/config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'editors/code/src/config.ts')

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index db46874dc..c1dd2c056 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -10,8 +10,8 @@ export type CargoWatchTraceOptions = 'off' | 'error' | 'verbose';
 
 export interface CargoWatchOptions {
     enableOnStartup: CargoWatchStartupOptions;
-    checkArguments: string;
-    checkCommand: string;
+    arguments: string;
+    command: string;
     trace: CargoWatchTraceOptions;
 }
 
-- 
cgit v1.2.3


From 28e9e8d4cfdf2a334cde6db7d10e7acb8f5fe8b1 Mon Sep 17 00:00:00 2001
From: Aleksei Sidorov <aleksei.sidorov@xdev.re>
Date: Mon, 24 Jun 2019 13:50:34 +0300
Subject: Fix code after "apply suggestions"

---
 editors/code/src/config.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'editors/code/src/config.ts')

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index c1dd2c056..10e98d753 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -25,8 +25,8 @@ export class Config {
     public cargoWatchOptions: CargoWatchOptions = {
         enableOnStartup: 'ask',
         trace: 'off',
-        checkArguments: '',
-        checkCommand: ''
+        arguments: '',
+        command: ''
     };
 
     private prevEnhancedTyping: null | boolean = null;
@@ -107,16 +107,16 @@ export class Config {
             );
         }
 
-        if (config.has('cargo-watch.check-arguments')) {
-            this.cargoWatchOptions.checkArguments = config.get<string>(
-                'cargo-watch.check-arguments',
+        if (config.has('cargo-watch.arguments')) {
+            this.cargoWatchOptions.arguments = config.get<string>(
+                'cargo-watch.arguments',
                 ''
             );
         }
 
-        if (config.has('cargo-watch.check-command')) {
-            this.cargoWatchOptions.checkCommand = config.get<string>(
-                'cargo-watch.check-command',
+        if (config.has('cargo-watch.command')) {
+            this.cargoWatchOptions.command = config.get<string>(
+                'cargo-watch.command',
                 ''
             );
         }
-- 
cgit v1.2.3