Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

markersModel: use hasFilters to check for filter

Browse Source
This commit is contained in:
Sandeep Somavarapu
2016-09-20 19:52:59 +02:00
parent 53f524a567
commit 4e1722522d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/parts/markers/common/markersModel.ts
View File

@@ -220,17 +220,17 @@ export class MarkersModel {
for (let i = 0; i < entry.value.length; i++) {
const m = entry.value[i];
const uri = entry.key.toString();
if (!this._filterOptions.filter || this.filterMarker(m)) {
if (!this._filterOptions.hasFilters() || this.filterMarker(m)) {
markers.push(this.toMarker(m, i, uri));
}
}
const matches = this._filterOptions.filter ? FilterOptions._filter(this._filterOptions.filter, paths.basename(entry.key.fsPath)) : [];
const matches = this._filterOptions.hasFilters() ? FilterOptions._filter(this._filterOptions.filter, paths.basename(entry.key.fsPath)) : [];
return new Resource(entry.key, markers, this.getStatistics(entry.value), matches || []);
}
private toMarker(marker: IMarker, index: number, uri: string): Marker {
const labelMatches = this._filterOptions.filter ? FilterOptions._fuzzyFilter(this._filterOptions.filter, marker.message) : [];
const sourceMatches = marker.source && this._filterOptions.filter ? FilterOptions._filter(this._filterOptions.filter, marker.source) : [];
const labelMatches = this._filterOptions.hasFilters() ? FilterOptions._fuzzyFilter(this._filterOptions.filter, marker.message) : [];
const sourceMatches = marker.source && this._filterOptions.hasFilters() ? FilterOptions._filter(this._filterOptions.filter, marker.source) : [];
return new Marker(uri + index, marker, labelMatches || [], sourceMatches || []);
}