diff --git a/.gitattributes b/.gitattributes
index b9692ea318..f174a452ba 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,5 @@ contrib/opbot/generated/* linguist-generated
 # svg should be treated as a binary https://git.io/JE2VK
 *.svg    binary
 *.sol linguist-language=Solidity
+
+.vscode/*.json linguist-language=jsonc
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 314ccdaafc..a8ce065553 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,6 +28,11 @@ jobs:
         with:
           pattern: '.github/renovate.json' # Regular expression for filename to validate, default to *.json
 
+      - name: jsonc-syntax-check
+        uses: stevieb9/jsonc-syntax-check@1.02
+        with:
+          pattern: .vscode/*.json'
+
 
       - name: yaml-lint
         uses: ibiqlik/action-yamllint@v3
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index ed6dcf8a9c..f4c5b85cb0 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,12 +1,19 @@
 {
+    // This file (like all vscode metadata files) uses JSON with Comments (JSONC) format, which supports:
+    // - Comments (both single and multi-line)
+    // - Trailing commas
+    // - More lenient syntax than standard JSON
+
     // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
     // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-  
+
     // List of extensions which should be recommended for users of this workspace.
     "recommendations": [
       "dbaeumer.vscode-eslint",
       "editorconfig.editorconfig",
       "juanblanco.solidity",
       "golang.go",
+      "bierner.markdown-mermaid",
+      "bpruitt-goddard.mermaid-markdown-syntax-highlighting",
     ],
-  }
\ No newline at end of file
+  }