Auto merge of #12328 - Veykril:simplify, r=Veykril

[rust.git] / editors / code / package.json

diff --git a/editors/code/package.json b/editors/code/package.json
index 04006d74345bc608b3f745d873aceba4cbb94987..f46c7ea92d3e6e5c3ca60ca1844f13276abd5468 100644 (file)
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -29,8 +29,8 @@
         "build-base": "esbuild ./src/main.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node --target=node16",
         "build": "npm run build-base -- --sourcemap",
         "watch": "npm run build-base -- --sourcemap --watch",
-        "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src ./tests",
-        "fix": " tsfmt -r       && eslint -c .eslintrc.js --ext ts ./src ./tests --fix",
+        "lint": "prettier --check . && eslint -c .eslintrc.js --ext ts ./src ./tests",
+        "fix": "prettier --write . && eslint -c .eslintrc.js --ext ts ./src ./tests --fix",
         "pretest": "tsc && npm run build",
         "test": "cross-env TEST_VARIABLE=test node ./out/tests/runTests.js"
     },
@@ -48,9 +48,10 @@
         "cross-env": "^7.0.3",
         "esbuild": "^0.14.27",
         "eslint": "^8.11.0",
+        "eslint-config-prettier": "^8.5.0",
+        "prettier": "^2.6.2",
         "tslib": "^2.3.0",
         "typescript": "^4.6.3",
-        "typescript-formatter": "^7.2.2",
         "vsce": "^2.7.0"
     },
     "activationEvents": [
@@ -387,7 +388,7 @@
                     "type": "boolean"
                 },
                 "rust-analyzer.cachePriming.numThreads": {
-                    "markdownDescription": "How many worker threads to to handle priming caches. The default `0` means to pick automatically.",
+                    "markdownDescription": "How many worker threads to handle priming caches. The default `0` means to pick automatically.",
                     "default": 0,
                     "type": "number",
                     "minimum": 0,
@@ -867,6 +868,11 @@
                     "default": true,
                     "type": "boolean"
                 },
+                "rust-analyzer.inlayHints.typeHints.hideClosureInitialization": {
+                    "markdownDescription": "Whether to hide inlay type hints for `let` statements that initialize to a closure.\nOnly applies to closures with blocks, same as `#rust-analyzer.inlayHints.closureReturnTypeHints.enable#`.",
+                    "default": false,
+                    "type": "boolean"
+                },
                 "rust-analyzer.inlayHints.typeHints.hideNamedConstructor": {
                     "markdownDescription": "Whether to hide inlay type hints for constructors.",
                     "default": false,