From 7bb19b134e9c58b84347f0277544b2b1998ef637 Mon Sep 17 00:00:00 2001
From: Pierre-Yves David <pierre-yves.david@octobus.net>
Date: Thu, 2 May 2024 18:26:11 +0000
Subject: [PATCH] Bug 1894617: ignore the root .vscode directory too; r=sheehan

It looks like I misunderstood what the original rules meant and all content of
all `.vscode` directory should be ignored, but for the `.vscode/extensions.json`
and `.vscode/tasks.json` files. Since these file are already tracked, they don't
need a dedicated ignore rules. However other files does (e.g
`.vscode/settings.json`, `.vscode/launch.json`, etc).

So we remove the exception for the root `.vscode` directory.

This is a follow up to 4952395ba0ec.

Differential Revision: https://phabricator.services.mozilla.com/D209260
---
 .gitignore | 3 +--
 .hgignore  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5fec67ea842f..05c1009eb5e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -289,9 +289,8 @@ toolchains.json
 lextab.py
 
 # Ignore Visual Studio/Visual Studio Code workspace files.
-# (but the root .vscode directory)
 .vs/
-*/.vscode/
+.vscode/
 *.user
 
 # Thunderbird source tree
diff --git a/.hgignore b/.hgignore
index 5bdfb43a1c51..893202a6b224 100644
--- a/.hgignore
+++ b/.hgignore
@@ -289,9 +289,8 @@ tps_result\.json$
 ^lextab\.py$
 
 # Ignore Visual Studio/Visual Studio Code workspace files.
-# (but the root .vscode directory)
 \.vs/
-.+/\.vscode/
+\.vscode/
 \.user$
 
 # Thunderbird source tree