https-githubsup-com
diff --git a/‎src/vs/workbench/api/common/extHostDiagnostics.ts‎
Lines changed: 5 additions & 5 deletions b/‎src/vs/workbench/api/common/extHostDiagnostics.ts‎
Lines changed: 5 additions & 5 deletions
@@ -78,7 +78,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 			let lastUri: vscode.Uri | undefined;
 
 			// ensure stable-sort
-			mergeSort(first, DiagnosticCollection._compareIndexedTuplesByUri);
+			first = mergeSort([...first], DiagnosticCollection._compareIndexedTuplesByUri);
 
 			for (const tuple of first) {
 				const [uri, diagnostics] = tuple;
@@ -88,17 +88,17 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 					}
 					lastUri = uri;
 					toSync.push(uri);
-					this._data.set(uri.toString(), []);
+					this._data.set(uri, []);
 				}
 
 				if (!diagnostics) {
 					// [Uri, undefined] means clear this
-					const currentDiagnostics = this._data.get(uri.toString());
+					const currentDiagnostics = this._data.get(uri);
 					if (currentDiagnostics) {
 						currentDiagnostics.length = 0;
 					}
 				} else {
-					const currentDiagnostics = this._data.get(uri.toString());
+					const currentDiagnostics = this._data.get(uri);
 					if (currentDiagnostics) {
 						currentDiagnostics.push(...diagnostics);
 					}
@@ -198,7 +198,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 		}
 	}
 
-	private static _compareIndexedTuplesByUri(a: [vscode.Uri, vscode.Diagnostic[]], b: [vscode.Uri, vscode.Diagnostic[]]): number {
+	private static _compareIndexedTuplesByUri(a: [vscode.Uri, readonly vscode.Diagnostic[]], b: [vscode.Uri, readonly vscode.Diagnostic[]]): number {
 		if (a[0].toString() < b[0].toString()) {
 			return -1;
 		} else if (a[0].toString() > b[0].toString()) {
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {`
`78`	`78`	`let lastUri: vscode.Uri \| undefined;`
`79`	`79`
`80`	`80`	`// ensure stable-sort`
`81`		`- mergeSort(first, DiagnosticCollection._compareIndexedTuplesByUri);`
	`81`	`+ first = mergeSort([...first], DiagnosticCollection._compareIndexedTuplesByUri);`
`82`	`82`
`83`	`83`	`for (const tuple of first) {`
`84`	`84`	`const [uri, diagnostics] = tuple;`
`@@ -88,17 +88,17 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {`
`88`	`88`	`}`
`89`	`89`	`lastUri = uri;`
`90`	`90`	`toSync.push(uri);`
`91`		`- this._data.set(uri.toString(), []);`
	`91`	`+ this._data.set(uri, []);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if (!diagnostics) {`
`95`	`95`	`// [Uri, undefined] means clear this`
`96`		`- const currentDiagnostics = this._data.get(uri.toString());`
	`96`	`+ const currentDiagnostics = this._data.get(uri);`
`97`	`97`	`if (currentDiagnostics) {`
`98`	`98`	`currentDiagnostics.length = 0;`
`99`	`99`	`}`
`100`	`100`	`} else {`
`101`		`- const currentDiagnostics = this._data.get(uri.toString());`
	`101`	`+ const currentDiagnostics = this._data.get(uri);`
`102`	`102`	`if (currentDiagnostics) {`
`103`	`103`	`currentDiagnostics.push(...diagnostics);`
`104`	`104`	`}`
`@@ -198,7 +198,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`
`201`		`- private static _compareIndexedTuplesByUri(a: [vscode.Uri, vscode.Diagnostic[]], b: [vscode.Uri, vscode.Diagnostic[]]): number {`
	`201`	`+ private static _compareIndexedTuplesByUri(a: [vscode.Uri, readonly vscode.Diagnostic[]], b: [vscode.Uri, readonly vscode.Diagnostic[]]): number {`
`202`	`202`	`if (a[0].toString() < b[0].toString()) {`
`203`	`203`	`return -1;`
`204`	`204`	`} else if (a[0].toString() > b[0].toString()) {`