aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-10-25 07:01:00 +0100
committerGitHub <[email protected]>2019-10-25 07:01:00 +0100
commit518f99e16b993e3414a81181c8bad7a89e590ece (patch)
tree6239cfcafd1d0a579b4f51e4e875cc0a8e85efb4 /editors/code
parentc02f1165ca4099ea6c3706a670513f7904630615 (diff)
parentdc65219ae1216e747215fe937b248ebf2469f33f (diff)
Merge #2065
2065: document feature flags r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package.json5
-rw-r--r--editors/code/src/config.ts7
-rw-r--r--editors/code/src/server.ts2
3 files changed, 0 insertions, 14 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 4b719aada..ee997e58f 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -229,11 +229,6 @@
229 "description": "A list of patterns for cargo-watch to ignore (will be passed as `--ignore`)", 229 "description": "A list of patterns for cargo-watch to ignore (will be passed as `--ignore`)",
230 "default": [] 230 "default": []
231 }, 231 },
232 "rust-analyzer.showWorkspaceLoadedNotification": {
233 "type": "boolean",
234 "description": "Controls whether rust-analyzer displays a notification when a project is loaded.",
235 "default": false
236 },
237 "rust-analyzer.trace.server": { 232 "rust-analyzer.trace.server": {
238 "type": "string", 233 "type": "string",
239 "scope": "window", 234 "scope": "window",
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 331936b5e..95c3f42e5 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -20,7 +20,6 @@ export class Config {
20 public rainbowHighlightingOn = false; 20 public rainbowHighlightingOn = false;
21 public enableEnhancedTyping = true; 21 public enableEnhancedTyping = true;
22 public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server'; 22 public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server';
23 public showWorkspaceLoadedNotification = true;
24 public lruCapacity: null | number = null; 23 public lruCapacity: null | number = null;
25 public displayInlayHints = true; 24 public displayInlayHints = true;
26 public maxInlayHintLength: null | number = null; 25 public maxInlayHintLength: null | number = null;
@@ -56,12 +55,6 @@ export class Config {
56 ) as boolean; 55 ) as boolean;
57 } 56 }
58 57
59 if (config.has('showWorkspaceLoadedNotification')) {
60 this.showWorkspaceLoadedNotification = config.get(
61 'showWorkspaceLoadedNotification'
62 ) as boolean;
63 }
64
65 if (!this.highlightingOn && Server) { 58 if (!this.highlightingOn && Server) {
66 Server.highlighter.removeHighlights(); 59 Server.highlighter.removeHighlights();
67 } 60 }
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index ff50fcd99..a3ef21a16 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -42,8 +42,6 @@ export class Server {
42 documentSelector: [{ scheme: 'file', language: 'rust' }], 42 documentSelector: [{ scheme: 'file', language: 'rust' }],
43 initializationOptions: { 43 initializationOptions: {
44 publishDecorations: true, 44 publishDecorations: true,
45 showWorkspaceLoaded:
46 Server.config.showWorkspaceLoadedNotification,
47 lruCapacity: Server.config.lruCapacity, 45 lruCapacity: Server.config.lruCapacity,
48 excludeGlobs: Server.config.excludeGlobs, 46 excludeGlobs: Server.config.excludeGlobs,
49 useClientWatching: Server.config.useClientWatching, 47 useClientWatching: Server.config.useClientWatching,