From d369cecd101a0c7b8172fad2dec68337916d929d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 27 Aug 2018 16:06:26 -0700
Subject: [PATCH] Accept new baselines

---
 .../reference/keyofAndIndexedAccess.js        | 27 ++++++++++
 .../reference/keyofAndIndexedAccess.symbols   | 51 +++++++++++++++++++
 .../reference/keyofAndIndexedAccess.types     | 41 +++++++++++++++
 3 files changed, 119 insertions(+)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index cc0498fcfe262..873fa2a035a78 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -649,6 +649,20 @@ function ff2<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2:
     const d: Dict<T> = dd[k1];
     return d[k2];
 }
+
+// Repro from #26409
+
+const cf1 = <T extends { [P in K]: string; } & { cool: string; }, K extends keyof T>(t: T, k: K) =>
+{
+    const s: string = t[k];
+    t.cool;
+};
+
+const cf2 = <T extends { [P in K | "cool"]: string; }, K extends keyof T>(t: T, k: K) =>
+{
+    const s: string = t[k];
+    t.cool;
+};
 
 
 //// [keyofAndIndexedAccess.js]
@@ -1078,6 +1092,15 @@ function ff2(dd, k1, k2) {
     var d = dd[k1];
     return d[k2];
 }
+// Repro from #26409
+var cf1 = function (t, k) {
+    var s = t[k];
+    t.cool;
+};
+var cf2 = function (t, k) {
+    var s = t[k];
+    t.cool;
+};
 
 
 //// [keyofAndIndexedAccess.d.ts]
@@ -1413,3 +1436,7 @@ declare type DictDict<V extends string, T extends string> = {
 };
 declare function ff1<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2: T): number;
 declare function ff2<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2: T): number;
+declare const cf1: <T extends { [P in K]: string; } & {
+    cool: string;
+}, K extends keyof T>(t: T, k: K) => void;
+declare const cf2: <T extends { [P in K | "cool"]: string; }, K extends keyof T>(t: T, k: K) => void;
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index c8bb9f14da746..15cc704c4817b 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -2319,3 +2319,54 @@ function ff2<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2:
 >k2 : Symbol(k2, Decl(keyofAndIndexedAccess.ts, 646, 75))
 }
 
+// Repro from #26409
+
+const cf1 = <T extends { [P in K]: string; } & { cool: string; }, K extends keyof T>(t: T, k: K) =>
+>cf1 : Symbol(cf1, Decl(keyofAndIndexedAccess.ts, 653, 5))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 653, 13))
+>P : Symbol(P, Decl(keyofAndIndexedAccess.ts, 653, 26))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 653, 65))
+>cool : Symbol(cool, Decl(keyofAndIndexedAccess.ts, 653, 48))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 653, 65))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 653, 13))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 653, 85))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 653, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 653, 90))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 653, 65))
+{
+    const s: string = t[k];
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 655, 9))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 653, 85))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 653, 90))
+
+    t.cool;
+>t.cool : Symbol(cool, Decl(keyofAndIndexedAccess.ts, 653, 48))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 653, 85))
+>cool : Symbol(cool, Decl(keyofAndIndexedAccess.ts, 653, 48))
+
+};
+
+const cf2 = <T extends { [P in K | "cool"]: string; }, K extends keyof T>(t: T, k: K) =>
+>cf2 : Symbol(cf2, Decl(keyofAndIndexedAccess.ts, 659, 5))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 659, 13))
+>P : Symbol(P, Decl(keyofAndIndexedAccess.ts, 659, 26))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 659, 54))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 659, 54))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 659, 13))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 659, 74))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 659, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 659, 79))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 659, 54))
+{
+    const s: string = t[k];
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 661, 9))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 659, 74))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 659, 79))
+
+    t.cool;
+>t.cool : Symbol(cool)
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 659, 74))
+>cool : Symbol(cool)
+
+};
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 3434d003d54d6..58fd74f66014a 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -2184,3 +2184,44 @@ function ff2<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2:
 >k2 : T
 }
 
+// Repro from #26409
+
+const cf1 = <T extends { [P in K]: string; } & { cool: string; }, K extends keyof T>(t: T, k: K) =>
+>cf1 : <T extends { [P in K]: string; } & { cool: string; }, K extends keyof T>(t: T, k: K) => void
+><T extends { [P in K]: string; } & { cool: string; }, K extends keyof T>(t: T, k: K) =>{    const s: string = t[k];    t.cool;} : <T extends { [P in K]: string; } & { cool: string; }, K extends keyof T>(t: T, k: K) => void
+>cool : string
+>t : T
+>k : K
+{
+    const s: string = t[k];
+>s : string
+>t[k] : T[K]
+>t : T
+>k : K
+
+    t.cool;
+>t.cool : string
+>t : T
+>cool : string
+
+};
+
+const cf2 = <T extends { [P in K | "cool"]: string; }, K extends keyof T>(t: T, k: K) =>
+>cf2 : <T extends { [P in K | "cool"]: string; }, K extends keyof T>(t: T, k: K) => void
+><T extends { [P in K | "cool"]: string; }, K extends keyof T>(t: T, k: K) =>{    const s: string = t[k];    t.cool;} : <T extends { [P in K | "cool"]: string; }, K extends keyof T>(t: T, k: K) => void
+>t : T
+>k : K
+{
+    const s: string = t[k];
+>s : string
+>t[k] : T[K]
+>t : T
+>k : K
+
+    t.cool;
+>t.cool : string
+>t : T
+>cool : string
+
+};
+