From c46090b8dcf629396ddcfab2f499c6d1f1127bf4 Mon Sep 17 00:00:00 2001 From: Benjamin Lichtman Date: Thu, 27 Dec 2018 17:01:05 -0800 Subject: [PATCH] Show template literal in navtree function call args --- src/services/navigationBar.ts | 2 +- .../navigationBarAnonymousClassAndFunctionExpressions.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index 760d6e7103..60f1283f7e 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -660,7 +660,7 @@ namespace ts.NavigationBar { else if (isCallExpression(parent)) { const name = getCalledExpressionName(parent.expression); if (name !== undefined) { - const args = mapDefined(parent.arguments, a => isStringLiteral(a) ? a.getText(curSourceFile) : undefined).join(", "); + const args = mapDefined(parent.arguments, a => isStringLiteralLike(a) ? a.getText(curSourceFile) : undefined).join(", "); return `${name}(${args}) callback`; } } diff --git a/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts b/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts index 23fe81fe48..ad1ba1e72f 100644 --- a/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts +++ b/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts @@ -18,7 +18,7 @@ //// // These will only show up as childItems. //// function z() {} //// console.log(function() {}) -//// describe("this", 'function', () => {}); +//// describe("this", 'function', `is a function`, `but this ${"wont"} show`, () => {}); //// [].map(() => {}); ////}) ////(function classes() { @@ -77,7 +77,7 @@ verify.navigationTree({ "kind": "function" }, { - "text": `describe("this", 'function') callback`, + "text": `describe("this", 'function', \`is a function\`) callback`, "kind": "function" }, { @@ -199,7 +199,7 @@ verify.navigationBar([ "kind": "function" }, { - "text": `describe("this", 'function') callback`, + "text": `describe("this", 'function', \`is a function\`) callback`, "kind": "function" }, {