aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/code/package.json5
-rw-r--r--editors/code/src/config.ts4
-rw-r--r--editors/code/src/server.ts1
3 files changed, 10 insertions, 0 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index e2bc72f32..7a48d6794 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -205,6 +205,11 @@
205 "default": [], 205 "default": [],
206 "description": "Paths to exclude from analysis" 206 "description": "Paths to exclude from analysis"
207 }, 207 },
208 "rust-analyzer.useClientWatching": {
209 "type": "boolean",
210 "default": false,
211 "description": "client provided file watching instead of notify watching."
212 },
208 "rust-analyzer.cargo-watch.arguments": { 213 "rust-analyzer.cargo-watch.arguments": {
209 "type": "string", 214 "type": "string",
210 "description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )", 215 "description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )",
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 570ddca46..a4581485c 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -23,6 +23,7 @@ export class Config {
23 public lruCapacity: null | number = null; 23 public lruCapacity: null | number = null;
24 public displayInlayHints = true; 24 public displayInlayHints = true;
25 public excludeGlobs = []; 25 public excludeGlobs = [];
26 public useClientWatching = false;
26 public featureFlags = {}; 27 public featureFlags = {};
27 public cargoWatchOptions: CargoWatchOptions = { 28 public cargoWatchOptions: CargoWatchOptions = {
28 enableOnStartup: 'ask', 29 enableOnStartup: 'ask',
@@ -133,6 +134,9 @@ export class Config {
133 if (config.has('excludeGlobs')) { 134 if (config.has('excludeGlobs')) {
134 this.excludeGlobs = config.get('excludeGlobs') || []; 135 this.excludeGlobs = config.get('excludeGlobs') || [];
135 } 136 }
137 if (config.has('useClientWatching')) {
138 this.useClientWatching = config.get('useClientWatching') || false;
139 }
136 if (config.has('featureFlags')) { 140 if (config.has('featureFlags')) {
137 this.featureFlags = config.get('featureFlags') || {}; 141 this.featureFlags = config.get('featureFlags') || {};
138 } 142 }
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 0d2a99c70..ff50fcd99 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -46,6 +46,7 @@ export class Server {
46 Server.config.showWorkspaceLoadedNotification, 46 Server.config.showWorkspaceLoadedNotification,
47 lruCapacity: Server.config.lruCapacity, 47 lruCapacity: Server.config.lruCapacity,
48 excludeGlobs: Server.config.excludeGlobs, 48 excludeGlobs: Server.config.excludeGlobs,
49 useClientWatching: Server.config.useClientWatching,
49 featureFlags: Server.config.featureFlags 50 featureFlags: Server.config.featureFlags
50 }, 51 },
51 traceOutputChannel 52 traceOutputChannel