Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix search tests after strictPropInit

Browse Source
This commit is contained in:
Rob Lourens
2019-09-03 15:31:44 -07:00
parent e8fc7db0d1
commit 109add76da
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/search/node/fileSearch.ts
+3 -1
View File
@@ -318,7 +318,9 @@ export class FileWalker {
if (err || last) {
onData = () => { };
this.cmdSW!.stop();
if (this.cmdSW) {
this.cmdSW.stop();
}
}
cb(err, stdout, last);
};
src/vs/workbench/services/search/node/textSearchManager.ts
+3 -1
View File
@@ -7,6 +7,7 @@ import * as path from 'vs/base/common/path';
import { mapArrayOrNot } from 'vs/base/common/arrays';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { toErrorMessage } from 'vs/base/common/errorMessage';
import * as resources from 'vs/base/common/resources';
import * as glob from 'vs/base/common/glob';
import { URI } from 'vs/base/common/uri';
import { toCanonicalName } from 'vs/base/node/encoding';
@@ -198,6 +199,7 @@ export class TextSearchResultsCollector {
private _batchedCollector: BatchedCollector<IFileMatch>;
private _currentFolderIdx: number = -1;
private _currentUri: URI;
private _currentFileMatch: IFileMatch | null = null;
constructor(private _onResult: (result: IFileMatch[]) => void) {
@@ -208,7 +210,7 @@ export class TextSearchResultsCollector {
// Collects TextSearchResults into IInternalFileMatches and collates using BatchedCollector.
// This is efficient for ripgrep which sends results back one file at a time. It wouldn't be efficient for other search
// providers that send results in random order. We could do this step afterwards instead.
if (this._currentFileMatch && this._currentFolderIdx !== folderIdx) {
if (this._currentFileMatch && (this._currentFolderIdx !== folderIdx || !resources.isEqual(this._currentUri, data.uri))) {
this.pushToCollector();
this._currentFileMatch = null;
}