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')

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')

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 951fc3f65ac023ef61d3a447399e1432e38700fa Mon Sep 17 00:00:00 2001
From: xiaofa <xiaofalzx@gmail.com>
Date: Sun, 16 Aug 2020 23:28:26 +0800
Subject: Fix eslint errors on .eslintrc.js and rollup.config.js

---
 editors/code/.eslintignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 editors/code/.eslintignore

(limited to 'editors')

diff --git a/editors/code/.eslintignore b/editors/code/.eslintignore
new file mode 100644
index 000000000..3df5c860b
--- /dev/null
+++ b/editors/code/.eslintignore
@@ -0,0 +1,3 @@
+node_modules
+.eslintrc.js
+rollup.config.js
\ No newline at end of file
-- 
cgit v1.2.3


From 1eed036a6e68aee6128d099e3a8f2c06a90b846b Mon Sep 17 00:00:00 2001
From: vsrs <vit@conrlab.com>
Date: Mon, 17 Aug 2020 14:56:27 +0300
Subject: Fix StatusNotification

---
 editors/code/src/ctx.ts     | 2 +-
 editors/code/src/lsp_ext.ts | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'editors')

diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 6e767babf..543f7e02e 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -36,7 +36,7 @@ export class Ctx {
 
         res.pushCleanup(client.start());
         await client.onReady();
-        client.onNotification(ra.status, (status) => res.setStatus(status));
+        client.onNotification(ra.status, (params) => res.setStatus(params.status));
         return res;
     }
 
diff --git a/editors/code/src/lsp_ext.ts b/editors/code/src/lsp_ext.ts
index 494d51c83..8663737a6 100644
--- a/editors/code/src/lsp_ext.ts
+++ b/editors/code/src/lsp_ext.ts
@@ -8,7 +8,10 @@ export const analyzerStatus = new lc.RequestType<null, string, void>("rust-analy
 export const memoryUsage = new lc.RequestType<null, string, void>("rust-analyzer/memoryUsage");
 
 export type Status = "loading" | "ready" | "invalid" | "needsReload";
-export const status = new lc.NotificationType<Status>("rust-analyzer/status");
+export interface StatusParams {
+    status: Status;
+}
+export const status = new lc.NotificationType<StatusParams>("rust-analyzer/status");
 
 export const reloadWorkspace = new lc.RequestType<null, null, void>("rust-analyzer/reloadWorkspace");
 
-- 
cgit v1.2.3