aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src
diff options
context:
space:
mode:
authorSeivan Heidari <[email protected]>2019-10-31 08:43:20 +0000
committerSeivan Heidari <[email protected]>2019-10-31 08:43:20 +0000
commit8edda0e7b164009d6c03bb3d4be603fb38ad2e2a (patch)
tree744cf81075d394e2f9c06afb07642a2601800dda /editors/code/src
parent49562d36b97ddde34cf7585a8c2e8f232519b657 (diff)
parentd067afb064a7fa67b172abf561b7d80740cd6f18 (diff)
Merge branch 'master' into feature/themes
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/config.ts7
-rw-r--r--editors/code/src/extension.ts2
-rw-r--r--editors/code/src/server.ts2
3 files changed, 1 insertions, 10 deletions
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,