diff options
author | Lucas Schwiderski <[email protected]> | 2021-05-29 17:08:14 +0100 |
---|---|---|
committer | Lucas Schwiderski <[email protected]> | 2021-05-29 17:08:14 +0100 |
commit | 9a057c0ff48a1c99870c52d839284ead74a555c1 (patch) | |
tree | 105f3bec13d1dcd1640400458a118a2fdfe4ea19 | |
parent | 247faf271b9098624cb0b09dd4914da66497dd5a (diff) |
Fix incorrect setting descriptions
Descriptions for diagnostic warning hint and info display were swapped.
Fixes #8485.
Signed-off-by: Lucas Schwiderski <[email protected]>
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 10 | ||||
-rw-r--r-- | docs/user/generated_config.adoc | 12 | ||||
-rw-r--r-- | editors/code/package.json | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index b6a1124a5..a67b0bb25 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -111,15 +111,15 @@ config_data! { | |||
111 | /// Map of prefixes to be substituted when parsing diagnostic file paths. | 111 | /// Map of prefixes to be substituted when parsing diagnostic file paths. |
112 | /// This should be the reverse mapping of what is passed to `rustc` as `--remap-path-prefix`. | 112 | /// This should be the reverse mapping of what is passed to `rustc` as `--remap-path-prefix`. |
113 | diagnostics_remapPrefix: FxHashMap<String, String> = "{}", | 113 | diagnostics_remapPrefix: FxHashMap<String, String> = "{}", |
114 | /// List of warnings that should be displayed with info severity. | ||
115 | /// | ||
116 | /// The warnings will be indicated by a blue squiggly underline in code | ||
117 | /// and a blue icon in the `Problems Panel`. | ||
118 | diagnostics_warningsAsHint: Vec<String> = "[]", | ||
119 | /// List of warnings that should be displayed with hint severity. | 114 | /// List of warnings that should be displayed with hint severity. |
120 | /// | 115 | /// |
121 | /// The warnings will be indicated by faded text or three dots in code | 116 | /// The warnings will be indicated by faded text or three dots in code |
122 | /// and will not show up in the `Problems Panel`. | 117 | /// and will not show up in the `Problems Panel`. |
118 | diagnostics_warningsAsHint: Vec<String> = "[]", | ||
119 | /// List of warnings that should be displayed with info severity. | ||
120 | /// | ||
121 | /// The warnings will be indicated by a blue squiggly underline in code | ||
122 | /// and a blue icon in the `Problems Panel`. | ||
123 | diagnostics_warningsAsInfo: Vec<String> = "[]", | 123 | diagnostics_warningsAsInfo: Vec<String> = "[]", |
124 | 124 | ||
125 | /// Controls file watching implementation. | 125 | /// Controls file watching implementation. |
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc index f3da82feb..4a5782a57 100644 --- a/docs/user/generated_config.adoc +++ b/docs/user/generated_config.adoc | |||
@@ -161,18 +161,18 @@ This should be the reverse mapping of what is passed to `rustc` as `--remap-path | |||
161 | [[rust-analyzer.diagnostics.warningsAsHint]]rust-analyzer.diagnostics.warningsAsHint (default: `[]`):: | 161 | [[rust-analyzer.diagnostics.warningsAsHint]]rust-analyzer.diagnostics.warningsAsHint (default: `[]`):: |
162 | + | 162 | + |
163 | -- | 163 | -- |
164 | List of warnings that should be displayed with info severity. | 164 | List of warnings that should be displayed with hint severity. |
165 | 165 | ||
166 | The warnings will be indicated by a blue squiggly underline in code | 166 | The warnings will be indicated by faded text or three dots in code |
167 | and a blue icon in the `Problems Panel`. | 167 | and will not show up in the `Problems Panel`. |
168 | -- | 168 | -- |
169 | [[rust-analyzer.diagnostics.warningsAsInfo]]rust-analyzer.diagnostics.warningsAsInfo (default: `[]`):: | 169 | [[rust-analyzer.diagnostics.warningsAsInfo]]rust-analyzer.diagnostics.warningsAsInfo (default: `[]`):: |
170 | + | 170 | + |
171 | -- | 171 | -- |
172 | List of warnings that should be displayed with hint severity. | 172 | List of warnings that should be displayed with info severity. |
173 | 173 | ||
174 | The warnings will be indicated by faded text or three dots in code | 174 | The warnings will be indicated by a blue squiggly underline in code |
175 | and will not show up in the `Problems Panel`. | 175 | and a blue icon in the `Problems Panel`. |
176 | -- | 176 | -- |
177 | [[rust-analyzer.files.watcher]]rust-analyzer.files.watcher (default: `"client"`):: | 177 | [[rust-analyzer.files.watcher]]rust-analyzer.files.watcher (default: `"client"`):: |
178 | + | 178 | + |
diff --git a/editors/code/package.json b/editors/code/package.json index 05cbccf94..5b80cc1f9 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -597,7 +597,7 @@ | |||
597 | "type": "object" | 597 | "type": "object" |
598 | }, | 598 | }, |
599 | "rust-analyzer.diagnostics.warningsAsHint": { | 599 | "rust-analyzer.diagnostics.warningsAsHint": { |
600 | "markdownDescription": "List of warnings that should be displayed with info severity.\n\nThe warnings will be indicated by a blue squiggly underline in code\nand a blue icon in the `Problems Panel`.", | 600 | "markdownDescription": "List of warnings that should be displayed with hint severity.\n\nThe warnings will be indicated by faded text or three dots in code\nand will not show up in the `Problems Panel`.", |
601 | "default": [], | 601 | "default": [], |
602 | "type": "array", | 602 | "type": "array", |
603 | "items": { | 603 | "items": { |
@@ -605,7 +605,7 @@ | |||
605 | } | 605 | } |
606 | }, | 606 | }, |
607 | "rust-analyzer.diagnostics.warningsAsInfo": { | 607 | "rust-analyzer.diagnostics.warningsAsInfo": { |
608 | "markdownDescription": "List of warnings that should be displayed with hint severity.\n\nThe warnings will be indicated by faded text or three dots in code\nand will not show up in the `Problems Panel`.", | 608 | "markdownDescription": "List of warnings that should be displayed with info severity.\n\nThe warnings will be indicated by a blue squiggly underline in code\nand a blue icon in the `Problems Panel`.", |
609 | "default": [], | 609 | "default": [], |
610 | "type": "array", | 610 | "type": "array", |
611 | "items": { | 611 | "items": { |