Merge pull request microsoft#95653 from jeanp413/fix-95461

sandy081 · web-flow · commit 28f838bb9eed · 2020-04-24T12:30:42.000+02:00
Update markersViewModel on MarkersView construction
diff --git a/src/vs/workbench/contrib/markers/browser/markersView.ts b/src/vs/workbench/contrib/markers/browser/markersView.ts
@@ -114,8 +114,16 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
 		this.smallLayoutContextKey = Constants.MarkersViewSmallLayoutContextKey.bindTo(this.contextKeyService);
 		this.panelState = new Memento(Constants.MARKERS_VIEW_STORAGE_ID, storageService).getMemento(StorageScope.WORKSPACE);
+
 		this.markersViewModel = this._register(instantiationService.createInstance(MarkersViewModel, this.panelState['multiline']));
+		const resourceMarkers = this.markersWorkbenchService.markersModel.resourceMarkers;
+		for (const resourceMarker of resourceMarkers) {
+			for (const marker of resourceMarker.markers) {
+				this.markersViewModel.add(marker);
+			}
+		}
 		this._register(this.markersViewModel.onDidChange(marker => this.onDidChangeViewState(marker)));
+
 		this.setCurrentActiveEditor();
 
 		this.filter = new Filter(new FilterOptions());
