1 files changed, 8 insertions, 6 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index d54b1750a..c498c14b4 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -22,13 +22,13 @@
         "vscode:prepublish": "tsc && rollup -c",
         "package": "vsce package -o rust-analyzer.vsix",
         "watch": "tsc --watch",
-        "fmt": "tsfmt -r && tslint -p tsconfig.json -c tslint.json 'src/**/*.ts' --fix"
+        "fmt": "tsfmt -r && eslint -c .eslintrc.js --ext ts ./src/ --fix"
     },
     "dependencies": {
         "jsonc-parser": "^2.1.0",
         "node-fetch": "^2.6.0",
         "throttle-debounce": "^2.1.0",
-        "vscode-languageclient": "^6.1.0"
+        "vscode-languageclient": "^6.1.1"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^11.0.2",
@@ -37,9 +37,11 @@
         "@types/node-fetch": "^2.5.4",
         "@types/throttle-debounce": "^2.1.0",
         "@types/vscode": "^1.42.0",
+        "@typescript-eslint/eslint-plugin": "^2.20.0",
+        "@typescript-eslint/parser": "^2.20.0",
+        "eslint": "^6.8.0",
         "rollup": "^1.31.1",
         "tslib": "^1.10.0",
-        "tslint": "^5.20.1",
         "typescript": "^3.7.5",
         "typescript-formatter": "^7.2.2",
         "vsce": "^1.73.0"
@@ -177,13 +179,13 @@
                     "default": {},
                     "description": "Fine grained feature flags to disable annoying features"
                 },
-                "rust-analyzer.raLspServerPath": {
+                "rust-analyzer.serverPath": {
                     "type": [
                         "null",
                         "string"
                     ],
                     "default": null,
-                    "description": "Path to ra_lsp_server executable (points to bundled binary by default)"
+                    "description": "Path to rust-analyzer executable (points to bundled binary by default)"
                 },
                 "rust-analyzer.excludeGlobs": {
                     "type": "array",
@@ -243,7 +245,7 @@
                         "Full log"
                     ],
                     "default": "off",
-                    "description": "Trace requests to the ra_lsp_server"
+                    "description": "Trace requests to the rust-analyzer"
                 },
                 "rust-analyzer.lruCapacity": {
                     "type": [