Skip to content

Commit 6b05eca

Browse files
author
Andy Hanson
committed
Fix bug: do unescaping in the right place, so that it only affects escaped javascript identifiers
1 parent 1b4b01e commit 6b05eca

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/services/services.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3234,7 +3234,7 @@ namespace ts {
32343234
}
32353235
}
32363236

3237-
return unescapeIdentifier(name);
3237+
return name;
32383238
}
32393239

32403240
function getCompletionData(fileName: string, position: number) {
@@ -4141,7 +4141,7 @@ namespace ts {
41414141

41424142
if (!uniqueNames[name]) {
41434143
uniqueNames[name] = name;
4144-
const displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks*/ true);
4144+
const displayName = getCompletionEntryDisplayName(unescapeIdentifier(name), target, /*performCharacterChecks*/ true);
41454145
if (displayName) {
41464146
const entry = {
41474147
name: displayName,

tests/cases/fourslash/codeCompletionEscaping.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
// @Filename: a.js
44
// @allowJs: true
5-
////__foo;/**/
5+
////___foo; __foo;/**/
66

77
goTo.marker();
88
verify.completionListContains("__foo", undefined, undefined, "warning");
9+
verify.completionListContains("___foo", undefined, undefined, "warning");

0 commit comments

Comments
 (0)