Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-21 22:34:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

watcher - respect workspace settings when resolving files.watcherExclude

Browse Source
This commit is contained in:
Benjamin Pasero
2024-09-18 10:07:16 +02:00
committed by Benjamin Pasero
parent 46c3cc46a1
commit bb9beecbb1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/common/extHostFileSystemEventService.ts
+6 -5
View File
@@ -166,7 +166,8 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
// recursively to give users a chance to configure exclude rules
// for reducing the overhead of watching recursively
if (recursive && excludes.length === 0) {
const watcherExcludes = configuration.getConfiguration().get<IGlobPatterns>('files.watcherExclude');
const workspaceFolder = workspace.getWorkspaceFolder(URI.revive(globPattern.baseUri));
const watcherExcludes = configuration.getConfiguration('files', workspaceFolder).get<IGlobPatterns>('watcherExclude');
if (watcherExcludes) {
for (const key in watcherExcludes) {
if (key && watcherExcludes[key] === true) {
@@ -188,9 +189,9 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
// `bar` unless a suffix of `/**` if added.
// (https://github.com/microsoft/vscode/issues/148245)
else if (!recursive) {
const workspaceUri = workspace.getWorkspaceFolder(URI.revive(globPattern.baseUri))?.uri;
if (workspaceUri) {
const watcherExcludes = configuration.getConfiguration().get<IGlobPatterns>('files.watcherExclude');
const workspaceFolder = workspace.getWorkspaceFolder(URI.revive(globPattern.baseUri));
if (workspaceFolder) {
const watcherExcludes = configuration.getConfiguration('files', workspaceFolder).get<IGlobPatterns>('watcherExclude');
if (watcherExcludes) {
for (const key in watcherExcludes) {
if (key && watcherExcludes[key] === true) {
@@ -199,7 +200,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
includes = [];
}
includes.push(normalizeWatcherPattern(workspaceUri.fsPath, includePattern));
includes.push(normalizeWatcherPattern(workspaceFolder.uri.fsPath, includePattern));
}
}
}