From 9a057c0ff48a1c99870c52d839284ead74a555c1 Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Sat, 29 May 2021 18:08:14 +0200 Subject: Fix incorrect setting descriptions Descriptions for diagnostic warning hint and info display were swapped. Fixes #8485. Signed-off-by: Lucas Schwiderski --- crates/rust-analyzer/src/config.rs | 10 +++++----- docs/user/generated_config.adoc | 12 ++++++------ 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! { /// Map of prefixes to be substituted when parsing diagnostic file paths. /// This should be the reverse mapping of what is passed to `rustc` as `--remap-path-prefix`. diagnostics_remapPrefix: FxHashMap = "{}", - /// List of warnings that should be displayed with info severity. - /// - /// The warnings will be indicated by a blue squiggly underline in code - /// and a blue icon in the `Problems Panel`. - diagnostics_warningsAsHint: Vec = "[]", /// List of warnings that should be displayed with hint severity. /// /// The warnings will be indicated by faded text or three dots in code /// and will not show up in the `Problems Panel`. + diagnostics_warningsAsHint: Vec = "[]", + /// List of warnings that should be displayed with info severity. + /// + /// The warnings will be indicated by a blue squiggly underline in code + /// and a blue icon in the `Problems Panel`. diagnostics_warningsAsInfo: Vec = "[]", /// 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 [[rust-analyzer.diagnostics.warningsAsHint]]rust-analyzer.diagnostics.warningsAsHint (default: `[]`):: + -- -List of warnings that should be displayed with info severity. +List of warnings that should be displayed with hint severity. -The warnings will be indicated by a blue squiggly underline in code -and a blue icon in the `Problems Panel`. +The warnings will be indicated by faded text or three dots in code +and will not show up in the `Problems Panel`. -- [[rust-analyzer.diagnostics.warningsAsInfo]]rust-analyzer.diagnostics.warningsAsInfo (default: `[]`):: + -- -List of warnings that should be displayed with hint severity. +List of warnings that should be displayed with info severity. -The warnings will be indicated by faded text or three dots in code -and will not show up in the `Problems Panel`. +The warnings will be indicated by a blue squiggly underline in code +and a blue icon in the `Problems Panel`. -- [[rust-analyzer.files.watcher]]rust-analyzer.files.watcher (default: `"client"`):: + 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 @@ "type": "object" }, "rust-analyzer.diagnostics.warningsAsHint": { - "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`.", + "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`.", "default": [], "type": "array", "items": { @@ -605,7 +605,7 @@ } }, "rust-analyzer.diagnostics.warningsAsInfo": { - "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`.", + "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`.", "default": [], "type": "array", "items": { -- cgit v1.2.3