From ce133ec2dd88a7d5fdfe0d5019f6fc0704a36436 Mon Sep 17 00:00:00 2001 From: Armando Aguirre Date: Thu, 1 Aug 2019 17:21:29 -0700 Subject: [PATCH] Fixed issue for navbar when having multiline string literals --- src/services/navigationBar.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index 60f1283f7e6..1e60ac824f3 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -194,7 +194,7 @@ namespace ts.NavigationBar { // Handle named bindings in imports e.g.: // import * as NS from "mod"; // import {a, b as B} from "mod"; - const {namedBindings} = importClause; + const { namedBindings } = importClause; if (namedBindings) { if (namedBindings.kind === SyntaxKind.NamespaceImport) { addLeafNode(namedBindings); @@ -660,7 +660,16 @@ namespace ts.NavigationBar { else if (isCallExpression(parent)) { const name = getCalledExpressionName(parent.expression); if (name !== undefined) { - const args = mapDefined(parent.arguments, a => isStringLiteralLike(a) ? a.getText(curSourceFile) : undefined).join(", "); + const args = mapDefined(parent.arguments, a => { + if (isStringLiteralLike(a)) { + const line = curSourceFile.getLineAndCharacterOfPosition(a.pos).line; + const endOfLine = getEndLinePosition(line, curSourceFile); + + return a.getText(curSourceFile).substring(0, endOfLine - a.pos); + } + + return undefined; + }).join(", "); return `${name}(${args}) callback`; } }