aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-09-06 15:22:00 +0100
committerGitHub <[email protected]>2019-09-06 15:22:00 +0100
commit1acd9d5540bf755e87173fe16a803cfe8b2bb500 (patch)
treea5fb9afa541a4e6ab5818530b3fd19d5e461ef9e /editors/code/src
parent007737a0e7dd2866e02a6398d8ee4aa7d5051d8c (diff)
parent28df377759ee5625b0dad4c797be306c8d2624e3 (diff)
Merge #1780
1780: add option to disable notify r=matklad a=matklad This should help if notify uses 100% of CPU. Put ``` { "rust-analyzer.useClientWatching": true, } ``` into `.vscode/settings.json` (or appropriate config of your editor) to use editor's file watching capabilites instead of notify Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/config.ts4
-rw-r--r--editors/code/src/server.ts1
2 files changed, 5 insertions, 0 deletions
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