From fd76ad9f002825b9d3d5b659c2fe7916959da27e Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Sat, 25 Aug 2018 11:21:40 -0700 Subject: [PATCH] #57186 - fix findTextInFiles --- .../src/singlefolder-tests/workspace.test.ts | 2 +- src/vs/workbench/api/node/extHostWorkspace.ts | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts index ff1de333dff..41305d076b2 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts @@ -510,7 +510,7 @@ suite('workspace-namespace', () => { }); }); - test.skip('findTextInFiles', async () => { + test('findTextInFiles', async () => { const results: vscode.TextSearchResult[] = []; await vscode.workspace.findTextInFiles({ pattern: 'foo' }, { include: '*.ts' }, result => { results.push(result); diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts index b4ec5af0c5a..f115f45be43 100644 --- a/src/vs/workbench/api/node/extHostWorkspace.ts +++ b/src/vs/workbench/api/node/extHostWorkspace.ts @@ -151,7 +151,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape { readonly onDidChangeWorkspace: Event = this._onDidChangeWorkspace.event; - private readonly _activeSearchCallbacks = []; + private readonly _activeSearchCallbacks: ((match: IRawFileMatch2) => any)[] = []; constructor( mainContext: IMainContext, @@ -410,14 +410,14 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape { return; } - p.lineMatches.forEach(lineMatch => { - lineMatch.offsetAndLengths.forEach(offsetAndLength => { - const range = new Range(lineMatch.lineNumber, offsetAndLength[0], lineMatch.lineNumber, offsetAndLength[0] + offsetAndLength[1]); - callback({ - uri: URI.revive(p.resource), - preview: { text: lineMatch.preview, match: range }, - range - }); + p.matches.forEach(match => { + callback({ + uri: URI.revive(p.resource), + preview: { + text: match.preview.text, + match: new Range(match.preview.match.startLineNumber, match.preview.match.startColumn, match.preview.match.endLineNumber, match.preview.match.endColumn) + }, + range: new Range(match.range.startLineNumber, match.range.startColumn, match.range.endLineNumber, match.range.endColumn) }); }); }; -- GitLab