Skip to content

Commit 13a0f59

Browse files
author
Andy
authored
Merge pull request #9159 from Microsoft/code_completion_escaping
Code completion escaping
2 parents c33df01 + 6b05eca commit 13a0f59

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

src/harness/fourslash.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,8 @@ namespace FourSlash {
717717
public verifyCompletionEntryDetails(entryName: string, expectedText: string, expectedDocumentation?: string, kind?: string) {
718718
const details = this.getCompletionEntryDetails(entryName);
719719

720+
assert(details, "no completion entry available");
721+
720722
assert.equal(ts.displayPartsToString(details.displayParts), expectedText, this.assertionMessageAtLastKnownMarker("completion entry details text"));
721723

722724
if (expectedDocumentation !== undefined) {

src/services/services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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,
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/// <reference path="fourslash.ts" />
2+
3+
// @Filename: a.js
4+
// @allowJs: true
5+
////___foo; __foo;/**/
6+
7+
goTo.marker();
8+
verify.completionListContains("__foo", undefined, undefined, "warning");
9+
verify.completionListContains("___foo", undefined, undefined, "warning");

0 commit comments

Comments
 (0)