From 2548aced3f0482c579ef8e00f25d8f370974fb3c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 8 Nov 2017 10:56:30 -0800
Subject: [PATCH] Add a couple of test cases

---
 .../reference/controlFlowStringIndex.js       |  9 ++++++-
 .../reference/controlFlowStringIndex.symbols  | 24 +++++++++++++++----
 .../reference/controlFlowStringIndex.types    | 19 ++++++++++++++-
 .../controlFlow/controlFlowStringIndex.ts     |  7 +++++-
 4 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/tests/baselines/reference/controlFlowStringIndex.js b/tests/baselines/reference/controlFlowStringIndex.js
index 456ae6afcd4..db4d4a30ab9 100644
--- a/tests/baselines/reference/controlFlowStringIndex.js
+++ b/tests/baselines/reference/controlFlowStringIndex.js
@@ -1,8 +1,13 @@
 //// [controlFlowStringIndex.ts]
-type A = { [index: string]: number | null };
+type A = {
+    other: number | null;
+    [index: string]: number | null
+};
 declare const value: A;
 if (value.foo !== null) {
     value.foo.toExponential()
+    value.other // should still be number | null
+    value.bar // should still be number | null
 }
 
 
@@ -10,4 +15,6 @@ if (value.foo !== null) {
 "use strict";
 if (value.foo !== null) {
     value.foo.toExponential();
+    value.other; // should still be number | null
+    value.bar; // should still be number | null
 }
diff --git a/tests/baselines/reference/controlFlowStringIndex.symbols b/tests/baselines/reference/controlFlowStringIndex.symbols
index aad08e48a9b..5c7d626d4a7 100644
--- a/tests/baselines/reference/controlFlowStringIndex.symbols
+++ b/tests/baselines/reference/controlFlowStringIndex.symbols
@@ -1,18 +1,32 @@
 === tests/cases/conformance/controlFlow/controlFlowStringIndex.ts ===
-type A = { [index: string]: number | null };
+type A = {
 >A : Symbol(A, Decl(controlFlowStringIndex.ts, 0, 0))
->index : Symbol(index, Decl(controlFlowStringIndex.ts, 0, 12))
 
+    other: number | null;
+>other : Symbol(other, Decl(controlFlowStringIndex.ts, 0, 10))
+
+    [index: string]: number | null
+>index : Symbol(index, Decl(controlFlowStringIndex.ts, 2, 5))
+
+};
 declare const value: A;
->value : Symbol(value, Decl(controlFlowStringIndex.ts, 1, 13))
+>value : Symbol(value, Decl(controlFlowStringIndex.ts, 4, 13))
 >A : Symbol(A, Decl(controlFlowStringIndex.ts, 0, 0))
 
 if (value.foo !== null) {
->value : Symbol(value, Decl(controlFlowStringIndex.ts, 1, 13))
+>value : Symbol(value, Decl(controlFlowStringIndex.ts, 4, 13))
 
     value.foo.toExponential()
 >value.foo.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --))
->value : Symbol(value, Decl(controlFlowStringIndex.ts, 1, 13))
+>value : Symbol(value, Decl(controlFlowStringIndex.ts, 4, 13))
 >toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --))
+
+    value.other // should still be number | null
+>value.other : Symbol(other, Decl(controlFlowStringIndex.ts, 0, 10))
+>value : Symbol(value, Decl(controlFlowStringIndex.ts, 4, 13))
+>other : Symbol(other, Decl(controlFlowStringIndex.ts, 0, 10))
+
+    value.bar // should still be number | null
+>value : Symbol(value, Decl(controlFlowStringIndex.ts, 4, 13))
 }
 
diff --git a/tests/baselines/reference/controlFlowStringIndex.types b/tests/baselines/reference/controlFlowStringIndex.types
index d1722dd6925..8c5f82cbf80 100644
--- a/tests/baselines/reference/controlFlowStringIndex.types
+++ b/tests/baselines/reference/controlFlowStringIndex.types
@@ -1,9 +1,16 @@
 === tests/cases/conformance/controlFlow/controlFlowStringIndex.ts ===
-type A = { [index: string]: number | null };
+type A = {
 >A : A
+
+    other: number | null;
+>other : number | null
+>null : null
+
+    [index: string]: number | null
 >index : string
 >null : null
 
+};
 declare const value: A;
 >value : A
 >A : A
@@ -22,5 +29,15 @@ if (value.foo !== null) {
 >value : A
 >foo : number
 >toExponential : (fractionDigits?: number | undefined) => string
+
+    value.other // should still be number | null
+>value.other : number | null
+>value : A
+>other : number | null
+
+    value.bar // should still be number | null
+>value.bar : number | null
+>value : A
+>bar : number | null
 }
 
diff --git a/tests/cases/conformance/controlFlow/controlFlowStringIndex.ts b/tests/cases/conformance/controlFlow/controlFlowStringIndex.ts
index 78acf6d654e..28b75eaba70 100644
--- a/tests/cases/conformance/controlFlow/controlFlowStringIndex.ts
+++ b/tests/cases/conformance/controlFlow/controlFlowStringIndex.ts
@@ -1,6 +1,11 @@
 // @strict: true
-type A = { [index: string]: number | null };
+type A = {
+    other: number | null;
+    [index: string]: number | null
+};
 declare const value: A;
 if (value.foo !== null) {
     value.foo.toExponential()
+    value.other // should still be number | null
+    value.bar // should still be number | null
 }