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

When interfaces are merged, always ensure that the parent symbol of the late bound member symbol is declared symbol containing the node.

Browse Source 
Ensure that resolvedMembers adds the late bound symbol even when its resolved sunce lateBoundMember may or may not be added to resolved members depending on when its checked
Fixes #30891
This commit is contained in:
Sheetal Nandi 2019-04-16 12:36:07 -07:00
parent 9f5090cec7
commit 3c67608715
2 changed files with 112 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/compiler/checker.ts
View File

@ -6607,12 +6607,11 @@ namespace ts {
* unique symbol type which we can then use as the name of the member. This allows users
* to define custom symbols that can be used in the members of an object type.
*
* @param parent The containing symbol for the member.
* @param earlySymbols The early-bound symbols of the parent.
* @param lateSymbols The late-bound symbols of the parent.
* @param decl The member to bind.
*/
function lateBindMember(parent: Symbol, earlySymbols: SymbolTable | undefined, lateSymbols: SymbolTable, decl: LateBoundDeclaration) {
function lateBindMember(earlySymbols: SymbolTable | undefined, lateSymbols: SymbolTable, decl: LateBoundDeclaration) {
Debug.assert(!!decl.symbol, "The member is expected to have a symbol.");
const links = getNodeLinks(decl);
if (!links.resolvedSymbol) {
@ -6643,6 +6642,7 @@ namespace ts {
}
lateSymbol.nameType = type;
addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
const parent = getSymbolOfNode(decl.parent);
if (lateSymbol.parent) {
Debug.assert(lateSymbol.parent === parent, "Existing symbol parent should match new one");
}
@ -6652,6 +6652,15 @@ namespace ts {
return links.resolvedSymbol = lateSymbol;
}
}
else {
const type = checkComputedPropertyName(decl.name);
if (isTypeUsableAsPropertyName(type)) {
const memberName = getPropertyNameFromType(type);
if (!lateSymbols.has(memberName)) {
lateSymbols.set(memberName, links.resolvedSymbol);
}
}
}
return links.resolvedSymbol;
}
@ -6675,7 +6684,7 @@ namespace ts {
if (members) {
for (const member of members) {
if (isStatic === hasStaticModifier(member) && hasLateBindableName(member)) {
lateBindMember(symbol, earlySymbols, lateSymbols, member);
lateBindMember(earlySymbols, lateSymbols, member);
}
}
}

100
tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js
View File

@ -1,3 +1,9 @@
//// [/src/src/main.js]
"use strict";
exports.__esModule = true;
var sym = Symbol();
//// [/src/src/main.ts]
import { HKT } from "./hkt";
@ -11,3 +17,97 @@ declare module "./hkt" {
type A = HKT<number>[typeof sym];
//// [/src/tsconfig.tsbuildinfo]
{
"program": {
"fileInfos": {
"/lib/lib.es5.d.ts": {
"version": "/lib/lib.es5.d.ts",
"signature": "/lib/lib.es5.d.ts"
},
"/lib/lib.es2015.d.ts": {
"version": "/lib/lib.es2015.d.ts",
"signature": "/lib/lib.es2015.d.ts"
},
"/lib/lib.es2015.core.d.ts": {
"version": "/lib/lib.es2015.core.d.ts",
"signature": "/lib/lib.es2015.core.d.ts"
},
"/lib/lib.es2015.collection.d.ts": {
"version": "/lib/lib.es2015.collection.d.ts",
"signature": "/lib/lib.es2015.collection.d.ts"
},
"/lib/lib.es2015.generator.d.ts": {
"version": "/lib/lib.es2015.generator.d.ts",
"signature": "/lib/lib.es2015.generator.d.ts"
},
"/lib/lib.es2015.iterable.d.ts": {
"version": "/lib/lib.es2015.iterable.d.ts",
"signature": "/lib/lib.es2015.iterable.d.ts"
},
"/lib/lib.es2015.promise.d.ts": {
"version": "/lib/lib.es2015.promise.d.ts",
"signature": "/lib/lib.es2015.promise.d.ts"
},
"/lib/lib.es2015.proxy.d.ts": {
"version": "/lib/lib.es2015.proxy.d.ts",
"signature": "/lib/lib.es2015.proxy.d.ts"
},
"/lib/lib.es2015.reflect.d.ts": {
"version": "/lib/lib.es2015.reflect.d.ts",
"signature": "/lib/lib.es2015.reflect.d.ts"
},
"/lib/lib.es2015.symbol.d.ts": {
"version": "/lib/lib.es2015.symbol.d.ts",
"signature": "/lib/lib.es2015.symbol.d.ts"
},
"/lib/lib.es2015.symbol.wellknown.d.ts": {
"version": "/lib/lib.es2015.symbol.wellknown.d.ts",
"signature": "/lib/lib.es2015.symbol.wellknown.d.ts"
},
"/src/src/hkt.ts": {
"version": "675797797",
"signature": "2373810515"
},
"/src/src/main.ts": {
"version": "-27494779858",
"signature": "-7779857705"
}
},
"options": {
"rootDir": "/src/src",
"lib": [
"lib.es2015.d.ts"
],
"incremental": true,
"configFilePath": "/src/tsconfig.json"
},
"referencedMap": {
"/src/src/main.ts": [
"/src/src/hkt.ts"
]
},
"exportedModulesMap": {
"/src/src/main.ts": [
"/src/src/hkt.ts"
]
},
"semanticDiagnosticsPerFile": [
"/lib/lib.es2015.collection.d.ts",
"/lib/lib.es2015.core.d.ts",
"/lib/lib.es2015.d.ts",
"/lib/lib.es2015.generator.d.ts",
"/lib/lib.es2015.iterable.d.ts",
"/lib/lib.es2015.promise.d.ts",
"/lib/lib.es2015.proxy.d.ts",
"/lib/lib.es2015.reflect.d.ts",
"/lib/lib.es2015.symbol.d.ts",
"/lib/lib.es2015.symbol.wellknown.d.ts",
"/lib/lib.es5.d.ts",
"/src/src/hkt.ts",
"/src/src/main.ts"
]
},
"version": "FakeTSVersion"
}