Merge #2696

2696: Reformat with tsfmt r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

Author: bors[bot]

editors/code/package-lock.json

@@ -19,7 +19,7 @@
         "vscode:prepublish": "rollup -c",
         "package": "vsce package",
         "watch": "tsc -watch -p ./",
-        "prettier": "prettier --write '**/*.ts'"
+        "fmt": "tsfmt -r"
     },
     "dependencies": {
         "jsonc-parser": "^2.1.0",
@@ -33,17 +33,12 @@
         "@types/node": "^12.12.21",
         "@types/seedrandom": "^2.4.28",
         "@types/vscode": "^1.41.0",
-        "prettier": "^1.19.1",
         "rollup": "^1.27.14",
         "tslib": "^1.10.0",
         "typescript": "^3.7.3",
+        "typescript-formatter": "^7.2.2",
         "vsce": "^1.71.0"
     },
-    "prettier": {
-        "singleQuote": true,
-        "tabWidth": 4,
-        "trailingComma": "all"
-    },
     "activationEvents": [
         "onLanguage:rust",
         "onCommand:rust-analyzer.analyzerStatus",

editors/code/package.json

@@ -85,8 +85,8 @@ class TextDocumentContentProvider
             range = editor.selection.isEmpty
                 ? undefined
                 : this.ctx.client.code2ProtocolConverter.asRange(
-                      editor.selection,
-                  );
+                    editor.selection,
+                );
         }
 
         const request: SyntaxTreeParams = {

editors/code/src/commands/syntax_tree.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],
                 ))

editors/code/src/config.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<string, vscode.TextEditorDecorationType>(decorations);
     }

editors/code/src/highlighting.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);
 

editors/code/src/status_display.ts

@@ -12,7 +12,8 @@
         "noUnusedLocals": true,
         "noUnusedParameters": true,
         "noImplicitReturns": true,
-        "noFallthroughCasesInSwitch": true
+        "noFallthroughCasesInSwitch": true,
+        "newLine": "LF"
     },
     "exclude": [
         "node_modules"