]> git.lizzy.rs Git - rust.git/blobdiff - editors/code/package.json
Merge #11765
[rust.git] / editors / code / package.json
index ac6492f4633b4ace8beffe62b5190b16b8c5560f..ffd89d96d4c309a5bb6616c4f6f0cc9eaede7afe 100644 (file)
         "Programming Languages"
     ],
     "engines": {
-        "vscode": "^1.64.0"
+        "vscode": "^1.65.0"
     },
-    "enabledApiProposals": [
-        "inlayHints"
-    ],
+    "enabledApiProposals": [],
     "scripts": {
         "vscode:prepublish": "npm run build-base -- --minify",
         "package": "vsce package -o rust-analyzer.vsix",
@@ -35,8 +33,7 @@
         "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",
-        "postinstall": "vscode-dts dev"
+        "test": "node ./out/tests/runTests.js"
     },
     "dependencies": {
         "vscode-languageclient": "8.0.0-next.12",
     },
     "devDependencies": {
         "@types/node": "~14.17.5",
-        "@types/vscode": "~1.64.0",
+        "@types/vscode": "~1.65.0",
         "@typescript-eslint/eslint-plugin": "^5.10.0",
         "@typescript-eslint/parser": "^5.10.0",
         "@vscode/test-electron": "^2.1.1",
         "esbuild": "^0.14.12",
-        "eslint": "^8.7.0",
+        "eslint": "^8.10.0",
         "tslib": "^2.3.0",
         "typescript": "^4.5.5",
         "typescript-formatter": "^7.2.2",
-        "vsce": "^2.6.7",
-        "vscode-dts": "^0.3.3"
+        "vsce": "^2.6.7"
     },
     "activationEvents": [
         "onLanguage:rust",
                 "title": "Restart server",
                 "category": "Rust Analyzer"
             },
-            {
-                "command": "rust-analyzer.updateGithubToken",
-                "title": "Update Github API token",
-                "category": "Rust Analyzer"
-            },
             {
                 "command": "rust-analyzer.onEnter",
                 "title": "Enhanced enter key",
                     "default": true,
                     "description": "Whether to show inlay hints."
                 },
