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

#27716: fix protected methods for intersection fo generic classes

Browse Source
This commit is contained in:
Andrey Roenko
2018-10-12 17:16:54 +03:00
parent d493c47aac
commit 15b4af63dd
13 changed files with 323 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/checker.ts
View File

@@ -7354,13 +7354,13 @@ namespace ts {
const propTypes: Type[] = [];
let first = true;
let commonValueDeclaration: Declaration | undefined;
let hasNonUniformValueDeclaration = false;
let hasUniformValueDeclaration = true;
for (const prop of props) {
if (!commonValueDeclaration) {
commonValueDeclaration = prop.valueDeclaration;
}
else if (prop.valueDeclaration !== commonValueDeclaration) {
hasNonUniformValueDeclaration = true;
hasUniformValueDeclaration = false;
}
declarations = addRange(declarations, prop.declarations);
const type = getTypeOfSymbol(prop);
@@ -7379,9 +7379,17 @@ namespace ts {
addRange(propTypes, indexTypes);
const result = createSymbol(SymbolFlags.Property | commonFlags, name, syntheticFlag | checkFlags);
result.containingType = containingType;
if (!hasNonUniformValueDeclaration && commonValueDeclaration) {
// All intersections lead to the same value declaration.
if (hasUniformValueDeclaration && commonValueDeclaration) {
result.valueDeclaration = commonValueDeclaration;
// Inherit information about parent type.
if (commonValueDeclaration.symbol.parent) {
result.parent = commonValueDeclaration.symbol.parent;
}
}
result.declarations = declarations!;
result.nameType = nameType;
result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);