diff options
Diffstat (limited to 'editors/code/src/config.ts')
-rw-r--r-- | editors/code/src/config.ts | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index 12823f319..234a390ac 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts | |||
@@ -48,11 +48,13 @@ export class Config { | |||
48 | const config = vscode.workspace.getConfiguration('rust-analyzer'); | 48 | const config = vscode.workspace.getConfiguration('rust-analyzer'); |
49 | 49 | ||
50 | Server.highlighter.removeHighlights(); | 50 | Server.highlighter.removeHighlights(); |
51 | scopes.load() | ||
52 | scopesMapper.load() | ||
53 | if (config.has('highlightingOn')) { | ||
54 | 51 | ||
52 | if (config.has('highlightingOn')) { | ||
55 | this.highlightingOn = config.get('highlightingOn') as boolean; | 53 | this.highlightingOn = config.get('highlightingOn') as boolean; |
54 | if (this.highlightingOn) { | ||
55 | scopes.load(); | ||
56 | scopesMapper.load(); | ||
57 | } | ||
56 | } | 58 | } |
57 | 59 | ||
58 | if (config.has('rainbowHighlightingOn')) { | 60 | if (config.has('rainbowHighlightingOn')) { |
@@ -61,9 +63,6 @@ export class Config { | |||
61 | ) as boolean; | 63 | ) as boolean; |
62 | } | 64 | } |
63 | 65 | ||
64 | if (!this.highlightingOn && Server) { | ||
65 | Server.highlighter.removeHighlights(); | ||
66 | } | ||
67 | 66 | ||
68 | if (config.has('enableEnhancedTyping')) { | 67 | if (config.has('enableEnhancedTyping')) { |
69 | this.enableEnhancedTyping = config.get( | 68 | this.enableEnhancedTyping = config.get( |