diff options
-rw-r--r-- | editors/code/src/commands/syntax_tree.ts | 4 | ||||
-rw-r--r-- | editors/code/src/config.ts | 4 | ||||
-rw-r--r-- | editors/code/src/highlighting.ts | 52 | ||||
-rw-r--r-- | editors/code/src/status_display.ts | 4 | ||||
-rw-r--r-- | editors/code/tsconfig.json | 3 |
5 files changed, 34 insertions, 33 deletions
diff --git a/editors/code/src/commands/syntax_tree.ts b/editors/code/src/commands/syntax_tree.ts index 20ff7e5ca..5b8f6e4d9 100644 --- a/editors/code/src/commands/syntax_tree.ts +++ b/editors/code/src/commands/syntax_tree.ts | |||
@@ -85,8 +85,8 @@ class TextDocumentContentProvider | |||
85 | range = editor.selection.isEmpty | 85 | range = editor.selection.isEmpty |
86 | ? undefined | 86 | ? undefined |
87 | : this.ctx.client.code2ProtocolConverter.asRange( | 87 | : this.ctx.client.code2ProtocolConverter.asRange( |
88 | editor.selection, | 88 | editor.selection, |
89 | ); | 89 | ); |
90 | } | 90 | } |
91 | 91 | ||
92 | const request: SyntaxTreeParams = { | 92 | const request: SyntaxTreeParams = { |
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index 2bd276958..e323110a4 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts | |||
@@ -171,9 +171,9 @@ export class Config { | |||
171 | (this.cargoFeatures.allFeatures !== | 171 | (this.cargoFeatures.allFeatures !== |
172 | this.prevCargoFeatures.allFeatures || | 172 | this.prevCargoFeatures.allFeatures || |
173 | this.cargoFeatures.noDefaultFeatures !== | 173 | this.cargoFeatures.noDefaultFeatures !== |
174 | this.prevCargoFeatures.noDefaultFeatures || | 174 | this.prevCargoFeatures.noDefaultFeatures || |
175 | this.cargoFeatures.features.length !== | 175 | this.cargoFeatures.features.length !== |
176 | this.prevCargoFeatures.features.length || | 176 | this.prevCargoFeatures.features.length || |
177 | this.cargoFeatures.features.some( | 177 | this.cargoFeatures.features.some( |
178 | (v, i) => v !== this.prevCargoFeatures!.features[i], | 178 | (v, i) => v !== this.prevCargoFeatures!.features[i], |
179 | )) | 179 | )) |
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts index c7ee8c0a1..96d550376 100644 --- a/editors/code/src/highlighting.ts +++ b/editors/code/src/highlighting.ts | |||
@@ -151,32 +151,32 @@ class Highlighter { | |||
151 | string, | 151 | string, |
152 | vscode.TextEditorDecorationType, | 152 | vscode.TextEditorDecorationType, |
153 | ]> = [ | 153 | ]> = [ |
154 | decoration('comment'), | 154 | decoration('comment'), |
155 | decoration('string'), | 155 | decoration('string'), |
156 | decoration('keyword'), | 156 | decoration('keyword'), |
157 | decoration('keyword.control'), | 157 | decoration('keyword.control'), |
158 | decoration('keyword.unsafe'), | 158 | decoration('keyword.unsafe'), |
159 | decoration('function'), | 159 | decoration('function'), |
160 | decoration('parameter'), | 160 | decoration('parameter'), |
161 | decoration('constant'), | 161 | decoration('constant'), |
162 | decoration('type.builtin'), | 162 | decoration('type.builtin'), |
163 | decoration('type.generic'), | 163 | decoration('type.generic'), |
164 | decoration('type.lifetime'), | 164 | decoration('type.lifetime'), |
165 | decoration('type.param'), | 165 | decoration('type.param'), |
166 | decoration('type.self'), | 166 | decoration('type.self'), |
167 | decoration('type'), | 167 | decoration('type'), |
168 | decoration('text'), | 168 | decoration('text'), |
169 | decoration('attribute'), | 169 | decoration('attribute'), |
170 | decoration('literal'), | 170 | decoration('literal'), |
171 | decoration('literal.numeric'), | 171 | decoration('literal.numeric'), |
172 | decoration('literal.char'), | 172 | decoration('literal.char'), |
173 | decoration('literal.byte'), | 173 | decoration('literal.byte'), |
174 | decoration('macro'), | 174 | decoration('macro'), |
175 | decoration('variable'), | 175 | decoration('variable'), |
176 | decoration('variable.mut', 'underline'), | 176 | decoration('variable.mut', 'underline'), |
177 | decoration('field'), | 177 | decoration('field'), |
178 | decoration('module'), | 178 | decoration('module'), |
179 | ]; | 179 | ]; |
180 | 180 | ||
181 | return new Map<string, vscode.TextEditorDecorationType>(decorations); | 181 | return new Map<string, vscode.TextEditorDecorationType>(decorations); |
182 | } | 182 | } |
diff --git a/editors/code/src/status_display.ts b/editors/code/src/status_display.ts index ed8573f02..48cf0655b 100644 --- a/editors/code/src/status_display.ts +++ b/editors/code/src/status_display.ts | |||
@@ -28,11 +28,11 @@ export class StatusDisplay implements vscode.Disposable { | |||
28 | if (this.packageName) { | 28 | if (this.packageName) { |
29 | this.statusBarItem!.text = `cargo ${this.command} [${ | 29 | this.statusBarItem!.text = `cargo ${this.command} [${ |
30 | this.packageName | 30 | this.packageName |
31 | }] ${this.frame()}`; | 31 | }] ${this.frame()}`; |
32 | } else { | 32 | } else { |
33 | this.statusBarItem!.text = `cargo ${ | 33 | this.statusBarItem!.text = `cargo ${ |
34 | this.command | 34 | this.command |
35 | } ${this.frame()}`; | 35 | } ${this.frame()}`; |
36 | } | 36 | } |
37 | }, 300); | 37 | }, 300); |
38 | 38 | ||
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json index a4fbb4b82..fe3b40f34 100644 --- a/editors/code/tsconfig.json +++ b/editors/code/tsconfig.json | |||
@@ -12,7 +12,8 @@ | |||
12 | "noUnusedLocals": true, | 12 | "noUnusedLocals": true, |
13 | "noUnusedParameters": true, | 13 | "noUnusedParameters": true, |
14 | "noImplicitReturns": true, | 14 | "noImplicitReturns": true, |
15 | "noFallthroughCasesInSwitch": true | 15 | "noFallthroughCasesInSwitch": true, |
16 | "newLine": "LF" | ||
16 | }, | 17 | }, |
17 | "exclude": [ | 18 | "exclude": [ |
18 | "node_modules" | 19 | "node_modules" |