Skip to content

Commit 5008c9c

Browse files
authored
Merge pull request #33064 from armanio123/FixNavbarMultilineUnterminated
Added optional trailing slash to navigation bar regex
2 parents 21f1923 + a0c29fe commit 5008c9c

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/services/navigationBar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,6 @@ namespace ts.NavigationBar {
713713
// \r - Carriage Return
714714
// \u2028 - Line separator
715715
// \u2029 - Paragraph separator
716-
return text.replace(/\\(\r?\n|\r|\u2028|\u2029)/g, "");
716+
return text.replace(/\\?(\r?\n|\r|\u2028|\u2029)/g, "");
717717
}
718718
}

tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers2.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
//// const a = ' ''line1\
99
//// line2';
1010
//// }
11+
////
12+
//// f(() => { }, `unterminated backtick 1
13+
//// unterminated backtick 2
14+
//// unterminated backtick 3
1115

1216
verify.navigationTree({
1317
"text": "<global>",
@@ -34,6 +38,10 @@ verify.navigationTree({
3438
{
3539
"text": "f(`line1line2line3`) callback",
3640
"kind": "function"
41+
},
42+
{
43+
"text": "f(`unterminated backtick 1unterminated backtick 2unterminated backtick 3) callback",
44+
"kind": "function"
3745
}
3846
]
3947
});
@@ -54,6 +62,10 @@ verify.navigationBar([
5462
{
5563
"text": "f(`line1line2line3`) callback",
5664
"kind": "function"
65+
},
66+
{
67+
"text": "f(`unterminated backtick 1unterminated backtick 2unterminated backtick 3) callback",
68+
"kind": "function"
5769
}
5870
]
5971
},
@@ -81,5 +93,10 @@ verify.navigationBar([
8193
"text": "f(`line1line2line3`) callback",
8294
"kind": "function",
8395
"indent": 1
96+
},
97+
{
98+
"text": "f(`unterminated backtick 1unterminated backtick 2unterminated backtick 3) callback",
99+
"kind": "function",
100+
"indent": 1
84101
}
85102
]);

0 commit comments

Comments
 (0)