Address code review

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit 56f31c32660b · 2017-02-03T10:54:15.000-08:00
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt
@@ -40,7 +40,7 @@ tests/cases/conformance/types/contextualTypes/jsxAttributes/file.tsx(37,25): err
         return this._buildMainButton(props);
     }
     
-    const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
+    const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type "left" | "right"
                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ extra: true; onClick: (k: "left" | "right") => void; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.
 !!! error TS2322:   Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'.
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
@@ -26,7 +26,7 @@ export function MainButton(props: ButtonProps | LinkProps): JSX.Element {
     return this._buildMainButton(props);
 }
 
-const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
+const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type "left" | "right"
 const b2 = <MainButton onClick={(k)=>{console.log(k)}} extra />;  // k has type "left" | "right"
 const b3 = <MainButton {...{goTo:"home"}} extra />;  // goTo has type"home" | "contact"
 const b4 = <MainButton goTo="home" extra />;  // goTo has type "home" | "contact"
@@ -49,7 +49,7 @@ define(["require", "exports", "react"], function (require, exports, React) {
         return this._buildMainButton(props);
     }
     exports.MainButton = MainButton;
-    var b0 = <MainButton {...{ onClick: function (k) { console.log(k); } }} extra/>; // k has type any
+    var b0 = <MainButton {...{ onClick: function (k) { console.log(k); } }} extra/>; // k has type "left" | "right"
     var b2 = <MainButton onClick={function (k) { console.log(k); }} extra/>; // k has type "left" | "right"
     var b3 = <MainButton {...{ goTo: "home" }} extra/>; // goTo has type"home" | "contact"
     var b4 = <MainButton goTo="home" extra/>; // goTo has type "home" | "contact"
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution7.symbols
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.types b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
diff --git a/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx b/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx
@@ -30,7 +30,7 @@ export function MainButton(props: ButtonProps | LinkProps): JSX.Element {
     return this._buildMainButton(props);
 }
 
-const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
+const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type "left" | "right"
 const b2 = <MainButton onClick={(k)=>{console.log(k)}} extra />;  // k has type "left" | "right"
 const b3 = <MainButton {...{goTo:"home"}} extra />;  // goTo has type"home" | "contact"
 const b4 = <MainButton goTo="home" extra />;  // goTo has type "home" | "contact"
diff --git a/tests/cases/fourslash/tsxSignatureHelp2.ts b/tests/cases/fourslash/tsxSignatureHelp2.ts
@@ -31,7 +31,6 @@
 //// let e1 = <MainButton/*1*/ /*2*/
 
 goTo.marker("1");
-// The second overload is chosen because the first doesn't get selected by choose overload as it has incorrect arity
 verify.signatureHelpCountIs(2);
 verify.currentSignatureHelpIs("MainButton(buttonProps: ButtonProps): any");
 verify.currentParameterSpanIs("buttonProps: ButtonProps");

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ tests/cases/conformance/types/contextualTypes/jsxAttributes/file.tsx(37,25): err`
`40`	`40`	`return this._buildMainButton(props);`
`41`	`41`	`}`
`42`	`42`
`43`		`- const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />; // k has type any`
	`43`	`+ const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />; // k has type "left" \| "right"`
`44`	`44`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
`45`	`45`	`!!! error TS2322: Type '{ extra: true; onClick: (k: "left" \| "right") => void; }' is not assignable to type 'IntrinsicAttributes & LinkProps'.`
`46`	`46`	`!!! error TS2322: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'.`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export function MainButton(props: ButtonProps \| LinkProps): JSX.Element {`
`30`	`30`	`return this._buildMainButton(props);`
`31`	`31`	`}`
`32`	`32`
`33`		`-const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />; // k has type any`
	`33`	`+const b0 = <MainButton {...{onClick: (k) => {console.log(k)}}} extra />; // k has type "left" \| "right"`
`34`	`34`	`const b2 = <MainButton onClick={(k)=>{console.log(k)}} extra />; // k has type "left" \| "right"`
`35`	`35`	`const b3 = <MainButton {...{goTo:"home"}} extra />; // goTo has type"home" \| "contact"`
`36`	`36`	`const b4 = <MainButton goTo="home" extra />; // goTo has type "home" \| "contact"`