From cfdeeac8ba09f8dc525fe79d8a59cd4bc1381cfe Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 15 Sep 2020 09:29:21 +0200 Subject: [PATCH] fix ts41 errors in extHostDiagnostics, https://github.com/microsoft/vscode/issues/106358 --- src/vs/workbench/api/common/extHostDiagnostics.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/api/common/extHostDiagnostics.ts b/src/vs/workbench/api/common/extHostDiagnostics.ts index 0ae5595173d..3cd51c4c255 100644 --- a/src/vs/workbench/api/common/extHostDiagnostics.ts +++ b/src/vs/workbench/api/common/extHostDiagnostics.ts @@ -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()) { -- GitLab