diff --git a/editors/code/src/commands/syntax_tree.ts b/editors/code/src/commands/syntax_tree.ts index 20ff7e5ca0..5b8f6e4d94 100644 --- a/editors/code/src/commands/syntax_tree.ts +++ b/editors/code/src/commands/syntax_tree.ts @@ -85,8 +85,8 @@ class TextDocumentContentProvider range = editor.selection.isEmpty ? undefined : this.ctx.client.code2ProtocolConverter.asRange( - editor.selection, - ); + editor.selection, + ); } const request: SyntaxTreeParams = { diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index 2bd276958f..e323110a4b 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -171,9 +171,9 @@ export class Config { (this.cargoFeatures.allFeatures !== this.prevCargoFeatures.allFeatures || this.cargoFeatures.noDefaultFeatures !== - this.prevCargoFeatures.noDefaultFeatures || + this.prevCargoFeatures.noDefaultFeatures || this.cargoFeatures.features.length !== - this.prevCargoFeatures.features.length || + this.prevCargoFeatures.features.length || this.cargoFeatures.features.some( (v, i) => v !== this.prevCargoFeatures!.features[i], )) diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts index c7ee8c0a16..96d550376b 100644 --- a/editors/code/src/highlighting.ts +++ b/editors/code/src/highlighting.ts @@ -151,32 +151,32 @@ class Highlighter { string, vscode.TextEditorDecorationType, ]> = [ - decoration('comment'), - decoration('string'), - decoration('keyword'), - decoration('keyword.control'), - decoration('keyword.unsafe'), - decoration('function'), - decoration('parameter'), - decoration('constant'), - decoration('type.builtin'), - decoration('type.generic'), - decoration('type.lifetime'), - decoration('type.param'), - decoration('type.self'), - decoration('type'), - decoration('text'), - decoration('attribute'), - decoration('literal'), - decoration('literal.numeric'), - decoration('literal.char'), - decoration('literal.byte'), - decoration('macro'), - decoration('variable'), - decoration('variable.mut', 'underline'), - decoration('field'), - decoration('module'), - ]; + decoration('comment'), + decoration('string'), + decoration('keyword'), + decoration('keyword.control'), + decoration('keyword.unsafe'), + decoration('function'), + decoration('parameter'), + decoration('constant'), + decoration('type.builtin'), + decoration('type.generic'), + decoration('type.lifetime'), + decoration('type.param'), + decoration('type.self'), + decoration('type'), + decoration('text'), + decoration('attribute'), + decoration('literal'), + decoration('literal.numeric'), + decoration('literal.char'), + decoration('literal.byte'), + decoration('macro'), + decoration('variable'), + decoration('variable.mut', 'underline'), + decoration('field'), + decoration('module'), + ]; return new Map(decorations); } diff --git a/editors/code/src/status_display.ts b/editors/code/src/status_display.ts index ed8573f029..48cf0655be 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 { if (this.packageName) { this.statusBarItem!.text = `cargo ${this.command} [${ this.packageName - }] ${this.frame()}`; + }] ${this.frame()}`; } else { this.statusBarItem!.text = `cargo ${ this.command - } ${this.frame()}`; + } ${this.frame()}`; } }, 300); diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json index a4fbb4b821..fe3b40f347 100644 --- a/editors/code/tsconfig.json +++ b/editors/code/tsconfig.json @@ -12,7 +12,8 @@ "noUnusedLocals": true, "noUnusedParameters": true, "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true + "noFallthroughCasesInSwitch": true, + "newLine": "LF" }, "exclude": [ "node_modules"