connections for findTextInFilesNew and FindFiles2New to function (microsoft#223151)

* connections for findTextInFilesNew and FindFiles2New to function

* remove log and fix typos

Author: andreamah

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -107,7 +107,7 @@ import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/c
 import { UIKind } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
 import { checkProposedApiEnabled, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 import { ProxyIdentifier } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { ExcludeSettingOptions, TextSearchCompleteMessageType, TextSearchCompleteMessageTypeNew, TextSearchContextNew, TextSearchMatchNew } from 'vs/workbench/services/search/common/searchExtTypes';
+import { ExcludeSettingOptions, oldToNewTextSearchResult, TextSearchCompleteMessageType, TextSearchCompleteMessageTypeNew, TextSearchContextNew, TextSearchMatchNew } from 'vs/workbench/services/search/common/searchExtTypes';
 import type * as vscode from 'vscode';
 
 export interface IExtensionRegistries {
@@ -973,7 +973,18 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			findFiles2New: (filePattern: vscode.GlobPattern[], options?: vscode.FindFiles2OptionsNew, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> => {
 				checkProposedApiEnabled(extension, 'findFiles2New');
-				return Promise.resolve([]);
+
+				const oldOptions = {
+					exclude: options?.exclude && options.exclude.length > 0 ? options.exclude[0] : undefined,
+					useDefaultExcludes: !options?.useExcludeSettings || (options?.useExcludeSettings === ExcludeSettingOptions.filesExclude || options?.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
+					useDefaultSearchExcludes: !options?.useExcludeSettings || (options?.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
+					maxResults: options?.maxResults,
+					useIgnoreFiles: options?.useIgnoreFiles?.local,
+					useGlobalIgnoreFiles: options?.useIgnoreFiles?.global,
+					useParentIgnoreFiles: options?.useIgnoreFiles?.parent,
+					followSymlinks: options?.followSymlinks,
+				};
+				return extHostWorkspace.findFiles2(filePattern && filePattern.length > 0 ? filePattern[0] : undefined, oldOptions, extension.identifier, token);
 			},
 			findTextInFiles: (query: vscode.TextSearchQuery, optionsOrCallback: vscode.FindTextInFilesOptions | ((result: vscode.TextSearchResult) => void), callbackOrToken?: vscode.CancellationToken | ((result: vscode.TextSearchResult) => void), token?: vscode.CancellationToken) => {
 				checkProposedApiEnabled(extension, 'findTextInFiles');
@@ -993,11 +1004,56 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			findTextInFilesNew: (query: vscode.TextSearchQueryNew, options?: vscode.FindTextInFilesOptionsNew, token?: vscode.CancellationToken): vscode.FindTextInFilesResponse => {
 				checkProposedApiEnabled(extension, 'findTextInFilesNew');
+				checkProposedApiEnabled(extension, 'textSearchProviderNew');
+				let oldOptions = {};
+
+
+				if (options) {
+					oldOptions = {
+						include: options.include && options.include.length > 0 ? options.include[0] : undefined,
+						exclude: options.exclude && options.exclude.length > 0 ? options.exclude[0] : undefined,
+						useDefaultExcludes: options.useExcludeSettings === undefined || (options.useExcludeSettings === ExcludeSettingOptions.filesExclude || options.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
+						useSearchExclude: options.useExcludeSettings === undefined || (options.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
+						maxResults: options.maxResults,
+						useIgnoreFiles: options.useIgnoreFiles?.local,
+						useGlobalIgnoreFiles: options.useIgnoreFiles?.global,
+						useParentIgnoreFiles: options.useIgnoreFiles?.parent,
+						followSymlinks: options.followSymlinks,
+						encoding: options.encoding,
+						previewOptions: options.previewOptions ? {
+							matchLines: options.previewOptions?.matchLines ?? 100,
+							charsPerLine: options.previewOptions?.charsPerLine ?? 10000,
+						} : undefined,
+						beforeContext: options.surroundingContext,
+						afterContext: options.surroundingContext,
+					} satisfies vscode.FindTextInFilesOptions & { useSearchExclude?: boolean };
+				}
+
+				const complete: Promise<undefined | vscode.TextSearchComplete> = Promise.resolve(undefined);
+
+				const asyncIterable = new AsyncIterableObject<vscode.TextSearchResultNew>(async emitter => {
+					const callback = async (result: vscode.TextSearchResult) => {
+						emitter.emitOne(oldToNewTextSearchResult(result));
+						return result;
+					};
+					await complete.then(e => {
+						return extHostWorkspace.findTextInFiles(
+							query,
+							oldOptions,
+							callback,
+							extension.identifier,
+							token
+						);
+					});
+				});
+
 				return {
-					results: AsyncIterableObject.fromArray([]),
-					complete: Promise.resolve({
-						limitHit: false
-					})
+					results: asyncIterable,
+					complete: complete.then((e) => {
+						return {
+							limitHit: e?.limitHit ?? false
+						};
+					}),
 				};
 			},
 			save: (uri) => {

src/vs/workbench/api/common/extHostWorkspace.ts

@@ -522,7 +522,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 			.then(data => Array.isArray(data) ? data.map(d => URI.revive(d)) : []);
 	}
 
-	async findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, extensionId: ExtensionIdentifier, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
+	async findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions & { useSearchExclude?: boolean }, callback: (result: vscode.TextSearchResult) => void, extensionId: ExtensionIdentifier, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
 		this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFiles`);
 
 		const requestId = this._requestIdProvider.getNext();
@@ -543,6 +543,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 			disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
 			disregardParentIgnoreFiles: typeof options.useParentIgnoreFiles === 'boolean' ? !options.useParentIgnoreFiles : undefined,
 			disregardExcludeSettings: typeof options.useDefaultExcludes === 'boolean' ? !options.useDefaultExcludes : true,
+			disregardSearchExcludeSettings: typeof options.useSearchExclude === 'boolean' ? !options.useSearchExclude : true,
 			fileEncoding: options.encoding,
 			maxResults: options.maxResults,
 			previewOptions,

src/vs/workbench/services/search/common/searchExtTypes.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { asArray } from 'vs/base/common/arrays';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { URI } from 'vs/base/common/uri';
 import { IProgress } from 'vs/platform/progress/common/progress';
@@ -501,6 +502,10 @@ export interface FindTextInFilesOptions {
 
 // NEW TYPES
 // added temporarily for testing new API shape
+/**
+ * A result payload for a text search, pertaining to matches within a single file.
+ */
+export type TextSearchResultNew = TextSearchMatchNew | TextSearchContextNew;
 
 /**
  * The main match information for a {@link TextSearchResultNew}.
@@ -555,3 +560,16 @@ export enum TextSearchCompleteMessageTypeNew {
 	Information = 1,
 	Warning = 2,
 }
+
+function isTextSearchMatch(object: any): object is TextSearchMatch {
+	return 'uri' in object && 'ranges' in object && 'preview' in object;
+}
+
+export function oldToNewTextSearchResult(result: TextSearchResult): TextSearchResultNew {
+	if (isTextSearchMatch(result)) {
+		const ranges = asArray(result.ranges).map(r => ({ sourceRange: r, previewRange: r }));
+		return new TextSearchMatchNew(result.uri, ranges, result.preview.text);
+	} else {
+		return new TextSearchContextNew(result.uri, result.text, result.lineNumber);
+	}
+}

src/vscode-dts/vscode.proposed.findFiles2New.d.ts

@@ -10,7 +10,7 @@ declare module 'vscode' {
 		 * A {@link GlobPattern glob pattern} that defines files and folders to exclude. The glob pattern
 		 * will be matched against the file paths of resulting matches relative to their workspace.
 		 */
-		exclude?: GlobPattern;
+		exclude?: GlobPattern[];
 
 		/**
 		 * Which settings to follow when searching for files. Defaults to {@link ExcludeSettingOptions.searchAndFilesExclude}.
@@ -58,17 +58,14 @@ declare module 'vscode' {
 		followSymlinks?: boolean;
 	}
 
-	/**
-	 * Represents a session of a currently logged in user.
-	 */
 	export namespace workspace {
 		/**
 		 * WARNING: VERY EXPERIMENTAL.
 		 *
 		 * Find files across all {@link workspace.workspaceFolders workspace folders} in the workspace.
 		 *
 		 * @example
-		 * findFiles('**​/*.js', {exclude: '**​/out/**', useIgnoreFiles: true, maxResults: 10})
+		 * findFiles(['**​/*.js'], {exclude: ['**​/out/**'], useIgnoreFiles: true, maxResults: 10})
 		 *
 		 * @param filePattern A {@link GlobPattern glob pattern} that defines the files to search for. The glob pattern
 		 * will be matched against the file paths of resulting matches relative to their workspace. Use a {@link RelativePattern relative pattern}

src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts

@@ -7,15 +7,19 @@ declare module 'vscode' {
 
 	// https://github.com/microsoft/vscode/issues/59924
 
-	/**
-	 * Options that can be set on a findTextInFiles search.
-	 */
 	export interface FindTextInFilesOptionsNew {
+		/**
+		 * A {@link GlobPattern glob pattern} that defines the files to search for. The glob pattern
+		 * will be matched against the file paths of files relative to their workspace. Use a {@link RelativePattern relative pattern}
+		 * to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 */
+		include?: GlobPattern[];
+
 		/**
 		 * A {@link GlobPattern glob pattern} that defines files and folders to exclude. The glob pattern
 		 * will be matched against the file paths of resulting matches relative to their workspace.
 		 */
-		exclude?: GlobPattern;
+		exclude?: GlobPattern[];
 
 		/**
 		 * Which settings to follow when searching for files. Defaults to {@link ExcludeSettingOptions.searchAndFilesExclude}.
@@ -63,13 +67,6 @@ declare module 'vscode' {
 		 */
 		followSymlinks?: boolean;
 
-		/**
-		 * A {@link GlobPattern glob pattern} that defines the files to search for. The glob pattern
-		 * will be matched against the file paths of files relative to their workspace. Use a {@link RelativePattern relative pattern}
-		 * to restrict the search results to a {@link WorkspaceFolder workspace folder}.
-		 */
-		include?: GlobPattern;
-
 		/**
 		 * Interpret files using this encoding.
 		 * See the vscode setting `"files.encoding"`

src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts

@@ -95,11 +95,13 @@ declare module 'vscode' {
 			/**
 			 * The maximum number of lines in the preview.
 			 * Only search providers that support multiline search will ever return more than one line in the match.
+			 * Defaults to 100.
 			 */
 			matchLines: number;
 
 			/**
 			 * The maximum number of characters included per line.
+			 * Defaults to 10000.
 			 */
 			charsPerLine: number;
 		};