7 files changed, 98 insertions, 44 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 806ebdb81..a7e32e288 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -198,6 +198,12 @@
             "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
             "dev": true
         },
+        "commandpost": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
+            "integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
+            "dev": true
+        },
         "concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -269,6 +275,26 @@
                 "domelementtype": "1"
             }
         },
+        "editorconfig": {
+            "version": "0.15.3",
+            "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+            "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
+            "dev": true,
+            "requires": {
+                "commander": "^2.19.0",
+                "lru-cache": "^4.1.5",
+                "semver": "^5.6.0",
+                "sigmund": "^1.0.1"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "5.7.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "dev": true
+                }
+            }
+        },
         "entities": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
@@ -395,6 +421,16 @@
             "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
             "dev": true
         },
+        "lru-cache": {
+            "version": "4.1.5",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+            "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+            "dev": true,
+            "requires": {
+                "pseudomap": "^1.0.2",
+                "yallist": "^2.1.2"
+            }
+        },
         "magic-string": {
             "version": "0.25.4",
             "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.4.tgz",
@@ -534,10 +570,10 @@
             "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
             "dev": true
         },
-        "prettier": {
-            "version": "1.19.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
-            "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+        "pseudomap": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+            "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
             "dev": true
         },
         "read": {
@@ -596,6 +632,12 @@
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
             "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         },
+        "sigmund": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+            "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+            "dev": true
+        },
         "sourcemap-codec": {
             "version": "1.4.6",
             "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz",
@@ -663,6 +705,16 @@
             "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==",
             "dev": true
         },
+        "typescript-formatter": {
+            "version": "7.2.2",
+            "resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
+            "integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
+            "dev": true,
+            "requires": {
+                "commandpost": "^1.0.0",
+                "editorconfig": "^0.15.0"
+            }
+        },
         "uc.micro": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
@@ -757,6 +809,12 @@
             "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
             "dev": true
         },
+        "yallist": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+            "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+            "dev": true
+        },
         "yauzl": {
             "version": "2.10.0",
             "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
diff --git a/editors/code/package.json b/editors/code/package.json
index 46d55e32d..9444649f6 100644
--- a/editors/code/package.json
+++ b/editors/code/package.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",
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
             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 2bd276958..e323110a4 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 c7ee8c0a1..96d550376 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<string, vscode.TextEditorDecorationType>(decorations);
     }
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 {
                 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 a4fbb4b82..fe3b40f34 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"