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

Fix the union property kind if the property is union of exported variable of module

Browse Source 
Fixes #929
This commit is contained in:
Sheetal Nandi 2014-11-06 19:18:20 -08:00
parent 8ab038f1a3
commit 127aa49e55
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/services.ts
View File

@ -2784,10 +2784,10 @@ module ts {
if (flags & SymbolFlags.Property) {
if (flags & SymbolFlags.UnionProperty) {
// If union property is result of union of non method (property/accessors), it is labeled as property
// If union property is result of union of non method (property/accessors/variables), it is labeled as property
var unionPropertyKind = forEach(typeInfoResolver.getRootSymbols(symbol), rootSymbol => {
var rootSymbolFlags = rootSymbol.getFlags();
if (rootSymbolFlags & (SymbolFlags.Property | SymbolFlags.GetAccessor | SymbolFlags.SetAccessor)) {
if (rootSymbolFlags & (SymbolFlags.PropertyOrAccessor | SymbolFlags.Variable)) {
return ScriptElementKind.memberVariableElement;
}
Debug.assert(!!(rootSymbolFlags & SymbolFlags.Method));

13
tests/cases/fourslash/completionEntryForPropertyFromUnionOfModuleType.ts Normal file
View File

@ -0,0 +1,13 @@
///<reference path="fourslash.ts" />
////module E {
//// export var n = 1;
////}
////module F {
//// export var n = 1;
////}
////var q: typeof E | typeof F;
////var j = q./*1*/
goTo.marker('1');
verify.completionListContains('n', "(property) n: number");