From 4c943378f87e6f6b77e489cf50a0fe75ca067dd7 Mon Sep 17 00:00:00 2001
From: Scott Mabin <scott@mabez.dev>
Date: Tue, 2 Aug 2022 17:30:50 +0100
Subject: [PATCH] Use vscode multi-root ws for esp-hal

---
 esp-hal-common/.vscode/esp32.settings.json   | 23 ---------------
 esp-hal-common/.vscode/esp32c3.settings.json | 23 ---------------
 esp-hal-common/.vscode/esp32s2.settings.json | 23 ---------------
 esp-hal-common/.vscode/esp32s3.settings.json | 23 ---------------
 esp-hal.code-workspace                       | 31 ++++++++++++++++++++
 5 files changed, 31 insertions(+), 92 deletions(-)
 delete mode 100644 esp-hal-common/.vscode/esp32.settings.json
 delete mode 100644 esp-hal-common/.vscode/esp32c3.settings.json
 delete mode 100644 esp-hal-common/.vscode/esp32s2.settings.json
 delete mode 100644 esp-hal-common/.vscode/esp32s3.settings.json
 create mode 100644 esp-hal.code-workspace

diff --git a/esp-hal-common/.vscode/esp32.settings.json b/esp-hal-common/.vscode/esp32.settings.json
deleted file mode 100644
index 0aab4bf5533..00000000000
--- a/esp-hal-common/.vscode/esp32.settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "rust-analyzer.cargo.features": [
-        "esp32"
-    ],
-    "rust-analyzer.cargo.allFeatures": false,
-    "editor.formatOnSave": false,
-    "rust-analyzer.checkOnSave.allTargets": true,
-    "rust-analyzer.checkOnSave.allFeatures": false,
-    "rust-analyzer.checkOnSave.overrideCommand": [
-        "cargo",
-        "check",
-        "--features",
-        "esp32",
-        "--message-format=json",
-        "-Z",
-        "build-std=core",
-        "--target",
-        "xtensa-esp32-none-elf",
-        "--examples",
-        "--lib",
-    ],
-    "rust-analyzer.cargo.buildScripts.enable": false
-}
\ No newline at end of file
diff --git a/esp-hal-common/.vscode/esp32c3.settings.json b/esp-hal-common/.vscode/esp32c3.settings.json
deleted file mode 100644
index 3864e3c46b6..00000000000
--- a/esp-hal-common/.vscode/esp32c3.settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "rust-analyzer.cargo.features": [
-        "esp32c3"
-    ],
-    "rust-analyzer.cargo.allFeatures": false,
-    "editor.formatOnSave": true,
-    "rust-analyzer.checkOnSave.allTargets": true,
-    "rust-analyzer.checkOnSave.allFeatures": false,
-    "rust-analyzer.checkOnSave.overrideCommand": [
-        "cargo",
-        "check",
-        "--features",
-        "esp32c3",
-        "--message-format=json",
-        "-Z",
-        "build-std=core",
-        "--target",
-        "riscv32imc-unknown-none-elf",
-        "--examples",
-        "--lib",
-    ],
-    "rust-analyzer.cargo.buildScripts.enable": false
-}
\ No newline at end of file
diff --git a/esp-hal-common/.vscode/esp32s2.settings.json b/esp-hal-common/.vscode/esp32s2.settings.json
deleted file mode 100644
index 5c7e60350e8..00000000000
--- a/esp-hal-common/.vscode/esp32s2.settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "rust-analyzer.cargo.features": [
-        "esp32s2"
-    ],
-    "rust-analyzer.cargo.allFeatures": false,
-    "editor.formatOnSave": false,
-    "rust-analyzer.checkOnSave.allTargets": true,
-    "rust-analyzer.checkOnSave.allFeatures": false,
-    "rust-analyzer.checkOnSave.overrideCommand": [
-        "cargo",
-        "check",
-        "--features",
-        "esp32s2",
-        "--message-format=json",
-        "-Z",
-        "build-std=core",
-        "--target",
-        "xtensa-esp32s2-none-elf",
-        "--examples",
-        "--lib",
-    ],
-    "rust-analyzer.cargo.buildScripts.enable": false
-}
\ No newline at end of file
diff --git a/esp-hal-common/.vscode/esp32s3.settings.json b/esp-hal-common/.vscode/esp32s3.settings.json
deleted file mode 100644
index 13b90a45be1..00000000000
--- a/esp-hal-common/.vscode/esp32s3.settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "rust-analyzer.cargo.features": [
-        "esp32s3"
-    ],
-    "rust-analyzer.cargo.allFeatures": false,
-    "editor.formatOnSave": false,
-    "rust-analyzer.checkOnSave.allTargets": true,
-    "rust-analyzer.checkOnSave.allFeatures": false,
-    "rust-analyzer.checkOnSave.overrideCommand": [
-        "cargo",
-        "check",
-        "--features",
-        "esp32s3",
-        "--message-format=json",
-        "-Z",
-        "build-std=core",
-        "--target",
-        "xtensa-esp32s3-none-elf",
-        "--examples",
-        "--lib",
-    ],
-    "rust-analyzer.cargo.buildScripts.enable": false
-}
\ No newline at end of file
diff --git a/esp-hal.code-workspace b/esp-hal.code-workspace
new file mode 100644
index 00000000000..03dfeaf5b36
--- /dev/null
+++ b/esp-hal.code-workspace
@@ -0,0 +1,31 @@
+{
+	"folders": [
+		{
+			"path": "esp-hal-common"
+		},
+		{
+			"path": "esp32-hal"
+		},
+		{
+			"path": "esp32c3-hal"
+		},
+		{
+			"path": "esp32s2-hal"
+		},
+		{
+			"path": "esp32s3-hal"
+		},
+		{
+			"path": "esp-hal-procmacros"
+		}
+	],
+	"settings": {
+		"editor.formatOnSave": true,
+		"rust-analyzer.checkOnSave.allTargets": false,
+		"rust-analyzer.imports.granularity.enforce": true,
+		"rust-analyzer.imports.granularity.group": "crate",
+		"rust-analyzer.cargo.buildScripts.enable": true,
+		"rust-analyzer.procMacro.attributes.enable": true,
+		"rust-analyzer.procMacro.enable": true,
+	}
+}
\ No newline at end of file