First half of fix

sandersn · sandersn · commit c49ef369643b · 2018-05-10T16:51:46.000-07:00
Still doesn't work correctly for multiple merges
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -915,8 +915,11 @@ namespace ts {
                 }
                 if ((source.flags | target.flags) & SymbolFlags.JSContainer) {
                     const sourceInitializer = getJSInitializerSymbol(source);
-                    const targetInitializer = getJSInitializerSymbol(target);
+                    let targetInitializer = getJSInitializerSymbol(target);
                     if (sourceInitializer !== source || targetInitializer !== target) {
+                        if (!(targetInitializer.flags & SymbolFlags.Transient)) {
+                            targetInitializer = cloneSymbol(targetInitializer);
+                        }
                         mergeSymbol(targetInitializer, sourceInitializer);
                     }
                 }
@@ -19452,7 +19455,7 @@ namespace ts {
             }
 
             const links = getNodeLinks(node);
-            const type = getTypeOfSymbol(node.symbol);
+            const type = getTypeOfSymbol(getMergedSymbol(node.symbol));
             if (isTypeAny(type)) {
                 return type;
             }
diff --git a/tests/baselines/reference/typeFromPropertyAssignment14.types b/tests/baselines/reference/typeFromPropertyAssignment14.types
@@ -1,21 +1,21 @@
 === tests/cases/conformance/salsa/def.js ===
 var Outer = {};
->Outer : typeof Outer
->{} : typeof Outer
+>Outer : { [x: string]: any; Inner(): void; }
+>{} : { [x: string]: any; Inner(): void; }
 
 === tests/cases/conformance/salsa/work.js ===
 Outer.Inner = function () {}
 >Outer.Inner = function () {} : () => void
 >Outer.Inner : () => void
->Outer : typeof Outer
+>Outer : { [x: string]: any; Inner(): void; }
 >Inner : () => void
 >function () {} : () => void
 
 Outer.Inner.prototype = {
 >Outer.Inner.prototype = {    x: 1,    m() { }} : { [x: string]: any; x: number; m(): void; }
 >Outer.Inner.prototype : any
 >Outer.Inner : () => void
->Outer : typeof Outer
+>Outer : { [x: string]: any; Inner(): void; }
 >Inner : () => void
 >prototype : any
 >{    x: 1,    m() { }} : { [x: string]: any; x: number; m(): void; }
@@ -48,7 +48,7 @@ var inno = new Outer.Inner()
 >inno : { [x: string]: any; x: number; m(): void; }
 >new Outer.Inner() : { [x: string]: any; x: number; m(): void; }
 >Outer.Inner : () => void
->Outer : typeof Outer
+>Outer : { [x: string]: any; Inner(): void; }
 >Inner : () => void
 
 inno.x
diff --git a/tests/baselines/reference/typeFromPropertyAssignment4.types b/tests/baselines/reference/typeFromPropertyAssignment4.types
@@ -1,13 +1,13 @@
 === tests/cases/conformance/salsa/def.js ===
 var Outer = {};
->Outer : typeof Outer
->{} : typeof Outer
+>Outer : { [x: string]: any; Inner: typeof Inner; }
+>{} : { [x: string]: any; Inner: typeof Inner; }
 
 === tests/cases/conformance/salsa/a.js ===
 Outer.Inner = class {
 >Outer.Inner = class {    constructor() {        /** @type {number} */        this.y = 12    }} : typeof Inner
 >Outer.Inner : typeof Inner
->Outer : typeof Outer
+>Outer : { [x: string]: any; Inner: typeof Inner; }
 >Inner : typeof Inner
 >class {    constructor() {        /** @type {number} */        this.y = 12    }} : typeof Inner
 
@@ -35,7 +35,7 @@ var inner = new Outer.Inner()
 >inner : Inner
 >new Outer.Inner() : Inner
 >Outer.Inner : typeof Inner
->Outer : typeof Outer
+>Outer : { [x: string]: any; Inner: typeof Inner; }
 >Inner : typeof Inner
 
 inner.y
@@ -57,7 +57,7 @@ var z = new Outer.Inner()
 >z : Inner
 >new Outer.Inner() : Inner
 >Outer.Inner : typeof Inner
->Outer : typeof Outer
+>Outer : { [x: string]: any; Inner: typeof Inner; }
 >Inner : typeof Inner
 
 z.y

Original file line number	Diff line number	Diff line change
`@@ -915,8 +915,11 @@ namespace ts {`
`915`	`915`	`}`
`916`	`916`	`if ((source.flags \| target.flags) & SymbolFlags.JSContainer) {`
`917`	`917`	`const sourceInitializer = getJSInitializerSymbol(source);`
`918`		`- const targetInitializer = getJSInitializerSymbol(target);`
	`918`	`+ let targetInitializer = getJSInitializerSymbol(target);`
`919`	`919`	`if (sourceInitializer !== source \|\| targetInitializer !== target) {`
	`920`	`+ if (!(targetInitializer.flags & SymbolFlags.Transient)) {`
	`921`	`+ targetInitializer = cloneSymbol(targetInitializer);`
	`922`	`+ }`
`920`	`923`	`mergeSymbol(targetInitializer, sourceInitializer);`
`921`	`924`	`}`
`922`	`925`	`}`
`@@ -19452,7 +19455,7 @@ namespace ts {`
`19452`	`19455`	`}`
`19453`	`19456`
`19454`	`19457`	`const links = getNodeLinks(node);`
`19455`		`- const type = getTypeOfSymbol(node.symbol);`
	`19458`	`+ const type = getTypeOfSymbol(getMergedSymbol(node.symbol));`
`19456`	`19459`	`if (isTypeAny(type)) {`
`19457`	`19460`	`return type;`
`19458`	`19461`	`}`