From 12b373f1ab51880f7b45731482f13a7edafaabaa Mon Sep 17 00:00:00 2001
From: Paul Kupper <11900073+pkupper@users.noreply.github.com>
Date: Sun, 4 Jul 2021 22:29:50 +0200
Subject: [PATCH] Don't use ESLint formatter for Rust files in VS Code (#228)

* Remove default formatter from vscode settings

* Only use eslint formatter on js/ts/json/vue files
---
 .vscode/settings.json | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 343c7b77..393af365 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,30 +3,20 @@
 		"editor.formatOnSave": true,
 		"editor.formatOnPaste": true
 	},
-	"[vue]": {
-		"editor.codeActionsOnSave": { "source.fixAll.eslint": true },
+	"[typescript, javascript, json, vue]": {
+		"editor.codeActionsOnSave": {
+			"source.fixAll.eslint": true
+		},
 		"editor.formatOnSave": true,
+		"editor.defaultFormatter": "dbaeumer.vscode-eslint",
 	},
-	"[javascript]": {
-		"editor.codeActionsOnSave": { "source.fixAll.eslint": true },
-		"editor.formatOnSave": true,
-	},
-	"[json]": {
-		"editor.codeActionsOnSave": { "source.fixAll.eslint": true },
-		"editor.formatOnSave": true,
-	},
-	"[typescript, json]": {
-		"editor.codeActionsOnSave": { "source.fixAll.eslint": true },
-		"editor.formatOnSave": true,
-	},
-	"rust-analyzer.diagnostics.disabled": [
-		"missing-unsafe" // Remove when rust-analyzer bug fixes unsafe code on WASM JavaScript https://github.com/rust-analyzer/rust-analyzer/issues/5412
-	],
+	"rust-analyzer.experimental.procAttrMacros": true,
 	"files.eol": "\n",
 	"html.format.wrapLineLength": 200,
-	"editor.defaultFormatter": "dbaeumer.vscode-eslint",
 	"eslint.format.enable": true,
-	"eslint.workingDirectories": ["./client/web"],
+	"eslint.workingDirectories": [
+		"./client/web"
+	],
 	"eslint.validate": [
 		"javascript",
 		"typescript",