Bump deps

3 files changed, 51 insertions, 47 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 313da64430e..0d6e3c55cd2 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -7,15 +7,16 @@
         "": {
             "name": "rust-analyzer",
             "version": "0.4.0-dev",
+            "hasInstallScript": true,
             "license": "MIT OR Apache-2.0",
             "dependencies": {
                 "d3": "^7.3.0",
                 "d3-graphviz": "^4.0.0",
-                "vscode-languageclient": "8.0.0-next.8"
+                "vscode-languageclient": "8.0.0-next.12"
             },
             "devDependencies": {
                 "@types/node": "~14.17.5",
-                "@types/vscode": "~1.63.0",
+                "@types/vscode": "~1.64.0",
                 "@typescript-eslint/eslint-plugin": "^5.10.0",
                 "@typescript-eslint/parser": "^5.10.0",
                 "@vscode/test-electron": "^2.1.1",
@@ -25,10 +26,10 @@
                 "typescript": "^4.5.5",
                 "typescript-formatter": "^7.2.2",
                 "vsce": "^2.6.7",
-                "vscode-dts": "^0.3.1"
+                "vscode-dts": "^0.3.3"
             },
             "engines": {
-                "vscode": "^1.63.0"
+                "vscode": "^1.64.0"
             }
         },
         "node_modules/@eslint/eslintrc": {
@@ -142,9 +143,9 @@
             "dev": true
         },
         "node_modules/@types/vscode": {
-            "version": "1.63.1",
-            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.63.1.tgz",
-            "integrity": "sha512-Z+ZqjRcnGfHP86dvx/BtSwWyZPKQ/LBdmAVImY82TphyjOw2KgTKcp7Nx92oNwCTsHzlshwexAG/WiY2JuUm3g==",
+            "version": "1.64.0",
+            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.64.0.tgz",
+            "integrity": "sha512-bSlAWz5WtcSL3cO9tAT/KpEH9rv5OBnm93OIIFwdCshaAiqr2bp1AUyEwW9MWeCvZBHEXc3V0fTYVdVyzDNwHA==",
             "dev": true
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
@@ -3586,39 +3587,39 @@
             }
         },
         "node_modules/vscode-jsonrpc": {
-            "version": "8.0.0-next.5",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.5.tgz",
-            "integrity": "sha512-owRllqcFTnz5rXxcbmHPFGmpFmLqj9Z1V3Dzrv+s8ejOHLIT62Pyb5Uqzyl2/in2VP22DmzErPgZwrxjLCIKiQ==",
+            "version": "8.0.0-next.6",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.6.tgz",
+            "integrity": "sha512-6Ld3RYjygn5Ih7CkAtcAwiDQC+rakj2O+PnASfNyYv3sLmm44eJpEKzuPUN30Iy2UB09AZg8T6LBKWTJTEJDVw==",
             "engines": {
                 "node": ">=14.0.0"
             }
         },
         "node_modules/vscode-languageclient": {
-            "version": "8.0.0-next.8",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0-next.8.tgz",
-            "integrity": "sha512-CBdYRIVqqlRmZ2YBeTk0S2QMtsL8ZJfbddlfvERmRPXW4Pimr7Nk+mYq16F/k3HbrO9Xt+RAFP1t6FIIbmuUGw==",
+            "version": "8.0.0-next.12",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0-next.12.tgz",
+            "integrity": "sha512-4+kr1BQcoh+sA5/4XJDJXrQXGQ5Yz/x+WpsVGGzK/TOB7RwQ63ooxG6Ej7i/+aOQM4/QdmcYWmipDtG7vqcOiw==",
             "dependencies": {
                 "minimatch": "^3.0.4",
                 "semver": "^7.3.5",
-                "vscode-languageserver-protocol": "3.17.0-next.12"
+                "vscode-languageserver-protocol": "3.17.0-next.14"
             },
             "engines": {
                 "vscode": "^1.63.0"
             }
         },
         "node_modules/vscode-languageserver-protocol": {
-            "version": "3.17.0-next.12",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.12.tgz",
-            "integrity": "sha512-VLRcWKOpCXcx9UrqrS+NSF6pNxV498VGYGW+eyp9a79/F9ElUq3wdG6acXYlEfpWHuIxpm6MXps8FU88wqIgTg==",
+            "version": "3.17.0-next.14",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.14.tgz",
+            "integrity": "sha512-iangobY8dL6sFZkOx4OhRPJM9gN0I1caUsOVR+MnPozsqQUtwMXmbIcfaIf0Akp0pd3KhJDPf/tdwRX68QGeeA==",
             "dependencies": {
-                "vscode-jsonrpc": "8.0.0-next.5",
-                "vscode-languageserver-types": "3.17.0-next.6"
+                "vscode-jsonrpc": "8.0.0-next.6",
+                "vscode-languageserver-types": "3.17.0-next.7"
             }
         },
         "node_modules/vscode-languageserver-types": {
-            "version": "3.17.0-next.6",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.6.tgz",
-            "integrity": "sha512-rHYeCotiabJHgvIYzWjV8g0dHCxyOQtcryTv1Xa1horaQ4jx2V+rjLBstc6zMpCyrnZcjorwEcAvGBDCd6wudw=="
+            "version": "3.17.0-next.7",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.7.tgz",
+            "integrity": "sha512-KH4zdG1qBXxoso61ChgpeoZYyHGJo8bV7Jv4I+fwQ1Ryy59JAxoZ9GAbhR5TeeafHctLcg6RFvY3m8Jqfu17cg=="
         },
         "node_modules/which": {
             "version": "2.0.2",
@@ -3799,9 +3800,9 @@
             "dev": true
         },
         "@types/vscode": {
-            "version": "1.63.1",
-            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.63.1.tgz",
-            "integrity": "sha512-Z+ZqjRcnGfHP86dvx/BtSwWyZPKQ/LBdmAVImY82TphyjOw2KgTKcp7Nx92oNwCTsHzlshwexAG/WiY2JuUm3g==",
+            "version": "1.64.0",
+            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.64.0.tgz",
+            "integrity": "sha512-bSlAWz5WtcSL3cO9tAT/KpEH9rv5OBnm93OIIFwdCshaAiqr2bp1AUyEwW9MWeCvZBHEXc3V0fTYVdVyzDNwHA==",
             "dev": true
         },
         "@typescript-eslint/eslint-plugin": {
@@ -6407,33 +6408,33 @@
             }
         },
         "vscode-jsonrpc": {
-            "version": "8.0.0-next.5",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.5.tgz",
-            "integrity": "sha512-owRllqcFTnz5rXxcbmHPFGmpFmLqj9Z1V3Dzrv+s8ejOHLIT62Pyb5Uqzyl2/in2VP22DmzErPgZwrxjLCIKiQ=="
+            "version": "8.0.0-next.6",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.6.tgz",
+            "integrity": "sha512-6Ld3RYjygn5Ih7CkAtcAwiDQC+rakj2O+PnASfNyYv3sLmm44eJpEKzuPUN30Iy2UB09AZg8T6LBKWTJTEJDVw=="
         },
         "vscode-languageclient": {
-            "version": "8.0.0-next.8",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0-next.8.tgz",
-            "integrity": "sha512-CBdYRIVqqlRmZ2YBeTk0S2QMtsL8ZJfbddlfvERmRPXW4Pimr7Nk+mYq16F/k3HbrO9Xt+RAFP1t6FIIbmuUGw==",
+            "version": "8.0.0-next.12",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0-next.12.tgz",
+            "integrity": "sha512-4+kr1BQcoh+sA5/4XJDJXrQXGQ5Yz/x+WpsVGGzK/TOB7RwQ63ooxG6Ej7i/+aOQM4/QdmcYWmipDtG7vqcOiw==",
             "requires": {
                 "minimatch": "^3.0.4",
                 "semver": "^7.3.5",
-                "vscode-languageserver-protocol": "3.17.0-next.12"
+                "vscode-languageserver-protocol": "3.17.0-next.14"
             }
         },
         "vscode-languageserver-protocol": {
-            "version": "3.17.0-next.12",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.12.tgz",
-            "integrity": "sha512-VLRcWKOpCXcx9UrqrS+NSF6pNxV498VGYGW+eyp9a79/F9ElUq3wdG6acXYlEfpWHuIxpm6MXps8FU88wqIgTg==",
+            "version": "3.17.0-next.14",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.14.tgz",
+            "integrity": "sha512-iangobY8dL6sFZkOx4OhRPJM9gN0I1caUsOVR+MnPozsqQUtwMXmbIcfaIf0Akp0pd3KhJDPf/tdwRX68QGeeA==",
             "requires": {
-                "vscode-jsonrpc": "8.0.0-next.5",
-                "vscode-languageserver-types": "3.17.0-next.6"
+                "vscode-jsonrpc": "8.0.0-next.6",
+                "vscode-languageserver-types": "3.17.0-next.7"
             }
         },
         "vscode-languageserver-types": {
-            "version": "3.17.0-next.6",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.6.tgz",
-            "integrity": "sha512-rHYeCotiabJHgvIYzWjV8g0dHCxyOQtcryTv1Xa1horaQ4jx2V+rjLBstc6zMpCyrnZcjorwEcAvGBDCd6wudw=="
+            "version": "3.17.0-next.7",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.7.tgz",
+            "integrity": "sha512-KH4zdG1qBXxoso61ChgpeoZYyHGJo8bV7Jv4I+fwQ1Ryy59JAxoZ9GAbhR5TeeafHctLcg6RFvY3m8Jqfu17cg=="
         },
         "which": {
             "version": "2.0.2",
diff --git a/editors/code/package.json b/editors/code/package.json
index 3ddae8109ef..ac6492f4633 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -21,9 +21,11 @@
         "Programming Languages"
     ],
     "engines": {
-        "vscode": "^1.63.0"
+        "vscode": "^1.64.0"
     },
