maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Symbol kind needs to use location before falling back to flags

Browse source 
Fixes #22366
This commit is contained in:
Sheetal Nandi 2018-03-08 11:01:17 -08:00
parent e4610e3418
commit ea37c37e88
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/services/symbolDisplay.ts
View file

@ -2,24 +2,25 @@
namespace ts.SymbolDisplay {
// TODO(drosen): use contextual SemanticMeaning.
export function getSymbolKind(typeChecker: TypeChecker, symbol: Symbol, location: Node): ScriptElementKind {
const flags = getCombinedLocalAndExportSymbolFlags(symbol);
const result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location);
if (result !== ScriptElementKind.unknown) {
return result;
}
const flags = getCombinedLocalAndExportSymbolFlags(symbol);
if (flags & SymbolFlags.Class) {
return getDeclarationOfKind(symbol, SyntaxKind.ClassExpression) ?
ScriptElementKind.localClassElement : ScriptElementKind.classElement;
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;
if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement;
const result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location);
if (result === ScriptElementKind.unknown) {
if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement;
if (flags & SymbolFlags.EnumMember) return ScriptElementKind.enumMemberElement;
if (flags & SymbolFlags.Alias) return ScriptElementKind.alias;
if (flags & SymbolFlags.Module) return ScriptElementKind.moduleElement;
}
if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement;
if (flags & SymbolFlags.EnumMember) return ScriptElementKind.enumMemberElement;
if (flags & SymbolFlags.Alias) return ScriptElementKind.alias;
if (flags & SymbolFlags.Module) return ScriptElementKind.moduleElement;
return result;
}

17
tests/cases/fourslash/completionOfInterfaceAndVar.ts Normal file
View file

@ -0,0 +1,17 @@
/// <reference path='fourslash.ts'/>
////interface AnalyserNode {
////}
////declare var AnalyserNode: {
//// prototype: AnalyserNode;
//// new(): AnalyserNode;
////};
/////**/
goTo.marker();
verify.completionListContains("AnalyserNode", /*text*/ undefined, /*documentation*/ undefined, "var");
verify.completionEntryDetailIs("AnalyserNode", `interface AnalyserNode
var AnalyserNode: {
new (): AnalyserNode;
prototype: AnalyserNode;
}`, /*documentation*/ undefined, "var")