From 8d32cf50af43e9b8d158be7c52deaab7da7f8c7b Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Tue, 11 Nov 2025 16:51:09 -0800 Subject: [PATCH 1/2] Respect the useIgnoreFiles.local setting in findTextInFiles2 API --- src/vs/workbench/api/common/extHostWorkspace.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts index 9fe77c134e3..bf93cd82ffa 100644 --- a/src/vs/workbench/api/common/extHostWorkspace.ts +++ b/src/vs/workbench/api/common/extHostWorkspace.ts @@ -587,7 +587,9 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac options: { ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined, - disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined, + disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? + !options.useIgnoreFiles : + typeof options.useIgnoreFiles?.local === 'boolean' ? !options.useIgnoreFiles?.local : undefined, disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles?.global : undefined, disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles?.parent : undefined, disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None, From dd2de056c6033a4f5ac55933bae5116fc4a13c53 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Tue, 11 Nov 2025 16:58:11 -0800 Subject: [PATCH 2/2] respect the spec of findTextInFiles2 API --- src/vs/workbench/api/common/extHostWorkspace.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts index bf93cd82ffa..bcc691f7fa4 100644 --- a/src/vs/workbench/api/common/extHostWorkspace.ts +++ b/src/vs/workbench/api/common/extHostWorkspace.ts @@ -587,9 +587,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac options: { ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined, - disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? - !options.useIgnoreFiles : - typeof options.useIgnoreFiles?.local === 'boolean' ? !options.useIgnoreFiles?.local : undefined, + disregardIgnoreFiles: typeof options.useIgnoreFiles?.local === 'boolean' ? !options.useIgnoreFiles?.local : undefined, disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles?.global : undefined, disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles?.parent : undefined, disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,