Improve test of jsdoc literal type parsing

sandersn · sandersn · commit 3f60364a64de · 2017-07-17T08:29:40.000-07:00
diff --git a/tests/baselines/reference/jsdocFunctionType.symbols b/tests/baselines/reference/jsdocFunctionType.symbols
@@ -61,9 +61,10 @@ z.length;
 >z : Symbol(z, Decl(functions.js, 26, 3))
 >length : Symbol(length, Decl(functions.js, 12, 27))
 
-/** @type {function ("a" | "b"): 1 | 2} */
-var f = function (s) { return s === "a" ? 1 : 2;  }
+/** @type {function ("a" | "b", 1 | 2): 3 | 4} */
+var f = function (ab, onetwo) { return ab === "a" ? 3 : 4;  }
 >f : Symbol(f, Decl(functions.js, 30, 3))
->s : Symbol(s, Decl(functions.js, 30, 18))
->s : Symbol(s, Decl(functions.js, 30, 18))
+>ab : Symbol(ab, Decl(functions.js, 30, 18))
+>onetwo : Symbol(onetwo, Decl(functions.js, 30, 21))
+>ab : Symbol(ab, Decl(functions.js, 30, 18))
 
diff --git a/tests/baselines/reference/jsdocFunctionType.types b/tests/baselines/reference/jsdocFunctionType.types
@@ -68,15 +68,16 @@ z.length;
 >z : { length: number; }
 >length : number
 
-/** @type {function ("a" | "b"): 1 | 2} */
-var f = function (s) { return s === "a" ? 1 : 2;  }
->f : (arg0: "a" | "b") => 1 | 2
->function (s) { return s === "a" ? 1 : 2;  } : (s: "a" | "b") => 1 | 2
->s : "a" | "b"
->s === "a" ? 1 : 2 : 1 | 2
->s === "a" : boolean
->s : "a" | "b"
+/** @type {function ("a" | "b", 1 | 2): 3 | 4} */
+var f = function (ab, onetwo) { return ab === "a" ? 3 : 4;  }
+>f : (arg0: "a" | "b", arg1: 1 | 2) => 3 | 4
+>function (ab, onetwo) { return ab === "a" ? 3 : 4;  } : (ab: "a" | "b", onetwo: 1 | 2) => 3 | 4
+>ab : "a" | "b"
+>onetwo : 1 | 2
+>ab === "a" ? 3 : 4 : 3 | 4
+>ab === "a" : boolean
+>ab : "a" | "b"
 >"a" : "a"
->1 : 1
->2 : 2
+>3 : 3
+>4 : 4
 
diff --git a/tests/cases/conformance/jsdoc/jsdocFunctionType.ts b/tests/cases/conformance/jsdoc/jsdocFunctionType.ts
@@ -34,5 +34,5 @@ var y = id2(C);
 var z = new y(12);
 z.length;
 
-/** @type {function ("a" | "b"): 1 | 2} */
-var f = function (s) { return s === "a" ? 1 : 2;  }
+/** @type {function ("a" | "b", 1 | 2): 3 | 4} */
+var f = function (ab, onetwo) { return ab === "a" ? 3 : 4;  }
