microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-18 12:21:37 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Add name of function expression into completion list

Browse Source
This commit is contained in:
Yui T 2015-06-24 14:10:02 -07:00
parent d695afa102
commit aab210096b
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/checker.ts
View File

@ -12182,8 +12182,12 @@ namespace ts {
}
break;
case SyntaxKind.FunctionExpression:
if ((<FunctionExpression>location).name) {
copySymbol(location.symbol, meaning);
let name = (<FunctionExpression>location).name;
if (name) {
let symbol = location.symbol;
if (symbol.flags & meaning && !hasProperty(symbols, name.text)) {
symbols[name.text] = symbol;
}
}
break;
}

16
src/services/services.ts
View File

@ -2807,6 +2807,22 @@ namespace ts {
}
}
// Special case for function expression because despite sometimes having a name, the binder
// binds them to a symbol with the name "__function". However, for completion entry, we want
// to display its declared name rather than "__function".
// var x = function foo () {
// fo$ <- completion list should contain local name "foo"
// }
// foo$ <- completion list should not contain "foo"
if (displayName === "__function") {
displayName = symbol.declarations[0].name.getText();
// At this point, we expect that all completion list entries have declared name including function expression
// because when we gather all relevant symbols, we check that the function expression must have declared name
// before adding the symbol into our symbols table. (see: getSymbolsInScope)
Debug.assert(displayName !== undefined,"Expected this function expression to have declared name");
}
let firstCharCode = displayName.charCodeAt(0);
// First check of the displayName is not external module; if it is an external module, it is not valid entry
if ((symbol.flags & SymbolFlags.Namespace) && (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) {