From ea81c15e558ad9f9fbd433d847d5e1811ec057da Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Tue, 18 Aug 2020 11:39:45 +0200
Subject: [PATCH 1/4] Rename rust-icon.png to just icon.png

---
 rust-icon.png => icon.png | Bin
 package.json              |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename rust-icon.png => icon.png (100%)

diff --git a/rust-icon.png b/icon.png
similarity index 100%
rename from rust-icon.png
rename to icon.png
diff --git a/package.json b/package.json
index 42baed29..6f3f7244 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "description": "Rust for Visual Studio Code (powered by Rust Language Server/Rust Analyzer). Provides lints, code completion and navigation, formatting and more.",
     "version": "0.7.8",
     "publisher": "rust-lang",
-    "icon": "rust-icon.png",
+    "icon": "icon.png",
     "galleryBanner": {
         "color": "#336356",
         "theme": "dark"

From 96b7528c64e771f4b66971d2e787fe92c7629ea0 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Tue, 18 Aug 2020 16:50:36 +0200
Subject: [PATCH 2/4] Setup prettier to work recursively for all TS files

---
 .prettierignore | 7 ++++++-
 package.json    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index ad17a14e..812c3232 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,7 @@
 # FIXME: Only ignore the pending changes to be merged into this extension
-rust-analyzer/
+/rust-analyzer
+
+# From .gitignore
+out
+node_modules
+.vscode-test
diff --git a/package.json b/package.json
index 6f3f7244..d380eaf0 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
         "watch": "tsc -watch -p ./",
         "lint": "eslint --ext ts src",
         "test": "node ./out/test/runTest.js",
-        "prettier": "prettier **/*.ts",
+        "prettier": "prettier '**/*.ts'",
         "check:version": "node cmd/check-version.js",
         "installDevExtension": "npm install && ./node_modules/.bin/vsce package -o ./out/rls-vscode-dev.vsix && code --install-extension ./out/rls-vscode-dev.vsix"
     },

From 90a99fa7ca33748c0e3ce2e443a542d38d2df4cd Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Wed, 19 Aug 2020 22:13:18 +0200
Subject: [PATCH 3/4] Fix prettier glob for Windows

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

diff --git a/package.json b/package.json
index d380eaf0..ff858f4a 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
         "watch": "tsc -watch -p ./",
         "lint": "eslint --ext ts src",
         "test": "node ./out/test/runTest.js",
-        "prettier": "prettier '**/*.ts'",
+        "prettier": "prettier \"**/*.ts\"",
         "check:version": "node cmd/check-version.js",
         "installDevExtension": "npm install && ./node_modules/.bin/vsce package -o ./out/rls-vscode-dev.vsix && code --install-extension ./out/rls-vscode-dev.vsix"
     },

From 23a0b5fa1066ed675dbc6b92df4d15b6fcd806f8 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Tue, 18 Aug 2020 17:07:31 +0200
Subject: [PATCH 4/4] Degrade ESLint no-unused-vars lint to warning

---
 .eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 82a0c9e4..227b627e 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -18,7 +18,7 @@
     "plugins": ["@typescript-eslint"],
     "rules": {
         "@typescript-eslint/no-unused-vars": [
-            "error",
+            "warn",
             {
                 "argsIgnorePattern": "^_"
             }