aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-12-09 17:05:49 +0000
committerAleksey Kladov <[email protected]>2019-12-09 18:46:35 +0000
commit7ac4ea7fec018f76eed5b5c10fc96ba3d9b969be (patch)
treef43ba97761e636cfa522decae937743111a1ecbe
parent442ab3a34dfaf41bc3852acb9db20e0687d20b0c (diff)
Allow disabling sysroot
Might be helpful for debugging
-rw-r--r--editors/code/src/config.ts5
-rw-r--r--editors/code/src/server.ts3
2 files changed, 7 insertions, 1 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 95c3f42e5..fb9e55dd6 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -26,6 +26,8 @@ export class Config {
26 public excludeGlobs = []; 26 public excludeGlobs = [];
27 public useClientWatching = false; 27 public useClientWatching = false;
28 public featureFlags = {}; 28 public featureFlags = {};
29 // for internal use
30 public withSysroot: null | boolean = null;
29 public cargoWatchOptions: CargoWatchOptions = { 31 public cargoWatchOptions: CargoWatchOptions = {
30 enableOnStartup: 'ask', 32 enableOnStartup: 'ask',
31 trace: 'off', 33 trace: 'off',
@@ -148,5 +150,8 @@ export class Config {
148 if (config.has('featureFlags')) { 150 if (config.has('featureFlags')) {
149 this.featureFlags = config.get('featureFlags') || {}; 151 this.featureFlags = config.get('featureFlags') || {};
150 } 152 }
153 if (config.has('withSysroot')) {
154 this.withSysroot = config.get('withSysroot') || false;
155 }
151 } 156 }
152} 157}
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index b346c0828..e767b6f1b 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -57,7 +57,8 @@ export class Server {
57 maxInlayHintLength: Server.config.maxInlayHintLength, 57 maxInlayHintLength: Server.config.maxInlayHintLength,
58 excludeGlobs: Server.config.excludeGlobs, 58 excludeGlobs: Server.config.excludeGlobs,
59 useClientWatching: Server.config.useClientWatching, 59 useClientWatching: Server.config.useClientWatching,
60 featureFlags: Server.config.featureFlags 60 featureFlags: Server.config.featureFlags,
61 withSysroot: Server.config.withSysroot
61 }, 62 },
62 traceOutputChannel 63 traceOutputChannel
63 }; 64 };