aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-03-24 08:53:48 +0000
committerGitHub <[email protected]>2021-03-24 08:53:48 +0000
commit5f9ba2d589afaaec91ee79bfc7fa3aba636916f2 (patch)
tree120873f34a98e257f644ed2e15e527653a4b17cb
parent3e8f13d2748edc176328706a338c76c0c3e4c61b (diff)
parent5e83a56dfb69320b4fe3a980a1d1b79bab301894 (diff)
Merge #8177
8177: Limit the hints size by default r=Veykril a=SomeoneToIgnore Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8175 Fixes https://github.com/rust-analyzer/rust-analyzer/issues/3138 Co-authored-by: Kirill Bulatov <[email protected]>
-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 5c88c3a9b..cda272fd4 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -131,8 +131,8 @@ config_data! {
131 131
132 /// Whether to show inlay type hints for method chains. 132 /// Whether to show inlay type hints for method chains.
133 inlayHints_chainingHints: bool = "true", 133 inlayHints_chainingHints: bool = "true",
134 /// Maximum length for inlay hints. Default is unlimited. 134 /// Maximum length for inlay hints. Set to null to have an unlimited length.
135 inlayHints_maxLength: Option<usize> = "null", 135 inlayHints_maxLength: Option<usize> = "25",
136 /// Whether to show function parameter name inlay hints at the call 136 /// Whether to show function parameter name inlay hints at the call
137 /// site. 137 /// site.
138 inlayHints_parameterHints: bool = "true", 138 inlayHints_parameterHints: bool = "true",
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
index c2521289c..871c65add 100644
--- a/docs/user/generated_config.adoc
+++ b/docs/user/generated_config.adoc
@@ -206,10 +206,10 @@ Use markdown syntax for links in hover.
206-- 206--
207Whether to show inlay type hints for method chains. 207Whether to show inlay type hints for method chains.
208-- 208--
209[[rust-analyzer.inlayHints.maxLength]]rust-analyzer.inlayHints.maxLength (default: `null`):: 209[[rust-analyzer.inlayHints.maxLength]]rust-analyzer.inlayHints.maxLength (default: `25`)::
210+ 210+
211-- 211--
212Maximum length for inlay hints. Default is unlimited. 212Maximum length for inlay hints. Set to null to have an unlimited length.
213-- 213--
214[[rust-analyzer.inlayHints.parameterHints]]rust-analyzer.inlayHints.parameterHints (default: `true`):: 214[[rust-analyzer.inlayHints.parameterHints]]rust-analyzer.inlayHints.parameterHints (default: `true`)::
215+ 215+
diff --git a/editors/code/package.json b/editors/code/package.json
index faec45276..d263610f5 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -625,8 +625,8 @@
625 "type": "boolean" 625 "type": "boolean"
626 }, 626 },
627 "rust-analyzer.inlayHints.maxLength": { 627 "rust-analyzer.inlayHints.maxLength": {
628 "markdownDescription": "Maximum length for inlay hints. Default is unlimited.", 628 "markdownDescription": "Maximum length for inlay hints. Set to null to have an unlimited length.",
629 "default": null, 629 "default": 25,
630 "type": [ 630 "type": [
631 "null", 631 "null",
632 "integer" 632 "integer"