diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/code/package.json | 5 | ||||
-rw-r--r-- | editors/code/src/config.ts | 7 | ||||
-rw-r--r-- | editors/code/src/extension.ts | 2 | ||||
-rw-r--r-- | editors/code/src/server.ts | 2 |
4 files changed, 1 insertions, 15 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 a3fe39098..12823f319 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts | |||
@@ -21,7 +21,6 @@ export class Config { | |||
21 | public rainbowHighlightingOn = false; | 21 | public rainbowHighlightingOn = false; |
22 | public enableEnhancedTyping = true; | 22 | public enableEnhancedTyping = true; |
23 | public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server'; | 23 | public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server'; |
24 | public showWorkspaceLoadedNotification = true; | ||
25 | public lruCapacity: null | number = null; | 24 | public lruCapacity: null | number = null; |
26 | public displayInlayHints = true; | 25 | public displayInlayHints = true; |
27 | public maxInlayHintLength: null | number = null; | 26 | public maxInlayHintLength: null | number = null; |
@@ -62,12 +61,6 @@ export class Config { | |||
62 | ) as boolean; | 61 | ) as boolean; |
63 | } | 62 | } |
64 | 63 | ||
65 | if (config.has('showWorkspaceLoadedNotification')) { | ||
66 | this.showWorkspaceLoadedNotification = config.get( | ||
67 | 'showWorkspaceLoadedNotification' | ||
68 | ) as boolean; | ||
69 | } | ||
70 | |||
71 | if (!this.highlightingOn && Server) { | 64 | if (!this.highlightingOn && Server) { |
72 | Server.highlighter.removeHighlights(); | 65 | Server.highlighter.removeHighlights(); |
73 | } | 66 | } |
diff --git a/editors/code/src/extension.ts b/editors/code/src/extension.ts index 1e1bc1a67..07a5c59e8 100644 --- a/editors/code/src/extension.ts +++ b/editors/code/src/extension.ts | |||
@@ -45,7 +45,7 @@ export function activate(context: vscode.ExtensionContext) { | |||
45 | }); | 45 | }); |
46 | } catch (_) { | 46 | } catch (_) { |
47 | vscode.window.showWarningMessage( | 47 | vscode.window.showWarningMessage( |
48 | 'Enhanced typing feature is disabled because of incompatibility with VIM extension' | 48 | 'Enhanced typing feature is disabled because of incompatibility with VIM extension, consider turning off rust-analyzer.enableEnhancedTyping: https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/README.md#settings' |
49 | ); | 49 | ); |
50 | } | 50 | } |
51 | } | 51 | } |
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, |