about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2022-03-22 16:27:59 +0100
committerLukas Wirth <lukastw97@gmail.com>2022-03-22 16:28:36 +0100
commitecf2c98859a46de0133f961f293d0f72ce3eee3c (patch)
tree65827956b86243d9424eca80c685caf972a0c597
parentcb1b7e18fef9af18c12eed70cd63187f70b992a5 (diff)
downloadrust-ecf2c98859a46de0133f961f293d0f72ce3eee3c.tar.gz
rust-ecf2c98859a46de0133f961f293d0f72ce3eee3c.zip
fix: Fix lifetime elision hint configuration key
-rw-r--r--crates/rust-analyzer/src/config.rs4
-rw-r--r--docs/user/generated_config.adoc2
-rw-r--r--editors/code/package.json2
3 files changed, 4 insertions, 4 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index ab197c671df..f7df51e36a9 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -259,7 +259,7 @@ config_data! {
         /// Whether to show inlay type hints for compiler inserted reborrows.
         inlayHints_reborrowHints: bool                      = "false",
         /// Whether to show inlay type hints for elided lifetimes in function signatures.
-        inlayHints_lifetimeElisionHints: LifetimeElisionDef = "\"never\"",
+        inlayHints_lifetimeElisionHints_enable: LifetimeElisionDef = "\"never\"",
         /// Whether to prefer using parameter names as the name for elided lifetime hints if possible.
         inlayHints_lifetimeElisionHints_useParameterNames: bool  = "false",
         /// Whether to hide inlay hints for constructors.
@@ -862,7 +862,7 @@ impl Config {
             parameter_hints: self.data.inlayHints_parameterHints,
             chaining_hints: self.data.inlayHints_chainingHints,
             closure_return_type_hints: self.data.inlayHints_closureReturnTypeHints,
-            lifetime_elision_hints: match self.data.inlayHints_lifetimeElisionHints {
+            lifetime_elision_hints: match self.data.inlayHints_lifetimeElisionHints_enable {
                 LifetimeElisionDef::Always => LifetimeElisionHints::Always,
                 LifetimeElisionDef::Never => LifetimeElisionHints::Never,
                 LifetimeElisionDef::SkipTrivial => LifetimeElisionHints::SkipTrivial,
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
index 61bd36202d9..bf8d482432e 100644
--- a/docs/user/generated_config.adoc
+++ b/docs/user/generated_config.adoc
@@ -383,7 +383,7 @@ Whether to show inlay type hints for return types of closures with blocks.
 --
 Whether to show inlay type hints for compiler inserted reborrows.
 --
-[[rust-analyzer.inlayHints.lifetimeElisionHints]]rust-analyzer.inlayHints.lifetimeElisionHints (default: `"never"`)::
+[[rust-analyzer.inlayHints.lifetimeElisionHints.enable]]rust-analyzer.inlayHints.lifetimeElisionHints.enable (default: `"never"`)::
 +
 --
 Whether to show inlay type hints for elided lifetimes in function signatures.
diff --git a/editors/code/package.json b/editors/code/package.json
index 911fa2bd763..bf242d68959 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -800,7 +800,7 @@
                     "default": false,
                     "type": "boolean"
                 },
-                "rust-analyzer.inlayHints.lifetimeElisionHints": {
+                "rust-analyzer.inlayHints.lifetimeElisionHints.enable": {
                     "markdownDescription": "Whether to show inlay type hints for elided lifetimes in function signatures.",
                     "default": "never",
                     "type": "string",