Skip to content

Commit 8abf0e6

Browse files
committed
Fix Inefficient results collection in TextSearchResultsCollector
1 parent 7eb5eb5 commit 8abf0e6

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ export class TextSearchResultsCollector {
259259

260260
if (!this._currentFileMatch) {
261261
this._currentFolderIdx = folderIdx;
262+
this._currentUri = data.uri;
262263
this._currentFileMatch = {
263264
resource: data.uri,
264265
results: []

src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,12 @@ flakySuite('TextSearch-integration', function () {
346346
};
347347

348348
return doSearchTest(config, 3).then(results => {
349-
assert.strictEqual(results.length, 3);
349+
assert.strictEqual(results.length, 1);
350+
assert.strictEqual(results[0].results!.length, 3);
350351
assert.strictEqual((<ITextSearchContext>results[0].results![0]).lineNumber, 24);
351352
assert.strictEqual((<ITextSearchContext>results[0].results![0]).text, ' compiler.addUnit(prog,"input.ts");');
352-
// assert.strictEqual((<ITextSearchMatch>results[1].results[0]).preview.text, ' compiler.typeCheck();\n'); // See https://github.com/BurntSushi/ripgrep/issues/1095
353-
assert.strictEqual((<ITextSearchContext>results[2].results![0]).lineNumber, 26);
354-
assert.strictEqual((<ITextSearchContext>results[2].results![0]).text, ' compiler.emit();');
353+
assert.strictEqual((<ITextSearchContext>results[0].results![2]).lineNumber, 26);
354+
assert.strictEqual((<ITextSearchContext>results[0].results![2]).text, ' compiler.emit();');
355355
});
356356
});
357357

0 commit comments

Comments
 (0)