microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-09 16:39:46 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Use scanner APIs to identify if a display name is valid completion entry

Browse Source
This commit is contained in:
Mohamed Hegazy
2014-09-11 14:38:48 -07:00
parent 91b52b271f
commit 57fa018a19
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/services.ts
View File

@@ -1567,14 +1567,20 @@ module ts {
/// Completion
function getValidCompletionEntryDisplayName(displayName: string, target: ScriptTarget): string {
if (displayName && displayName.length > 0) {
var firstChar = displayName.charCodeAt(0);
if (firstChar === TypeScript.CharacterCodes.singleQuote || firstChar === TypeScript.CharacterCodes.doubleQuote) {
var firstCharCode = displayName.charCodeAt(0);
if (displayName && displayName.length >= 2 && firstCharCode === displayName.charCodeAt(displayName.length - 1) &&
(firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) {
// If the user entered name for the symbol was quoted, removing the quotes is not enough, as the name could be an
// invalid identifer name. We need to check if whatever was inside the quotes is actually a valid identifier name.
displayName = TypeScript.stripStartAndEndQuotes(displayName);
displayName = displayName.substring(1, displayName.length - 1);
}
if (TypeScript.Scanner.isValidIdentifier(TypeScript.SimpleText.fromString(displayName), target)) {
var isValid = isIdentifierStart(displayName.charCodeAt(0), target);
for (var i = 1, n = displayName.length; isValid && i < n; i++) {
isValid = isValid && isIdentifierPart(displayName.charCodeAt(i), target);
}
if (isValid) {
return displayName;
}
}

2
tests/cases/fourslash/completionListInvalidMemberNames.ts
View File

@@ -19,7 +19,7 @@ verify.completionListContains("bar");
verify.completionListContains("break");
verify.completionListContains("any");
verify.completionListContains("$");
verify.completionListContains("\\u0062");
verify.completionListContains("b");
// Nothing else should show up
verify.memberListCount(5);