From d0f56d899399ffa634b3042fcafd6b71d711ba3a Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 1 Apr 2019 12:59:05 +0200
Subject: [PATCH] Fix #16099

---
 src/vs/workbench/contrib/markers/browser/markersModel.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/markers/browser/markersModel.ts b/src/vs/workbench/contrib/markers/browser/markersModel.ts
index 6f24498a51a..923f13da0a3 100644
--- a/src/vs/workbench/contrib/markers/browser/markersModel.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersModel.ts
@@ -7,7 +7,7 @@ import { basename } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { IMarker, MarkerSeverity, IRelatedInformation, IMarkerData } from 'vs/platform/markers/common/markers';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isFalsyOrEmpty, mergeSort } from 'vs/base/common/arrays';
 import { values } from 'vs/base/common/map';
 import { memoize } from 'vs/base/common/decorators';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -146,7 +146,7 @@ export class MarkersModel {
 		if (isFalsyOrEmpty(rawMarkers)) {
 			this.resourcesByUri.delete(resource.toString());
 		} else {
-			const markers = rawMarkers.map(rawMarker => {
+			const markers = mergeSort(rawMarkers.map(rawMarker => {
 				let relatedInformation: RelatedInformation[] | undefined = undefined;
 
 				if (rawMarker.relatedInformation) {
@@ -154,9 +154,7 @@ export class MarkersModel {
 				}
 
 				return new Marker(rawMarker, relatedInformation);
-			});
-
-			markers.sort(compareMarkers);
+			}), compareMarkers);
 
 			this.resourcesByUri.set(resource.toString(), new ResourceMarkers(resource, markers));
 		}
-- 
GitLab