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

make sure model data is removed before changing markers, fixes #13513

Browse Source
This commit is contained in:
Johannes Rieken
2016-10-26 11:22:56 +02:00
parent db09b30cbe
commit 215c74ea2b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/common/services/modelServiceImpl.ts
+5 -6
View File
@@ -61,10 +61,10 @@ class ModelData implements IDisposable {
class ModelMarkerHandler {
public static setMarkers(modelData: ModelData, markers: IMarker[]): void {
public static setMarkers(modelData: ModelData, markerService: IMarkerService): void {
// Limit to the first 500 errors/warnings
markers = markers.slice(0, 500);
const markers = markerService.read({ resource: modelData.model.uri, take: 500 });
let newModelDecorations: editorCommon.IModelDeltaDecoration[] = markers.map((marker) => {
return {
@@ -327,7 +327,7 @@ export class ModelServiceImpl implements IModelService {
if (!modelData) {
return;
}
ModelMarkerHandler.setMarkers(modelData, this._markerService.read({ resource: resource, take: 500 }));
ModelMarkerHandler.setMarkers(modelData, this._markerService);
});
}
@@ -377,7 +377,7 @@ export class ModelServiceImpl implements IModelService {
// handle markers (marker service => model)
if (this._markerService) {
ModelMarkerHandler.setMarkers(modelData, this._markerService.read({ resource: modelData.model.uri }));
ModelMarkerHandler.setMarkers(modelData, this._markerService);
}
this._onModelAdded.fire(modelData.model);
@@ -448,11 +448,10 @@ export class ModelServiceImpl implements IModelService {
let modelId = MODEL_ID(model.uri);
let modelData = this._models[modelId];
this._cleanUp(model);
delete this._models[modelId];
modelData.dispose();
this._cleanUp(model);
this._onModelRemoved.fire(model);
}