maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pass results limit (fixes #15778)

Browse source
This commit is contained in:
Christof Marti 2017-04-28 11:03:17 -07:00 committed by chrmarti
parent 2def4bcaeb
commit 0bec115779
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/workbench/parts/search/common/searchModel.ts
View file

@ -120,7 +120,7 @@ export class FileMatch extends Disposable {
private _updateScheduler: RunOnceScheduler;
private _modelDecorations: string[] = [];
constructor(private _query: IPatternInfo, private _parent: SearchResult, private rawMatch: IFileMatch,
constructor(private _query: IPatternInfo, private _maxResults: number, private _parent: SearchResult, private rawMatch: IFileMatch,
@IModelService private modelService: IModelService, @IReplaceService private replaceService: IReplaceService) {
super();
this._resource = this.rawMatch.resource;
@ -187,7 +187,7 @@ export class FileMatch extends Disposable {
}
this._matches = new LinkedMap<string, Match>();
let matches = this._model
.findMatches(this._query.pattern, this._model.getFullModelRange(), this._query.isRegExp, this._query.isCaseSensitive, this._query.isWordMatch, false);
.findMatches(this._query.pattern, this._model.getFullModelRange(), this._query.isRegExp, this._query.isCaseSensitive, this._query.isWordMatch, false, this._maxResults);
this.updateMatches(matches, true);
}
@ -202,7 +202,7 @@ export class FileMatch extends Disposable {
const oldMatches = this._matches.values().filter(match => match.range().startLineNumber === lineNumber);
oldMatches.forEach(match => this._matches.delete(match.id()));
const matches = this._model.findMatches(this._query.pattern, range, this._query.isRegExp, this._query.isCaseSensitive, this._query.isWordMatch, false);
const matches = this._model.findMatches(this._query.pattern, range, this._query.isRegExp, this._query.isCaseSensitive, this._query.isWordMatch, false, this._maxResults);
this.updateMatches(matches, modelChange);
}
@ -330,6 +330,7 @@ export class SearchResult extends Disposable {
private _fileMatches: LinkedMap<URI, FileMatch>;
private _unDisposedFileMatches: LinkedMap<URI, FileMatch>;
private _query: IPatternInfo = null;
private _maxResults: number;
private _showHighlights: boolean;
private _replacingAll: boolean = false;
@ -347,6 +348,10 @@ export class SearchResult extends Disposable {
this._query = query;
}
public set maxResults(maxResults: number) {
this._maxResults = maxResults;
}
public get searchModel(): SearchModel {
return this._searchModel;
}
@ -355,7 +360,7 @@ export class SearchResult extends Disposable {
let changed: FileMatch[] = [];
raw.forEach((rawFileMatch) => {
if (!this._fileMatches.has(rawFileMatch.resource)) {
let fileMatch = this.instantiationService.createInstance(FileMatch, this._query, this, rawFileMatch);
let fileMatch = this.instantiationService.createInstance(FileMatch, this._query, this._maxResults, this, rawFileMatch);
this.doAdd(fileMatch);
changed.push(fileMatch);
let disposable = fileMatch.onChange(() => this.onFileChange(fileMatch));
@ -550,6 +555,7 @@ export class SearchModel extends Disposable {
this.searchResult.clear();
this._searchResult.query = this._searchQuery.contentPattern;
this._searchResult.maxResults = this._searchQuery.maxResults;
this._replacePattern = new ReplacePattern(this._replaceString, this._searchQuery.contentPattern);
const onDone = fromPromise(this.currentRequest);

2
src/vs/workbench/parts/search/test/browser/searchActions.test.ts
View file

@ -131,7 +131,7 @@ suite('Search Actions', () => {
resource: URI.file('somepath' + ++counter),
lineMatches: []
};
return instantiationService.createInstance(FileMatch, null, null, rawMatch);
return instantiationService.createInstance(FileMatch, null, null, null, rawMatch);
}
function aMatch(fileMatch: FileMatch): Match {

2
src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts
View file

@ -69,7 +69,7 @@ suite('Search - Viewlet', () => {
resource: uri.file('C:\\' + path),
lineMatches: lineMatches
};
return instantiation.createInstance(FileMatch, null, searchResult, rawMatch);
return instantiation.createInstance(FileMatch, null, null, searchResult, rawMatch);
}
function stubModelService(instantiationService: TestInstantiationService): IModelService {

2
src/vs/workbench/parts/search/test/common/searchResult.test.ts
View file

@ -363,7 +363,7 @@ suite('SearchResult', () => {
resource: URI.file('/' + path),
lineMatches: lineMatches
};
return instantiationService.createInstance(FileMatch, null, searchResult, rawMatch);
return instantiationService.createInstance(FileMatch, null, null, searchResult, rawMatch);
}
function aSearchResult(): SearchResult {