From c04b2e39dacfea5c6ba158d842fb3b7f3e0db12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Herrmann?= <ruediger.herrmann@gmx.de>
Date: Sat, 8 Aug 2020 11:57:54 +0200
Subject: Fix typo in settings description

Remove a duplicate word from the description of the `warningsAsHint` setting.
---
 editors/code/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index 1adf055d0..ee5f96bf3 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -607,7 +607,7 @@
                     "items": {
                         "type": "string"
                     },
-                    "description": "List of warnings warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
+                    "description": "List of warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
                     "default": []
                 }
             }
-- 
cgit v1.2.3


From 13f736d4a13bdf5af2cdd6a4832a41470431a70b Mon Sep 17 00:00:00 2001
From: Igor Aleksanov <popzxc@yandex.ru>
Date: Wed, 12 Aug 2020 16:06:55 +0300
Subject: Add a configuration option for the vscode extension

---
 editors/code/package.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index 1adf055d0..86584c071 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -609,6 +609,15 @@
                     },
                     "description": "List of warnings warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
                     "default": []
+                },
+                "rust-analyzer.analysis.disabledDiagnostics": {
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "List of rust-analyzer diagnostics to disable",
+                    "default": []
                 }
             }
         },
@@ -904,4 +913,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 3c018bf84de5c693b5ee1c6bec0fed3b201c2060 Mon Sep 17 00:00:00 2001
From: Igor Aleksanov <popzxc@yandex.ru>
Date: Thu, 13 Aug 2020 06:58:26 +0300
Subject: Restore final newline in package.json

---
 editors/code/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index d186d1474..429ff5def 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -913,4 +913,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 0866b1be894b9148cf69897a1e1aa70e3c416e29 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 18 Aug 2020 16:03:15 +0200
Subject: Align diagnostics config with the rest of rust-analyzer

---
 editors/code/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index 429ff5def..f079f73b8 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -592,31 +592,31 @@
                     "default": true,
                     "markdownDescription": "Whether to show experimental rust-analyzer diagnostics that might have more false positives than usual."
                 },
-                "rust-analyzer.diagnostics.warningsAsInfo": {
+                "rust-analyzer.diagnostics.disabled": {
                     "type": "array",
                     "uniqueItems": true,
                     "items": {
                         "type": "string"
                     },
-                    "description": "List of warnings that should be displayed with info severity.\nThe warnings will be indicated by a blue squiggly underline in code and a blue icon in the problems panel.",
+                    "description": "List of rust-analyzer diagnostics to disable",
                     "default": []
                 },
-                "rust-analyzer.diagnostics.warningsAsHint": {
+                "rust-analyzer.diagnostics.warningsAsInfo": {
                     "type": "array",
                     "uniqueItems": true,
                     "items": {
                         "type": "string"
                     },
-                    "description": "List of warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
+                    "description": "List of warnings that should be displayed with info severity.\nThe warnings will be indicated by a blue squiggly underline in code and a blue icon in the problems panel.",
                     "default": []
                 },
-                "rust-analyzer.analysis.disabledDiagnostics": {
+                "rust-analyzer.diagnostics.warningsAsHint": {
                     "type": "array",
                     "uniqueItems": true,
                     "items": {
                         "type": "string"
                     },
-                    "description": "List of rust-analyzer diagnostics to disable",
+                    "description": "List of warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
                     "default": []
                 }
             }
-- 
cgit v1.2.3