From 90ffdf77c9b78db2792212eed21647644119a654 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 26 Jun 2015 09:48:36 -0700
Subject: [PATCH] Adding test

---
 .../reference/intersectionTypeOverloading.js  | 26 ++++++++++++
 .../intersectionTypeOverloading.symbols       | 36 +++++++++++++++++
 .../intersectionTypeOverloading.types         | 40 +++++++++++++++++++
 .../intersectionTypeOverloading.ts            | 14 +++++++
 4 files changed, 116 insertions(+)
 create mode 100644 tests/baselines/reference/intersectionTypeOverloading.js
 create mode 100644 tests/baselines/reference/intersectionTypeOverloading.symbols
 create mode 100644 tests/baselines/reference/intersectionTypeOverloading.types
 create mode 100644 tests/cases/conformance/types/intersection/intersectionTypeOverloading.ts

diff --git a/tests/baselines/reference/intersectionTypeOverloading.js b/tests/baselines/reference/intersectionTypeOverloading.js
new file mode 100644
index 00000000000..b7080e449b7
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeOverloading.js
@@ -0,0 +1,26 @@
+//// [intersectionTypeOverloading.ts]
+// Check that order is preserved in intersection types for purposes of
+// overload resolution
+
+type F = (s: string) => string;
+type G = (x: any) => any;
+
+var fg: F & G;
+var gf: G & F;
+
+var x = fg("abc");
+var x: string;
+
+var y = gf("abc");
+var y: any;
+
+
+//// [intersectionTypeOverloading.js]
+// Check that order is preserved in intersection types for purposes of
+// overload resolution
+var fg;
+var gf;
+var x = fg("abc");
+var x;
+var y = gf("abc");
+var y;
diff --git a/tests/baselines/reference/intersectionTypeOverloading.symbols b/tests/baselines/reference/intersectionTypeOverloading.symbols
new file mode 100644
index 00000000000..c8503345041
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeOverloading.symbols
@@ -0,0 +1,36 @@
+=== tests/cases/conformance/types/intersection/intersectionTypeOverloading.ts ===
+// Check that order is preserved in intersection types for purposes of
+// overload resolution
+
+type F = (s: string) => string;
+>F : Symbol(F, Decl(intersectionTypeOverloading.ts, 0, 0))
+>s : Symbol(s, Decl(intersectionTypeOverloading.ts, 3, 10))
+
+type G = (x: any) => any;
+>G : Symbol(G, Decl(intersectionTypeOverloading.ts, 3, 31))
+>x : Symbol(x, Decl(intersectionTypeOverloading.ts, 4, 10))
+
+var fg: F & G;
+>fg : Symbol(fg, Decl(intersectionTypeOverloading.ts, 6, 3))
+>F : Symbol(F, Decl(intersectionTypeOverloading.ts, 0, 0))
+>G : Symbol(G, Decl(intersectionTypeOverloading.ts, 3, 31))
+
+var gf: G & F;
+>gf : Symbol(gf, Decl(intersectionTypeOverloading.ts, 7, 3))
+>G : Symbol(G, Decl(intersectionTypeOverloading.ts, 3, 31))
+>F : Symbol(F, Decl(intersectionTypeOverloading.ts, 0, 0))
+
+var x = fg("abc");
+>x : Symbol(x, Decl(intersectionTypeOverloading.ts, 9, 3), Decl(intersectionTypeOverloading.ts, 10, 3))
+>fg : Symbol(fg, Decl(intersectionTypeOverloading.ts, 6, 3))
+
+var x: string;
+>x : Symbol(x, Decl(intersectionTypeOverloading.ts, 9, 3), Decl(intersectionTypeOverloading.ts, 10, 3))
+
+var y = gf("abc");
+>y : Symbol(y, Decl(intersectionTypeOverloading.ts, 12, 3), Decl(intersectionTypeOverloading.ts, 13, 3))
+>gf : Symbol(gf, Decl(intersectionTypeOverloading.ts, 7, 3))
+
+var y: any;
+>y : Symbol(y, Decl(intersectionTypeOverloading.ts, 12, 3), Decl(intersectionTypeOverloading.ts, 13, 3))
+
diff --git a/tests/baselines/reference/intersectionTypeOverloading.types b/tests/baselines/reference/intersectionTypeOverloading.types
new file mode 100644
index 00000000000..c478b6a08cb
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeOverloading.types
@@ -0,0 +1,40 @@
+=== tests/cases/conformance/types/intersection/intersectionTypeOverloading.ts ===
+// Check that order is preserved in intersection types for purposes of
+// overload resolution
+
+type F = (s: string) => string;
+>F : (s: string) => string
+>s : string
+
+type G = (x: any) => any;
+>G : (x: any) => any
+>x : any
+
+var fg: F & G;
+>fg : ((s: string) => string) & ((x: any) => any)
+>F : (s: string) => string
+>G : (x: any) => any
+
+var gf: G & F;
+>gf : ((x: any) => any) & ((s: string) => string)
+>G : (x: any) => any
+>F : (s: string) => string
+
+var x = fg("abc");
+>x : string
+>fg("abc") : string
+>fg : ((s: string) => string) & ((x: any) => any)
+>"abc" : string
+
+var x: string;
+>x : string
+
+var y = gf("abc");
+>y : any
+>gf("abc") : any
+>gf : ((x: any) => any) & ((s: string) => string)
+>"abc" : string
+
+var y: any;
+>y : any
+
diff --git a/tests/cases/conformance/types/intersection/intersectionTypeOverloading.ts b/tests/cases/conformance/types/intersection/intersectionTypeOverloading.ts
new file mode 100644
index 00000000000..0a0d30d8dbb
--- /dev/null
+++ b/tests/cases/conformance/types/intersection/intersectionTypeOverloading.ts
@@ -0,0 +1,14 @@
+// Check that order is preserved in intersection types for purposes of
+// overload resolution
+
+type F = (s: string) => string;
+type G = (x: any) => any;
+
+var fg: F & G;
+var gf: G & F;
+
+var x = fg("abc");
+var x: string;
+
+var y = gf("abc");
+var y: any;