-    "enableProposedApi": true,
+    "enabledApiProposals": [
+        "inlayHints"
+    ],
     "scripts": {
         "vscode:prepublish": "npm run build-base -- --minify",
         "package": "vsce package -o rust-analyzer.vsix",
@@ -33,16 +35,17 @@
         "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src ./tests",
         "fix": " tsfmt -r       && eslint -c .eslintrc.js --ext ts ./src ./tests --fix",
         "pretest": "tsc && npm run build",
-        "test": "node ./out/tests/runTests.js"
+        "test": "node ./out/tests/runTests.js",
+        "postinstall": "vscode-dts dev"
     },
     "dependencies": {
-        "vscode-languageclient": "8.0.0-next.8",
+        "vscode-languageclient": "8.0.0-next.12",
         "d3": "^7.3.0",
         "d3-graphviz": "^4.0.0"
     },
     "devDependencies": {
         "@types/node": "~14.17.5",
-        "@types/vscode": "~1.63.0",
+        "@types/vscode": "~1.64.0",
         "@typescript-eslint/eslint-plugin": "^5.10.0",
         "@typescript-eslint/parser": "^5.10.0",
         "@vscode/test-electron": "^2.1.1",
@@ -52,7 +55,7 @@
         "typescript": "^4.5.5",
         "typescript-formatter": "^7.2.2",
         "vsce": "^2.6.7",
-        "vscode-dts": "^0.3.1"
+        "vscode-dts": "^0.3.3"
     },
     "activationEvents": [
         "onLanguage:rust",
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json
index 46fd163dcb1..6bf206153a3 100644
--- a/editors/code/tsconfig.json
+++ b/editors/code/tsconfig.json
@@ -23,6 +23,6 @@
     "include": [
         "src",
         "tests",
-        "vscode.proposed.d.ts"
+        "vscode.proposed.inlayHints.d.ts"
     ]
 }