microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-17 10:31:20 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Support completion in named class expression and named function expression

Browse Source
This commit is contained in:
Yui T 2015-06-25 18:35:01 -07:00
parent 34489fa0e0
commit 5467e1dfbd
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/checker.ts
View File

@ -12170,11 +12170,6 @@ namespace ts {
case SyntaxKind.EnumDeclaration:
copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.EnumMember);
break;
case SyntaxKind.ClassExpression:
if ((<ClassExpression>location).name) {
copySymbol(location.symbol, meaning);
}
// Fall through
case SyntaxKind.ClassDeclaration:
case SyntaxKind.InterfaceDeclaration:
if (!(memberFlags & NodeFlags.Static)) {
@ -12182,7 +12177,8 @@ namespace ts {
}
break;
case SyntaxKind.FunctionExpression:
let name = (<FunctionExpression>location).name;
case SyntaxKind.ClassExpression:
let name = (<FunctionExpression|ClassExpression>location).name;
if (name) {
let symbol = location.symbol;
if (symbol.flags & meaning && !hasProperty(symbols, name.text)) {

25
src/services/services.ts
View File

@ -1423,6 +1423,9 @@ namespace ts {
// class X {}
export const classElement = "class";
// var x = class X {}
export const localClassElement = "local class";
// interface Y {}
export const interfaceElement = "interface";
@ -2807,14 +2810,14 @@ 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".
// Special case for function expression and class expression because despite sometimes having a name, the binder
// binds them to a symbol with the name "__function" and "__class" respectively. However, for completion entry, we want
// to display its declared name rather than "__function" and "__class".
// var x = function foo () {
// fo$ <- completion list should contain local name "foo"
// }
// foo$ <- completion list should not contain "foo"
if (displayName === "__function") {
if (displayName === "__function" || displayName === "__class") {
displayName = symbol.declarations[0].name.getText();
// At this point, we expect that all completion list entries have declared name including function expression
@ -3568,7 +3571,8 @@ namespace ts {
function getSymbolKind(symbol: Symbol, location: Node): string {
let flags = symbol.getFlags();
if (flags & SymbolFlags.Class) return ScriptElementKind.classElement;
if (flags & SymbolFlags.Class) return symbol.declarations[0].kind === SyntaxKind.ClassExpression ?
ScriptElementKind.localClassElement : ScriptElementKind.classElement;
if (flags & SymbolFlags.Enum) return ScriptElementKind.enumElement;
if (flags & SymbolFlags.TypeAlias) return ScriptElementKind.typeElement;
if (flags & SymbolFlags.Interface) return ScriptElementKind.interfaceElement;
@ -3777,7 +3781,16 @@ namespace ts {
}
}
if (symbolFlags & SymbolFlags.Class && !hasAddedSymbolInfo) {
displayParts.push(keywordPart(SyntaxKind.ClassKeyword));
// Special case for class expressions because we would like to indicate that
// the class name is local to the class body (similar to function expression)
// (local class) class <className>
if (symbol.getName() === "__class") {
pushTypePart(ScriptElementKind.localClassElement);
}
else {
// Class declaration has name which is not local.
displayParts.push(keywordPart(SyntaxKind.ClassKeyword));
}
displayParts.push(spacePart());
addFullSymbolName(symbol);
writeTypeParametersOfSymbol(symbol, sourceFile);