rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: Fix lifetime elision hint configuration key

Browse Source
This commit is contained in:
Lukas Wirth
2022-03-22 16:27:59 +01:00
parent cb1b7e18fe
commit ecf2c98859
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/rust-analyzer/src/config.rs
View File

@@ -259,7 +259,7 @@ config_data! {
/// Whether to show inlay type hints for compiler inserted reborrows. /// Whether to show inlay type hints for compiler inserted reborrows.
inlayHints_reborrowHints: bool = "false", inlayHints_reborrowHints: bool = "false",
/// Whether to show inlay type hints for elided lifetimes in function signatures. /// 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. /// Whether to prefer using parameter names as the name for elided lifetime hints if possible.
inlayHints_lifetimeElisionHints_useParameterNames: bool = "false", inlayHints_lifetimeElisionHints_useParameterNames: bool = "false",
/// Whether to hide inlay hints for constructors. /// Whether to hide inlay hints for constructors.
@@ -862,7 +862,7 @@ impl Config {
parameter_hints: self.data.inlayHints_parameterHints, parameter_hints: self.data.inlayHints_parameterHints,
chaining_hints: self.data.inlayHints_chainingHints, chaining_hints: self.data.inlayHints_chainingHints,
closure_return_type_hints: self.data.inlayHints_closureReturnTypeHints, 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::Always => LifetimeElisionHints::Always,
LifetimeElisionDef::Never => LifetimeElisionHints::Never, LifetimeElisionDef::Never => LifetimeElisionHints::Never,
LifetimeElisionDef::SkipTrivial => LifetimeElisionHints::SkipTrivial, LifetimeElisionDef::SkipTrivial => LifetimeElisionHints::SkipTrivial,

2
docs/user/generated_config.adoc
View File

@@ -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. 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. Whether to show inlay type hints for elided lifetimes in function signatures.

2
editors/code/package.json
View File

@@ -800,7 +800,7 @@
"default": false, "default": false,
"type": "boolean" "type": "boolean"
}, },
"rust-analyzer.inlayHints.lifetimeElisionHints": { "rust-analyzer.inlayHints.lifetimeElisionHints.enable": {
"markdownDescription": "Whether to show inlay type hints for elided lifetimes in function signatures.", "markdownDescription": "Whether to show inlay type hints for elided lifetimes in function signatures.",
"default": "never", "default": "never",
"type": "string", "type": "string",