diff --git a/.gitignore b/.gitignore
index 28c53adcd362..6eaf50745af7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -293,13 +293,9 @@ toolchains.json
 lextab.py
 
 # Ignore Visual Studio/Visual Studio Code workspace files.
+# (but the root .vscode directory)
 .vs/
-# lint-ignore-next-line: syntax-difference
-.vscode/
-# lint-ignore-next-line: syntax-difference
-!.vscode/extensions.json
-# lint-ignore-next-line: syntax-difference
-!.vscode/tasks.json
+*/.vscode/
 *.user
 
 # Thunderbird source tree
diff --git a/.hgignore b/.hgignore
index a9d02a34e210..7a596d31e1b1 100644
--- a/.hgignore
+++ b/.hgignore
@@ -289,10 +289,10 @@ tps_result\.json$
 ^lextab\.py$
 
 # Ignore Visual Studio/Visual Studio Code workspace files.
-^\.vs/
-# lint-ignore-next-line: syntax-difference
-^\.vscode/(?!extensions\.json$|tasks\.json$)
-.*\.user$
+# (but the root .vscode directory)
+\.vs/
+.+/\.vscode/
+\.user$
 
 # Thunderbird source tree
 ^comm/