From a0c29fe4e50256a33d0a3f3fafbd47acc404433b Mon Sep 17 00:00:00 2001
From: Armando Aguirre <armando.aguirre@microsoft.com>
Date: Fri, 23 Aug 2019 15:42:03 -0700
Subject: [PATCH] Added optional trailing slash regex

---
 src/services/navigationBar.ts                   |  2 +-
 ...gationBarItemsMultilineStringIdentifiers2.ts | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
index 5f826a1a78f..57bf910efda 100644
--- a/src/services/navigationBar.ts
+++ b/src/services/navigationBar.ts
@@ -713,6 +713,6 @@ namespace ts.NavigationBar {
         // \r - Carriage Return
         // \u2028 - Line separator
         // \u2029 - Paragraph separator
-        return text.replace(/\\(\r?\n|\r|\u2028|\u2029)/g, "");
+        return text.replace(/\\?(\r?\n|\r|\u2028|\u2029)/g, "");
     }
 }
diff --git a/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers2.ts b/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers2.ts
index 8c3fe8b4c09..0aef520785a 100644
--- a/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers2.ts
+++ b/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers2.ts
@@ -8,6 +8,10 @@
 ////     const a = ' ''line1\
 ////         line2';
 //// }
+////
+//// f(() => { }, `unterminated backtick 1
+//// unterminated backtick 2
+//// unterminated backtick 3
 
 verify.navigationTree({
     "text": "<global>",
@@ -34,6 +38,10 @@ verify.navigationTree({
         {
             "text": "f(`line1line2line3`) callback",
             "kind": "function"
+        },
+        {
+            "text": "f(`unterminated backtick 1unterminated backtick 2unterminated backtick 3) callback",
+            "kind": "function"
         }
     ]
 });
@@ -54,6 +62,10 @@ verify.navigationBar([
             {
                 "text": "f(`line1line2line3`) callback",
                 "kind": "function"
+            },
+            {
+                "text": "f(`unterminated backtick 1unterminated backtick 2unterminated backtick 3) callback",
+                "kind": "function"
             }
         ]
     },
@@ -81,5 +93,10 @@ verify.navigationBar([
         "text": "f(`line1line2line3`) callback",
         "kind": "function",
         "indent": 1
+    },
+    {
+        "text": "f(`unterminated backtick 1unterminated backtick 2unterminated backtick 3) callback",
+        "kind": "function",
+        "indent": 1
     }
 ]);