Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #17616 - Veykril:config-param-hints, r=Veykril
Fix incorrect generic parameter hint defaults Missed this in the review but we should show const param hints, not lifetime param hints by default
bors 2024-07-17
parent 1b168c1 · parent 8f044d9 · commit 3fa78e1
-rw-r--r--crates/rust-analyzer/src/config.rs4
-rw-r--r--docs/user/generated_config.adoc4
-rw-r--r--editors/code/package.json4
3 files changed, 6 insertions, 6 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 94eb911f70..cd8e7e339b 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -511,9 +511,9 @@ config_data! {
/// Whether to show inlay hints as postfix ops (`.*` instead of `*`, etc).
inlayHints_expressionAdjustmentHints_mode: AdjustmentHintsModeDef = AdjustmentHintsModeDef::Prefix,
/// Whether to show const generic parameter name inlay hints.
- inlayHints_genericParameterHints_const_enable: bool= false,
+ inlayHints_genericParameterHints_const_enable: bool= true,
/// Whether to show generic lifetime parameter name inlay hints.
- inlayHints_genericParameterHints_lifetime_enable: bool = true,
+ inlayHints_genericParameterHints_lifetime_enable: bool = false,
/// Whether to show generic type parameter name inlay hints.
inlayHints_genericParameterHints_type_enable: bool = false,
/// Whether to show implicit drop hints.
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
index a3451e21ee..6fd81d0528 100644
--- a/docs/user/generated_config.adoc
+++ b/docs/user/generated_config.adoc
@@ -655,12 +655,12 @@ Whether to hide inlay hints for type adjustments outside of `unsafe` blocks.
--
Whether to show inlay hints as postfix ops (`.*` instead of `*`, etc).
--
-[[rust-analyzer.inlayHints.genericParameterHints.const.enable]]rust-analyzer.inlayHints.genericParameterHints.const.enable (default: `false`)::
+[[rust-analyzer.inlayHints.genericParameterHints.const.enable]]rust-analyzer.inlayHints.genericParameterHints.const.enable (default: `true`)::
+
--
Whether to show const generic parameter name inlay hints.
--
-[[rust-analyzer.inlayHints.genericParameterHints.lifetime.enable]]rust-analyzer.inlayHints.genericParameterHints.lifetime.enable (default: `true`)::
+[[rust-analyzer.inlayHints.genericParameterHints.lifetime.enable]]rust-analyzer.inlayHints.genericParameterHints.lifetime.enable (default: `false`)::
+
--
Whether to show generic lifetime parameter name inlay hints.
diff --git a/editors/code/package.json b/editors/code/package.json
index 9bb132f582..941b5ff4eb 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -1914,7 +1914,7 @@
"properties": {
"rust-analyzer.inlayHints.genericParameterHints.const.enable": {
"markdownDescription": "Whether to show const generic parameter name inlay hints.",
- "default": false,
+ "default": true,
"type": "boolean"
}
}
@@ -1924,7 +1924,7 @@
"properties": {
"rust-analyzer.inlayHints.genericParameterHints.lifetime.enable": {
"markdownDescription": "Whether to show generic lifetime parameter name inlay hints.",
- "default": true,
+ "default": false,
"type": "boolean"
}
}