From 60a2b5a8d07ca2ab8f7438a3951d7b4c1f96e2f4 Mon Sep 17 00:00:00 2001 From: Kitson Kelly Date: Wed, 18 Sep 2019 02:24:44 +1000 Subject: Update to TypeScript 3.6.3 (#2969) --- js/diagnostics.ts | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'js') diff --git a/js/diagnostics.ts b/js/diagnostics.ts index c5377f979..7cdb154b9 100644 --- a/js/diagnostics.ts +++ b/js/diagnostics.ts @@ -18,7 +18,7 @@ export interface DiagnosticMessageChain { message: string; category: DiagnosticCategory; code: number; - next?: DiagnosticMessageChain; + next?: DiagnosticMessageChain[]; } export interface DiagnosticItem { @@ -130,19 +130,20 @@ function getSourceInformation( /** Converts a TypeScript diagnostic message chain to a Deno one. */ function fromDiagnosticMessageChain( - messageChain: ts.DiagnosticMessageChain | undefined -): DiagnosticMessageChain | undefined { + messageChain: ts.DiagnosticMessageChain[] | undefined +): DiagnosticMessageChain[] | undefined { if (!messageChain) { return undefined; } - const { messageText: message, code, category, next } = messageChain; - return { - message, - code, - category: fromDiagnosticCategory(category), - next: fromDiagnosticMessageChain(next) - }; + return messageChain.map(({ messageText: message, code, category, next }) => { + return { + message, + code, + category: fromDiagnosticCategory(category), + next: fromDiagnosticMessageChain(next) + }; + }); } /** Parse out information from a TypeScript diagnostic structure. */ @@ -171,7 +172,7 @@ function parseDiagnostic( message = messageText; } else { message = messageText.messageText; - messageChain = fromDiagnosticMessageChain(messageText); + messageChain = fromDiagnosticMessageChain([messageText])![0]; } const base = { -- cgit v1.2.3