From be0358cc0cff88b0e5b05e656735da80a052c0f6 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 8 Nov 2016 06:09:41 -0800
Subject: [PATCH] Include declaration file emit

---
 .../reference/instantiatedTypeAliasDisplay.js | 15 ++++
 .../instantiatedTypeAliasDisplay.symbols      | 75 ++++++++++---------
 .../instantiatedTypeAliasDisplay.types        |  1 +
 .../compiler/instantiatedTypeAliasDisplay.ts  |  2 +
 4 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.js b/tests/baselines/reference/instantiatedTypeAliasDisplay.js
index 86b17262e0f..9c2b91b613e 100644
--- a/tests/baselines/reference/instantiatedTypeAliasDisplay.js
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.js
@@ -1,4 +1,5 @@
 //// [instantiatedTypeAliasDisplay.ts]
+
 // Repros from #12066
 
 interface X<A> {
@@ -19,3 +20,17 @@ const x2 = f2({}, {}, {}, {});  // Z<{}, string[]>
 // Repros from #12066
 var x1 = f1(); // Z<string, number>
 var x2 = f2({}, {}, {}, {}); // Z<{}, string[]>
+
+
+//// [instantiatedTypeAliasDisplay.d.ts]
+interface X<A> {
+    a: A;
+}
+interface Y<B> {
+    b: B;
+}
+declare type Z<A, B> = X<A> | Y<B>;
+declare function f1<A>(): Z<A, number>;
+declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
+declare const x1: Z<string, number>;
+declare const x2: Z<{}, string[]>;
diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols b/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
index 3c6f7d2b725..fa8140cfcd7 100644
--- a/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
@@ -1,60 +1,61 @@
 === tests/cases/compiler/instantiatedTypeAliasDisplay.ts ===
+
 // Repros from #12066
 
 interface X<A> {
 >X : Symbol(X, Decl(instantiatedTypeAliasDisplay.ts, 0, 0))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 2, 12))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 3, 12))
 
     a: A;
->a : Symbol(X.a, Decl(instantiatedTypeAliasDisplay.ts, 2, 16))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 2, 12))
+>a : Symbol(X.a, Decl(instantiatedTypeAliasDisplay.ts, 3, 16))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 3, 12))
 }
 interface Y<B> {
->Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 4, 1))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 5, 12))
+>Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 5, 1))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 6, 12))
 
     b: B;
->b : Symbol(Y.b, Decl(instantiatedTypeAliasDisplay.ts, 5, 16))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 5, 12))
+>b : Symbol(Y.b, Decl(instantiatedTypeAliasDisplay.ts, 6, 16))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 6, 12))
 }
 type Z<A, B> = X<A> | Y<B>;
->Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 8, 7))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 8, 9))
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 8, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 9, 7))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 9, 9))
 >X : Symbol(X, Decl(instantiatedTypeAliasDisplay.ts, 0, 0))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 8, 7))
->Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 4, 1))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 8, 9))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 9, 7))
+>Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 5, 1))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 9, 9))
 
 declare function f1<A>(): Z<A, number>;
->f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 8, 27))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 10, 20))
->Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 10, 20))
+>f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 9, 27))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 8, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
 
 declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
->f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 10, 39))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 11, 22))
->C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 11, 25))
->D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 11, 28))
->E : Symbol(E, Decl(instantiatedTypeAliasDisplay.ts, 11, 31))
->a : Symbol(a, Decl(instantiatedTypeAliasDisplay.ts, 11, 35))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
->b : Symbol(b, Decl(instantiatedTypeAliasDisplay.ts, 11, 40))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 11, 22))
->c : Symbol(c, Decl(instantiatedTypeAliasDisplay.ts, 11, 46))
->C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 11, 25))
->d : Symbol(d, Decl(instantiatedTypeAliasDisplay.ts, 11, 52))
->D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 11, 28))
->Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
+>f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 11, 39))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 12, 20))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 12, 22))
+>C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 12, 25))
+>D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 12, 28))
+>E : Symbol(E, Decl(instantiatedTypeAliasDisplay.ts, 12, 31))
+>a : Symbol(a, Decl(instantiatedTypeAliasDisplay.ts, 12, 35))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 12, 20))
+>b : Symbol(b, Decl(instantiatedTypeAliasDisplay.ts, 12, 40))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 12, 22))
+>c : Symbol(c, Decl(instantiatedTypeAliasDisplay.ts, 12, 46))
+>C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 12, 25))
+>d : Symbol(d, Decl(instantiatedTypeAliasDisplay.ts, 12, 52))
+>D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 12, 28))
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 8, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 12, 20))
 
 const x1 = f1<string>();  // Z<string, number>
->x1 : Symbol(x1, Decl(instantiatedTypeAliasDisplay.ts, 13, 5))
->f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 8, 27))
+>x1 : Symbol(x1, Decl(instantiatedTypeAliasDisplay.ts, 14, 5))
+>f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 9, 27))
 
 const x2 = f2({}, {}, {}, {});  // Z<{}, string[]>
->x2 : Symbol(x2, Decl(instantiatedTypeAliasDisplay.ts, 14, 5))
->f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 10, 39))
+>x2 : Symbol(x2, Decl(instantiatedTypeAliasDisplay.ts, 15, 5))
+>f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 11, 39))
 
diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.types b/tests/baselines/reference/instantiatedTypeAliasDisplay.types
index 44885777e74..89320e1dba6 100644
--- a/tests/baselines/reference/instantiatedTypeAliasDisplay.types
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/instantiatedTypeAliasDisplay.ts ===
+
 // Repros from #12066
 
 interface X<A> {
diff --git a/tests/cases/compiler/instantiatedTypeAliasDisplay.ts b/tests/cases/compiler/instantiatedTypeAliasDisplay.ts
index d2abaaf8afe..8f7500e7830 100644
--- a/tests/cases/compiler/instantiatedTypeAliasDisplay.ts
+++ b/tests/cases/compiler/instantiatedTypeAliasDisplay.ts
@@ -1,3 +1,5 @@
+// @declaration: true
+
 // Repros from #12066
 
 interface X<A> {