From 72335278a3e1b9ebcab4d526ec6b64cbad0770bc Mon Sep 17 00:00:00 2001
From: Sergio Gasquez Arcos <sergio.gasquez@gmail.com>
Date: Wed, 12 Feb 2025 08:31:57 +0100
Subject: [PATCH] Update devcontainer extensions (#111)

* feat: Update devcontainer extensions

* docs: Update changelog

* feat: Remove more extensions

* feat: Add extension.json

* feat: Duplicate ra settings for devcontainers
---
 CHANGELOG.md                             |  2 +-
 template/.devcontainer/devcontainer.json | 26 ++++++++++++++++--------
 template/.vscode/extensions.json         | 11 ++++++++++
 3 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 template/.vscode/extensions.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5217041..7aa5ad0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Options can now declare negative requirements (e.g. `!alloc` can not be enabled if `alloc` is used) (#101)
 - Template settings are now described in a template-specific `yaml` file (#103)
 - Test cases are now generated from template settings (#106)
-- Migrated deprecated `serayuzgur.crates` to `fill-labs.dependi` vscode extension in devcontainer config
+- Updated and removed some unused extensions (#109, #111)
 
 ### Fixed
 
diff --git a/template/.devcontainer/devcontainer.json b/template/.devcontainer/devcontainer.json
index 16d9184..efb740e 100644
--- a/template/.devcontainer/devcontainer.json
+++ b/template/.devcontainer/devcontainer.json
@@ -25,8 +25,20 @@
         "files.watcherExclude": {
           "**/target/**": true
         },
-        "rust-analyzer.checkOnSave.command": "clippy",
-        "rust-analyzer.checkOnSave.allTargets": false,
+        "rust-analyzer.cargo.allTargets": false,
+        //REPLACE riscv32imac-unknown-none-elf rust_target
+        "rust-analyzer.cargo.target": "riscv32imac-unknown-none-elf",
+        //IF option("xtensa")
+        "rust-analyzer.server.extraEnv": {
+          "RUSTUP_TOOLCHAIN": "stable"
+        },
+        "rust-analyzer.check.extraEnv": {
+          "RUSTUP_TOOLCHAIN": "esp"
+        },
+        "rust-analyzer.cargo.extraEnv": {
+          "RUSTUP_TOOLCHAIN": "esp"
+        },
+        //ENDIF
         "[rust]": {
           "editor.defaultFormatter": "rust-lang.rust-analyzer"
         }
@@ -34,12 +46,10 @@
       "extensions": [
         "rust-lang.rust-analyzer",
         "tamasfe.even-better-toml",
-        "fill-labs.dependi",
-        "mutantdino.resourcemonitor",
-        "yzhang.markdown-all-in-one",
-        "ms-vscode.cpptools",
-        "actboy168.tasks",
-        "Wokwi.wokwi-vscode"
+        //IF option("wokwi")
+        "Wokwi.wokwi-vscode",
+        //ENDIF
+        "fill-labs.dependi"
       ]
     }
   },
diff --git a/template/.vscode/extensions.json b/template/.vscode/extensions.json
new file mode 100644
index 0000000..0f0856f
--- /dev/null
+++ b/template/.vscode/extensions.json
@@ -0,0 +1,11 @@
+//INCLUDEFILE vscode
+{
+    "recommendations": [
+        "rust-lang.rust-analyzer",
+        "tamasfe.even-better-toml",
+        //IF option("wokwi")
+        "Wokwi.wokwi-vscode",
+        //ENDIF
+        "fill-labs.dependi"
+    ]
+}