diff --git a/.gitignore b/.gitignore
index c5fae8527c..823d39ed5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,7 +111,8 @@ GRTAGS
 GTAGS
 *.apj
 .gdbinit
-/.vscode
+.vscode/*
+!.vscode/extensions.json
 /.history
 Parameters.html
 Parameters.md
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index e9cd876a0b..0f7789aa84 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,5 +1,6 @@
 {
     "recommendations": [
+        "bierner.markdown-mermaid",
         "ms-vscode.cpptools",
         "sumneko.lua",
         "ms-python.python",