1 files changed, 15 insertions, 8 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index d078f7472..3aa90cd66 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -29,8 +29,10 @@
         "package": "vsce package -o rust-analyzer.vsix",
         "build": "tsc",
         "watch": "tsc --watch",
-        "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src",
-        "fix": " tsfmt -r       && eslint -c .eslintrc.js --ext ts ./src --fix"
+        "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src ./tests",
+        "fix": " tsfmt -r       && eslint -c .eslintrc.js --ext ts ./src ./tests --fix",
+        "pretest": "npm run build",
+        "test": "node ./out/tests/runTests.js"
     },
     "dependencies": {
         "node-fetch": "^2.6.0",
@@ -39,17 +41,22 @@
     "devDependencies": {
         "@rollup/plugin-commonjs": "^11.1.0",
         "@rollup/plugin-node-resolve": "^7.1.3",
+        "@types/glob": "^7.1.1",
+        "@types/mocha": "^7.0.2",
         "@types/node": "^12.12.39",
         "@types/node-fetch": "^2.5.7",
         "@types/vscode": "^1.44.0",
         "@typescript-eslint/eslint-plugin": "^2.33.0",
         "@typescript-eslint/parser": "^2.33.0",
         "eslint": "^6.8.0",
+        "glob": "^7.1.6",
+        "mocha": "^7.1.2",
         "rollup": "^2.10.0",
         "tslib": "^1.12.0",
         "typescript": "^3.9.2",
         "typescript-formatter": "^7.2.2",
-        "vsce": "^1.75.0"
+        "vsce": "^1.75.0",
+        "vscode-test": "^1.3.0"
     },
     "activationEvents": [
         "onLanguage:rust",
@@ -57,7 +64,7 @@
         "onCommand:rust-analyzer.collectGarbage",
         "workspaceContains:**/Cargo.toml"
     ],
-    "main": "./out/main",
+    "main": "./out/src/main",
     "contributes": {
         "taskDefinitions": [
             {
@@ -313,22 +320,22 @@
                 "rust-analyzer.inlayHints.enable": {
                     "type": "boolean",
                     "default": true,
-                    "description": "Disable all inlay hints"
+                    "description": "Whether to show inlay hints"
                 },
                 "rust-analyzer.inlayHints.typeHints": {
                     "type": "boolean",
                     "default": true,
-                    "description": "Whether to show inlay type hints"
+                    "description": "Whether to show inlay type hints for variables."
                 },
                 "rust-analyzer.inlayHints.chainingHints": {
                     "type": "boolean",
                     "default": true,
-                    "description": "Whether to show inlay type hints for method chains"
+                    "description": "Whether to show inlay type hints for method chains."
                 },
                 "rust-analyzer.inlayHints.parameterHints": {
                     "type": "boolean",
                     "default": true,
-                    "description": "Whether to show function parameter name inlay hints at the call site"
+                    "description": "Whether to show function parameter name inlay hints at the call site."
                 },
                 "rust-analyzer.inlayHints.maxLength": {
                     "type": [