Skip to content

Commit 3f7afc6

Browse files
committed
#57186 - implement previewOptions for findTextInFiles
1 parent fd76ad9 commit 3f7afc6

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -511,12 +511,22 @@ suite('workspace-namespace', () => {
511511
});
512512

513513
test('findTextInFiles', async () => {
514+
const options: vscode.FindTextInFilesOptions = {
515+
include: '*.ts',
516+
previewOptions: {
517+
leadingChars: 2,
518+
maxLines: 1,
519+
totalChars: 100
520+
}
521+
};
522+
514523
const results: vscode.TextSearchResult[] = [];
515-
await vscode.workspace.findTextInFiles({ pattern: 'foo' }, { include: '*.ts' }, result => {
524+
await vscode.workspace.findTextInFiles({ pattern: 'foo' }, options, result => {
516525
results.push(result);
517526
});
518527

519528
assert.equal(results.length, 1);
529+
assert.equal(results[0].preview.text, 'n foo(): void {');
520530
assert.equal(vscode.workspace.asRelativePath(results[0].uri), '10linefile.ts');
521531
});
522532

src/vs/vscode.proposed.d.ts

+2
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ declare module 'vscode' {
260260
* See the vscode setting `"files.encoding"`
261261
*/
262262
encoding?: string;
263+
264+
previewOptions?: TextSearchPreviewOptions;
263265
}
264266

265267
export namespace workspace {

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

+1
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
398398
disregardExcludeSettings: options.exclude === null,
399399
fileEncoding: options.encoding,
400400
maxResults: options.maxResults,
401+
previewOptions: options.previewOptions,
401402

402403
includePattern: options.include && globPatternToString(options.include),
403404
excludePattern: options.exclude && globPatternToString(options.exclude)

src/vs/workbench/parts/search/browser/searchView.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1086,9 +1086,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
10861086
excludePattern,
10871087
includePattern,
10881088
previewOptions: {
1089-
leadingChars: 5,
1089+
leadingChars: 20,
10901090
maxLines: 1,
1091-
totalChars: this.isWide ? 1000 : 100
1091+
totalChars: this.isWide ? 250 : 75
10921092
}
10931093
};
10941094
const folderResources = this.contextService.getWorkspace().folders;

0 commit comments

Comments
 (0)