-                "rust-analyzer.inlayHints.smallerHints": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "Whether inlay hints font size should be smaller than editor's font size."
-                },
                 "rust-analyzer.server.path": {
                     "type": [
                         "null",
                     "default": true,
                     "type": "boolean"
                 },
-                "rust-analyzer.inlayHints.chainingHints": {
-                    "markdownDescription": "Whether to show inlay type hints for method chains.",
+                "rust-analyzer.inlayHints.renderColons": {
+                    "markdownDescription": "Whether to render trailing colons for parameter hints, and trailing colons for parameter hints.",
                     "default": true,
                     "type": "boolean"
                 },
                     "default": true,
                     "type": "boolean"
                 },
+                "rust-analyzer.inlayHints.chainingHints": {
+                    "markdownDescription": "Whether to show inlay type hints for method chains.",
+                    "default": true,
+                    "type": "boolean"
+                },
+                "rust-analyzer.inlayHints.closureReturnTypeHints": {
+                    "markdownDescription": "Whether to show inlay type hints for return types of closures with blocks.",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "rust-analyzer.inlayHints.lifetimeElisionHints": {
+                    "markdownDescription": "Whether to show inlay type hints for elided lifetimes in function signatures.",
+                    "default": "never",
+                    "type": "string",
+                    "enum": [
+                        "always",
+                        "never",
+                        "skip_trivial"
+                    ],
+                    "enumDescriptions": [
+                        "Always show lifetime elision hints.",
+                        "Never show lifetime elision hints.",
+                        "Only show lifetime elision hints if a return type is involved."
+                    ]
+                },
+                "rust-analyzer.inlayHints.lifetimeElisionHints.useParameterNames": {
+                    "markdownDescription": "Whether to prefer using parameter names as the name for elided lifetime hints if possible.",
+                    "default": false,
+                    "type": "boolean"
+                },
                 "rust-analyzer.inlayHints.hideNamedConstructorHints": {
                     "markdownDescription": "Whether to hide inlay hints for constructors.",
                     "default": false,
             }
         ],
         "colors": [
-            {
-                "id": "rust_analyzer.inlayHints.foreground",
-                "description": "Foreground color of inlay hints (is overriden by more specific rust_analyzer.inlayHints.foreground.* configurations)",
-                "defaults": {
-                    "dark": "#A0A0A0F0",
-                    "light": "#747474",
-                    "highContrast": "#BEBEBE"
-                }
-            },
-            {
-                "id": "rust_analyzer.inlayHints.background",
-                "description": "Background color of inlay hints (is overriden by more specific rust_analyzer.inlayHints.background.* configurations)",
-                "defaults": {
-                    "dark": "#11223300",
-                    "light": "#11223300",
-                    "highContrast": "#11223300"
-                }
-            },
-            {
-                "id": "rust_analyzer.inlayHints.foreground.typeHints",
-                "description": "Foreground color of inlay type hints for variables (overrides rust_analyzer.inlayHints.foreground)",
-                "defaults": {
-                    "dark": "rust_analyzer.inlayHints.foreground",
-                    "light": "rust_analyzer.inlayHints.foreground",
-                    "highContrast": "rust_analyzer.inlayHints.foreground"
-                }
-            },
-            {
-                "id": "rust_analyzer.inlayHints.foreground.chainingHints",
-                "description": "Foreground color of inlay type hints for method chains (overrides rust_analyzer.inlayHints.foreground)",
-                "defaults": {
-                    "dark": "rust_analyzer.inlayHints.foreground",
-                    "light": "rust_analyzer.inlayHints.foreground",
-                    "highContrast": "rust_analyzer.inlayHints.foreground"
-                }
-            },
-            {
-                "id": "rust_analyzer.inlayHints.foreground.parameterHints",
-                "description": "Foreground color of function parameter name inlay hints at the call site (overrides rust_analyzer.inlayHints.foreground)",
-                "defaults": {
-                    "dark": "rust_analyzer.inlayHints.foreground",
-                    "light": "rust_analyzer.inlayHints.foreground",
-                    "highContrast": "rust_analyzer.inlayHints.foreground"
-                }
-            },
-            {
-                "id": "rust_analyzer.inlayHints.background.typeHints",
-                "description": "Background color of inlay type hints for variables (overrides rust_analyzer.inlayHints.background)",
-                "defaults": {
-                    "dark": "rust_analyzer.inlayHints.background",
-                    "light": "rust_analyzer.inlayHints.background",
-                    "highContrast": "rust_analyzer.inlayHints.background"
-                }
-            },
-            {
-                "id": "rust_analyzer.inlayHints.background.chainingHints",
-                "description": "Background color of inlay type hints for method chains (overrides rust_analyzer.inlayHints.background)",
-                "defaults": {
-                    "dark": "rust_analyzer.inlayHints.background",
-                    "light": "rust_analyzer.inlayHints.background",
-                    "highContrast": "rust_analyzer.inlayHints.background"
-                }
-            },
-            {
-                "id": "rust_analyzer.inlayHints.background.parameterHints",
-                "description": "Background color of function parameter name inlay hints at the call site (overrides rust_analyzer.inlayHints.background)",
-                "defaults": {
-                    "dark": "rust_analyzer.inlayHints.background",
-                    "light": "rust_analyzer.inlayHints.background",
-                    "highContrast": "rust_analyzer.inlayHints.background"
-                }
-            },
             {
                 "id": "rust_analyzer.syntaxTreeBorder",
                 "description": "Color of the border displayed in the Rust source code for the selected syntax node (see \"Show Syntax Tree\" command)",
                 "description": "Style for the self keyword",
                 "superType": "keyword"
             },
+            {
+                "id": "selfTypeKeyword",
+                "description": "Style for the self type keyword",
+                "superType": "keyword"
+            },
             {
                 "id": "semicolon",
                 "description": "Style for ;",
                     "command": "rust-analyzer.reload",
                     "when": "inRustProject"
                 },
-                {
-                    "command": "rust-analyzer.updateGithubToken",
-                    "when": "inRustProject"
-                },
                 {
                     "command": "rust-analyzer.onEnter",
                     "when": "inRustProject"