From fdded507cacfef8b267486576ad5cdaeaa46f85c Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 14 Dec 2017 14:27:03 -0800
Subject: [PATCH 1/7] Fix get symbol at location to behave correctly got
 parameter assignments and jsx attributes

---
 src/compiler/checker.ts                       | 51 ++++++++++++-------
 tests/baselines/reference/ES5For-of31.types   |  4 +-
 .../reference/checkJsxChildrenProperty1.types | 14 ++---
 .../checkJsxChildrenProperty13.types          |  2 +-
 .../checkJsxChildrenProperty14.types          | 20 ++++----
 .../reference/checkJsxChildrenProperty2.types | 30 +++++------
 .../reference/checkJsxChildrenProperty5.types | 12 ++---
 .../reference/checkJsxChildrenProperty6.types | 16 +++---
 .../reference/checkJsxChildrenProperty7.types | 12 ++---
 .../reference/checkJsxChildrenProperty8.types | 16 +++---
 ...structorWithIncompleteTypeAnnotation.types |  4 +-
 ...contextualTypeObjectSpreadExpression.types |  2 +-
 .../contextualTypeShouldBeLiteral.types       | 16 +++---
 .../contextualTypingOfOptionalMembers.types   |  2 +-
 ...ontextuallyTypedByDiscriminableUnion.types |  2 +-
 ...TypedStringLiteralsInJsxAttributes01.types |  8 +--
 ...TypedStringLiteralsInJsxAttributes02.types |  6 +--
 .../destructuredDeclarationEmit.types         |  4 +-
 .../discriminatedUnionErrorMessage.types      |  2 +-
 .../excessPropertyCheckWithUnions.types       | 28 +++++-----
 .../reference/jsxEmitWithAttributes.types     |  2 +-
 .../reference/jsxEsprimaFbTestSuite.types     | 24 ++++-----
 .../jsxFactoryAndReactNamespace.types         |  2 +-
 .../reference/jsxFactoryIdentifier.types      |  2 +-
 ...xFactoryNotIdentifierOrQualifiedName.types |  2 +-
 ...FactoryNotIdentifierOrQualifiedName2.types |  2 +-
 .../reference/jsxFactoryQualifiedName.types   |  2 +-
 .../jsxInvalidEsprimaTestSuite.types          |  6 +--
 .../jsxMultilineAttributeStringValues.types   |  4 +-
 .../jsxMultilineAttributeValuesReact.types    |  6 +--
 .../reference/jsxParsingError1.types          |  2 +-
 .../reference/jsxPropsAsIdentifierNames.types |  2 +-
 .../reference/jsxReactTestSuite.types         | 26 +++++-----
 .../reference/keywordInJsxIdentifier.types    |  4 +-
 .../literalIntersectionYieldsLiteral.types    |  2 +-
 tests/baselines/reference/literalTypes2.types | 16 +++---
 .../literalTypesAndTypeAssertions.types       |  2 +-
 .../reference/mappedTypeIndexedAccess.types   |  4 +-
 .../nestedTypeVariableInfersLiteral.types     |  4 +-
 .../baselines/reference/objectRestForOf.types |  2 +-
 .../reference/reactNamespaceJSXEmit.types     |  2 +-
 .../stringLiteralTypesAsTags01.types          |  2 +-
 .../stringLiteralTypesAsTags02.types          |  2 +-
 .../stringLiteralTypesAsTags03.types          |  2 +-
 .../reference/tsxAttributeErrors.types        |  8 +--
 ...ributeQuickinfoTypesSameAsObjectLiteral.js | 25 +++++++++
 ...eQuickinfoTypesSameAsObjectLiteral.symbols | 40 +++++++++++++++
 ...uteQuickinfoTypesSameAsObjectLiteral.types | 46 +++++++++++++++++
 .../reference/tsxAttributeResolution1.types   | 22 ++++----
 .../reference/tsxAttributeResolution10.types  |  6 +--
 .../reference/tsxAttributeResolution11.types  |  2 +-
 .../reference/tsxAttributeResolution14.types  | 10 ++--
 .../reference/tsxAttributeResolution15.types  |  4 +-
 .../reference/tsxAttributeResolution16.types  |  6 +--
 .../reference/tsxAttributeResolution3.types   |  6 +--
 .../reference/tsxAttributeResolution6.types   |  4 +-
 .../reference/tsxAttributeResolution7.types   |  8 +--
 .../reference/tsxAttributeResolution9.types   |  4 +-
 .../reference/tsxElementResolution.types      |  2 +-
 .../reference/tsxElementResolution10.types    |  6 +--
 .../reference/tsxElementResolution11.types    |  6 +--
 .../reference/tsxElementResolution12.types    | 10 ++--
 .../reference/tsxElementResolution13.types    |  2 +-
 .../reference/tsxElementResolution14.types    |  2 +-
 .../reference/tsxElementResolution15.types    |  2 +-
 .../reference/tsxElementResolution16.types    |  2 +-
 .../reference/tsxElementResolution18.types    |  2 +-
 .../reference/tsxElementResolution3.types     |  4 +-
 .../reference/tsxElementResolution4.types     |  6 +--
 .../reference/tsxElementResolution5.types     |  2 +-
 .../reference/tsxElementResolution6.types     |  2 +-
 .../reference/tsxElementResolution7.types     |  4 +-
 .../reference/tsxElementResolution9.types     |  2 +-
 .../tsxGenericArrowFunctionParsing.types      |  2 +-
 .../reference/tsxGenericAttributesType1.types |  4 +-
 .../reference/tsxGenericAttributesType2.types |  2 +-
 .../reference/tsxGenericAttributesType3.types |  2 +-
 .../reference/tsxGenericAttributesType4.types |  2 +-
 .../reference/tsxGenericAttributesType5.types |  2 +-
 .../reference/tsxGenericAttributesType6.types |  2 +-
 .../reference/tsxGenericAttributesType7.types |  2 +-
 .../reference/tsxInArrowFunction.types        |  8 +--
 ...sxInferenceShouldNotYieldAnyOnUnions.types |  6 +--
 ...ctComponentWithDefaultTypeParameter1.types |  4 +-
 ...ctComponentWithDefaultTypeParameter2.types |  2 +-
 ...ctComponentWithDefaultTypeParameter3.types |  6 +--
 tests/baselines/reference/tsxReactEmit4.types |  2 +-
 tests/baselines/reference/tsxReactEmit5.types |  4 +-
 tests/baselines/reference/tsxReactEmit6.types |  4 +-
 tests/baselines/reference/tsxReactEmit7.types | 18 +++----
 .../reference/tsxReactEmitEntities.types      |  6 +--
 .../reference/tsxReactEmitNesting.types       | 30 +++++------
 .../tsxSpreadAttributesResolution10.types     |  8 +--
 .../tsxSpreadAttributesResolution11.types     | 24 ++++-----
 .../tsxSpreadAttributesResolution12.types     | 18 +++----
 .../tsxSpreadAttributesResolution13.types     |  2 +-
 .../tsxSpreadAttributesResolution15.types     |  2 +-
 .../tsxSpreadAttributesResolution2.types      |  6 +--
 .../tsxSpreadAttributesResolution3.types      |  4 +-
 .../tsxSpreadAttributesResolution4.types      |  2 +-
 .../tsxSpreadAttributesResolution6.types      |  4 +-
 .../tsxSpreadAttributesResolution7.types      |  4 +-
 .../tsxSpreadAttributesResolution8.types      |  2 +-
 .../tsxSpreadAttributesResolution9.types      |  4 +-
 ...xStatelessFunctionComponentOverload1.types | 38 +++++++-------
 ...xStatelessFunctionComponentOverload2.types |  6 +--
 ...xStatelessFunctionComponentOverload3.types | 16 +++---
 ...xStatelessFunctionComponentOverload4.types | 24 ++++-----
 ...xStatelessFunctionComponentOverload5.types |  6 +--
 ...xStatelessFunctionComponentOverload6.types | 14 ++---
 ...onComponentWithDefaultTypeParameter1.types |  2 +-
 ...onComponentWithDefaultTypeParameter2.types |  2 +-
 .../tsxStatelessFunctionComponents1.types     | 16 +++---
 .../tsxStatelessFunctionComponents2.types     |  6 +--
 ...FunctionComponentsWithTypeArguments2.types |  2 +-
 ...FunctionComponentsWithTypeArguments3.types |  6 +--
 ...FunctionComponentsWithTypeArguments5.types |  8 +--
 tests/baselines/reference/tsxTypeErrors.types |  8 +--
 .../reference/tsxUnionElementType2.types      |  2 +-
 .../reference/tsxUnionElementType3.types      |  6 +--
 .../reference/tsxUnionElementType4.types      |  2 +-
 .../reference/tsxUnionElementType6.types      |  2 +-
 .../baselines/reference/tsxUnionSpread.types  |  4 +-
 ...ibuteQuickinfoTypesSameAsObjectLiteral.tsx | 19 +++++++
 124 files changed, 570 insertions(+), 427 deletions(-)
 create mode 100644 tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.js
 create mode 100644 tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.symbols
 create mode 100644 tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.types
 create mode 100644 tests/cases/compiler/tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index c1b57e5def701..581796e76d2d0 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4605,7 +4605,7 @@ namespace ts {
         // Here, the array literal [1, "one"] is contextually typed by the type [any, string], which is the implied type of the
         // binding pattern [x, s = ""]. Because the contextual type is a tuple type, the resulting type of [1, "one"] is the
         // tuple type [number, string]. Thus, the type inferred for 'x' is number and the type inferred for 's' is string.
-        function getWidenedTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration, reportErrors?: boolean): Type {
+        function getWidenedTypeForVariableLikeDeclaration(declaration: ParameterDeclaration | PropertyDeclaration | PropertySignature | VariableDeclaration | BindingElement, reportErrors?: boolean): Type {
             let type = getTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true);
             if (type) {
                 if (reportErrors) {
@@ -4613,21 +4613,15 @@ namespace ts {
                 }
 
                 // always widen a 'unique symbol' type if the type was created for a different declaration.
-                if (type.flags & TypeFlags.UniqueESSymbol && !declaration.type && type.symbol !== getSymbolOfNode(declaration)) {
+                if (type.flags & TypeFlags.UniqueESSymbol && (isBindingElement(declaration) || !declaration.type) && type.symbol !== getSymbolOfNode(declaration)) {
                     type = esSymbolType;
                 }
 
-                // During a normal type check we'll never get to here with a property assignment (the check of the containing
-                // object literal uses a different path). We exclude widening only so that language services and type verification
-                // tools see the actual type.
-                if (declaration.kind === SyntaxKind.PropertyAssignment) {
-                    return type;
-                }
                 return getWidenedType(type);
             }
 
             // Rest parameters default to type any[], other parameters default to type any
-            type = declaration.dotDotDotToken ? anyArrayType : anyType;
+            type = isParameter(declaration) && declaration.dotDotDotToken ? anyArrayType : anyType;
 
             // Report implicit any errors unless this is a private property within an ambient declaration
             if (reportErrors && noImplicitAny) {
@@ -4678,8 +4672,21 @@ namespace ts {
                     declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
                     type = getWidenedTypeFromJSSpecialPropertyDeclarations(symbol);
                 }
+                else if (isPropertyAssignment(declaration)) {
+                    type = checkPropertyAssignment(declaration);
+                }
+                else if (isJsxAttribute(declaration)) {
+                    type = checkJsxAttribute(declaration);
+                }
+                else if (isParameter(declaration)
+                    || isPropertyDeclaration(declaration)
+                    || isPropertySignature(declaration)
+                    || isVariableDeclaration(declaration)
+                    || isBindingElement(declaration)) {
+                    type = getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true);
+                }
                 else {
-                    type = getWidenedTypeForVariableLikeDeclaration(<VariableLikeDeclaration>declaration, /*reportErrors*/ true);
+                    Debug.fail("Unhandled declaration kind! " + (ts as any).SyntaxKind[declaration.kind]);
                 }
 
                 if (!popTypeResolution()) {
@@ -14802,6 +14809,12 @@ namespace ts {
             }
         }
 
+        function checkJsxAttribute(node: JsxAttribute, checkMode?: CheckMode) {
+            return node.initializer
+                ? checkExpression(node.initializer, checkMode)
+                : trueType;  // <Elem attr /> is sugar for <Elem attr={true} />
+        }
+
         /**
          * Get attributes type of the JSX opening-like element. The result is from resolving "attributes" property of the opening-like element.
          *
@@ -14824,9 +14837,7 @@ namespace ts {
             for (const attributeDecl of attributes.properties) {
                 const member = attributeDecl.symbol;
                 if (isJsxAttribute(attributeDecl)) {
-                    const exprType = attributeDecl.initializer ?
-                        checkExpression(attributeDecl.initializer, checkMode) :
-                        trueType;  // <Elem attr /> is sugar for <Elem attr={true} />
+                    const exprType = checkJsxAttribute(attributeDecl, checkMode);
 
                     const attributeSymbol = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
@@ -19773,7 +19784,7 @@ namespace ts {
             }
         }
 
-        function checkPropertyDeclaration(node: PropertyDeclaration) {
+        function checkPropertyDeclaration(node: PropertyDeclaration | PropertySignature) {
             // Grammar checking
             if (!checkGrammarDecoratorsAndModifiers(node) && !checkGrammarProperty(node)) checkGrammarComputedPropertyName(node.name);
             checkVariableLikeDeclaration(node);
@@ -21526,9 +21537,11 @@ namespace ts {
         }
 
         // Check variable, parameter, or property declaration
-        function checkVariableLikeDeclaration(node: VariableLikeDeclaration) {
+        function checkVariableLikeDeclaration(node: ParameterDeclaration | PropertyDeclaration | PropertySignature | VariableDeclaration | BindingElement) {
             checkDecorators(node);
-            checkSourceElement(node.type);
+            if (!isBindingElement(node)) {
+                checkSourceElement(node.type);
+            }
 
             // JSDoc `function(string, string): string` syntax results in parameters with no name
             if (!node.name) {
@@ -23693,7 +23706,7 @@ namespace ts {
                     return checkParameter(<ParameterDeclaration>node);
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
-                    return checkPropertyDeclaration(<PropertyDeclaration>node);
+                    return checkPropertyDeclaration(<PropertyDeclaration | PropertySignature>node);
                 case SyntaxKind.FunctionType:
                 case SyntaxKind.ConstructorType:
                 case SyntaxKind.CallSignature:
@@ -26482,7 +26495,7 @@ namespace ts {
             }
         }
 
-        function checkGrammarProperty(node: PropertyDeclaration) {
+        function checkGrammarProperty(node: PropertyDeclaration | PropertySignature) {
             if (isClassLike(node.parent)) {
                 if (checkGrammarForInvalidDynamicName(node.name, Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
@@ -26509,7 +26522,7 @@ namespace ts {
                 return grammarErrorOnFirstToken(node.initializer, Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
             }
 
-            if (node.exclamationToken && (!isClassLike(node.parent) || !node.type || node.initializer ||
+            if (isPropertyDeclaration(node) && node.exclamationToken && (!isClassLike(node.parent) || !node.type || node.initializer ||
                 node.flags & NodeFlags.Ambient || hasModifier(node, ModifierFlags.Static | ModifierFlags.Abstract))) {
                 return grammarErrorOnNode(node.exclamationToken, Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
             }
diff --git a/tests/baselines/reference/ES5For-of31.types b/tests/baselines/reference/ES5For-of31.types
index ee12f3894a8bb..309c8d1cab8c5 100644
--- a/tests/baselines/reference/ES5For-of31.types
+++ b/tests/baselines/reference/ES5For-of31.types
@@ -5,11 +5,11 @@ var a: string, b: number;
 
 for ({ a: b = 1, b: a = ""} of []) {
 >{ a: b = 1, b: a = ""} : { a?: number; b?: string; }
->a : undefined
+>a : number
 >b = 1 : 1
 >b : number
 >1 : 1
->b : undefined
+>b : string
 >a = "" : ""
 >a : string
 >"" : ""
diff --git a/tests/baselines/reference/checkJsxChildrenProperty1.types b/tests/baselines/reference/checkJsxChildrenProperty1.types
index 821f95d9ae71b..bf304e3fcd8a0 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty1.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty1.types
@@ -36,10 +36,10 @@ let k = <Comp a={10} b="hi" children ="lol" />;
 >k : JSX.Element
 ><Comp a={10} b="hi" children ="lol" /> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
->children : string
+>b : "hi"
+>children : "lol"
 
 let k1 =
 >k1 : JSX.Element
@@ -47,9 +47,9 @@ let k1 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        hi hi hi!    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         hi hi hi!
     </Comp>;
@@ -61,9 +61,9 @@ let k2 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <div>hi hi hi!</div>    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         <div>hi hi hi!</div>
 ><div>hi hi hi!</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty13.types b/tests/baselines/reference/checkJsxChildrenProperty13.types
index 10d3876ae6350..5360d78cda4b0 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.types
@@ -34,7 +34,7 @@ class Button extends React.Component<ButtonProp, any> {
 >this.props : ButtonProp & { children?: React.ReactNode; }
 >this : this
 >props : ButtonProp & { children?: React.ReactNode; }
->children : string
+>children : "hi"
 
             <div>Hello World</div>
 ><div>Hello World</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.types b/tests/baselines/reference/checkJsxChildrenProperty14.types
index a0d9797934c9f..2033637751523 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.types
@@ -65,9 +65,9 @@ let k1 = <Comp a={10} b="hi"><></><Button /><AnotherButton /></Comp>;
 >k1 : JSX.Element
 ><Comp a={10} b="hi"><></><Button /><AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
@@ -79,9 +79,9 @@ let k2 = <Comp a={10} b="hi"><><Button /></><AnotherButton /></Comp>;
 >k2 : JSX.Element
 ><Comp a={10} b="hi"><><Button /></><AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><><Button /></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
@@ -93,9 +93,9 @@ let k3 = <Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp>;
 >k3 : JSX.Element
 ><Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><><Button /><AnotherButton /></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
@@ -137,9 +137,9 @@ let k4 = <SingleChildComp a={10} b="hi"><><Button /><AnotherButton /></></Single
 >k4 : JSX.Element
 ><SingleChildComp a={10} b="hi"><><Button /><AnotherButton /></></SingleChildComp> : JSX.Element
 >SingleChildComp : (p: SingleChildProp) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><><Button /><AnotherButton /></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
@@ -152,9 +152,9 @@ let k5 = <SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></Single
 >k5 : JSX.Element
 ><SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></SingleChildComp> : JSX.Element
 >SingleChildComp : (p: SingleChildProp) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.types b/tests/baselines/reference/checkJsxChildrenProperty2.types
index 2817c1709bdc6..4e4b99988f63d 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.types
@@ -36,9 +36,9 @@ let k = <Comp a={10} b="hi" />;
 >k : JSX.Element
 ><Comp a={10} b="hi" /> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
 let k0 =
 >k0 : JSX.Element
@@ -46,10 +46,10 @@ let k0 =
     <Comp a={10} b="hi" children="Random" >
 ><Comp a={10} b="hi" children="Random" >        hi hi hi!    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
->children : string
+>b : "hi"
+>children : "Random"
 
         hi hi hi!
     </Comp>;
@@ -69,9 +69,9 @@ let k1 =
     <Comp a={10} b="hi" {...o} >
 ><Comp a={10} b="hi" {...o} >        hi hi hi!    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 >o : { children: string; }
 
         hi hi hi!
@@ -85,9 +85,9 @@ let k2 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <div> My Div </div>        {(name: string) => <div> My name {name} </div>}    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         <div> My Div </div>
 ><div> My Div </div> : JSX.Element
@@ -111,9 +111,9 @@ let k3 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <div> My Div </div>        {1000000}    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         <div> My Div </div>
 ><div> My Div </div> : JSX.Element
@@ -132,9 +132,9 @@ let k4 =
     <Comp a={10} b="hi" >
 ><Comp a={10} b="hi" >        <div> My Div </div>        hi hi hi!    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         <div> My Div </div>
 ><div> My Div </div> : JSX.Element
@@ -151,9 +151,9 @@ let k5 =
     <Comp a={10} b="hi" >
 ><Comp a={10} b="hi" >        <div> My Div </div>        <div> My Div </div>    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         <div> My Div </div>
 ><div> My Div </div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.types b/tests/baselines/reference/checkJsxChildrenProperty5.types
index 9535d280b3363..39d0a46755fc4 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.types
@@ -52,9 +52,9 @@ let k = <Comp a={10} b="hi" />;
 >k : JSX.Element
 ><Comp a={10} b="hi" /> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
 // Error: JSX.element is not the same as JSX.ElementClass
 let k1 =
@@ -63,9 +63,9 @@ let k1 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <Button />    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         <Button />
 ><Button /> : JSX.Element
@@ -80,9 +80,9 @@ let k2 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        {Button}    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         {Button}
 >Button : typeof Button
diff --git a/tests/baselines/reference/checkJsxChildrenProperty6.types b/tests/baselines/reference/checkJsxChildrenProperty6.types
index f9af32072d279..22e117f41cdec 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.types
@@ -67,9 +67,9 @@ let k1 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <Button />        <AnotherButton />    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
         <Button />
 ><Button /> : JSX.Element
@@ -88,9 +88,9 @@ let k2 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">                     <Button />        <AnotherButton />    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
      
     
     
@@ -109,9 +109,9 @@ let k3 = <Comp a={10} b="hi"><Button />
 >k3 : JSX.Element
 ><Comp a={10} b="hi"><Button />  <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 
@@ -126,9 +126,9 @@ let k4 = <Comp a={10} b="hi"><Button /></Comp>;
 >k4 : JSX.Element
 ><Comp a={10} b="hi"><Button /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 >Comp : (p: Prop) => JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.types b/tests/baselines/reference/checkJsxChildrenProperty7.types
index b34183db881ef..d010e56660cda 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.types
@@ -65,9 +65,9 @@ let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
 >k1 : JSX.Element
 ><Comp a={10} b="hi"><Button />  <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 ><AnotherButton /> : JSX.Element
@@ -78,9 +78,9 @@ let k2 = <Comp a={10} b="hi"><Button />
 >k2 : JSX.Element
 ><Comp a={10} b="hi"><Button />    <AnotherButton />  </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 
@@ -93,9 +93,9 @@ let k3 = <Comp a={10} b="hi">    <Button />
 >k3 : JSX.Element
 ><Comp a={10} b="hi">    <Button />    <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty8.types b/tests/baselines/reference/checkJsxChildrenProperty8.types
index 39d94bae72060..5effcc4e7f67b 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.types
@@ -65,9 +65,9 @@ let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
 >k1 : JSX.Element
 ><Comp a={10} b="hi"><Button />  <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 ><AnotherButton /> : JSX.Element
@@ -78,9 +78,9 @@ let k2 = <Comp a={10} b="hi"><Button />
 >k2 : JSX.Element
 ><Comp a={10} b="hi"><Button />    <AnotherButton />  </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 
@@ -93,9 +93,9 @@ let k3 = <Comp a={10} b="hi">    <Button />
 >k3 : JSX.Element
 ><Comp a={10} b="hi">    <Button />    <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 
@@ -108,9 +108,9 @@ let k4 = <Comp a={10} b="hi"><Button />  </Comp>;
 >k4 : JSX.Element
 ><Comp a={10} b="hi"><Button />  </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 ><Button /> : JSX.Element
 >Button : typeof Button
 >Comp : (p: Prop) => JSX.Element
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index d8217600a66e1..d1b7c98087feb 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -475,9 +475,9 @@ module TypeScriptAllInOne {
             for (var x in { x: 0, y: 1 }) {
 >x : string
 >{ x: 0, y: 1 } : { x: number; y: number; }
->x : string
+>x : number
 >0 : 0
->y : string
+>y : number
 >1 : 1
 
              ! 
diff --git a/tests/baselines/reference/contextualTypeObjectSpreadExpression.types b/tests/baselines/reference/contextualTypeObjectSpreadExpression.types
index 98b700b019a43..6f7a11c4290f7 100644
--- a/tests/baselines/reference/contextualTypeObjectSpreadExpression.types
+++ b/tests/baselines/reference/contextualTypeObjectSpreadExpression.types
@@ -14,6 +14,6 @@ i = { ...{ a: "a" } };
 >i : I
 >{ ...{ a: "a" } } : { a: "a"; }
 >{ a: "a" } : { a: "a"; }
->a : string
+>a : "a"
 >"a" : "a"
 
diff --git a/tests/baselines/reference/contextualTypeShouldBeLiteral.types b/tests/baselines/reference/contextualTypeShouldBeLiteral.types
index 8ab09df66b832..5ab0c26d84627 100644
--- a/tests/baselines/reference/contextualTypeShouldBeLiteral.types
+++ b/tests/baselines/reference/contextualTypeShouldBeLiteral.types
@@ -37,11 +37,11 @@ foo({
 >{    type: 'y',    value: 'done',    method() {        this;        this.type;        this.value;    }} : { type: "y"; value: "done"; method(): void; }
 
     type: 'y',
->type : string
+>type : "y"
 >'y' : "y"
 
     value: 'done',
->value : string
+>value : "done"
 >'done' : "done"
 
     method() {
@@ -100,11 +100,11 @@ foo2({
 >{    type2: 'y',    value: 'done',    method() {        this;        this.value;    }} : { type2: "y"; value: "done"; method(): void; }
 
     type2: 'y',
->type2 : string
+>type2 : "y"
 >'y' : "y"
 
     value: 'done',
->value : string
+>value : "done"
 >'done' : "done"
 
     method() {
@@ -153,11 +153,11 @@ let xy: X3 | Y3 = {
 >{    type: 'y',    value: 11,    ytra: 12} : { type: "y"; value: 11; ytra: number; }
 
     type: 'y',
->type : string
+>type : "y"
 >'y' : "y"
 
     value: 11,
->value : number
+>value : 11
 >11 : 11
 
     ytra: 12
@@ -209,11 +209,11 @@ let xyz: LikeA | LikeB = {
 >{    x: 'x',    y: 'y',    value: "foo",    method() {        this;        this.x;        this.y;        this.value;    }} : { x: "x"; y: "y"; value: string; method(): void; }
 
     x: 'x',
->x : string
+>x : "x"
 >'x' : "x"
 
     y: 'y',
->y : string
+>y : "y"
 >'y' : "y"
 
     value: "foo",
diff --git a/tests/baselines/reference/contextualTypingOfOptionalMembers.types b/tests/baselines/reference/contextualTypingOfOptionalMembers.types
index 515685f5c534d..7606bf55c2c64 100644
--- a/tests/baselines/reference/contextualTypingOfOptionalMembers.types
+++ b/tests/baselines/reference/contextualTypingOfOptionalMembers.types
@@ -252,7 +252,7 @@ const a = <App4 state={100} foo={s => s} />; // TODO: should be number => number
 >a : JSX.Element
 ><App4 state={100} foo={s => s} /> : JSX.Element
 >App4 : <State, Actions extends ActionsObjectOr<State>>(props: (string & { state: State; }) | (Actions & { state: State; })) => JSX.Element
->state : number
+>state : 100
 >100 : 100
 >foo : (s: any) => any
 >s => s : (s: any) => any
diff --git a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
index d62dc4b5e0c8a..92f3fe42e128d 100644
--- a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
+++ b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
@@ -55,7 +55,7 @@ invoke({
 >{    kind: "a",    method(a) {        return +a;    }} : { kind: "a"; method(a: string): number; }
 
     kind: "a",
->kind : string
+>kind : "a"
 >"a" : "a"
 
     method(a) {
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.types b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.types
index 209c6fb2306a2..bdbd45392e85c 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.types
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.types
@@ -31,22 +31,22 @@ const FooComponent = (props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</spa
 <FooComponent foo={"A"} />;
 ><FooComponent foo={"A"} /> : JSX.Element
 >FooComponent : (props: { foo: "A" | "B" | "C"; }) => JSX.Element
->foo : string
+>foo : "A"
 >"A" : "A"
 
 <FooComponent foo="A"   />;
 ><FooComponent foo="A"   /> : JSX.Element
 >FooComponent : (props: { foo: "A" | "B" | "C"; }) => JSX.Element
->foo : string
+>foo : "A"
 
 <FooComponent foo={"f"} />;
 ><FooComponent foo={"f"} /> : JSX.Element
 >FooComponent : (props: { foo: "A" | "B" | "C"; }) => JSX.Element
->foo : string
+>foo : "f"
 >"f" : "f"
 
 <FooComponent foo="f"   />;
 ><FooComponent foo="f"   /> : JSX.Element
 >FooComponent : (props: { foo: "A" | "B" | "C"; }) => JSX.Element
->foo : string
+>foo : "f"
 
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
index 570ae48509e80..08920e2a74064 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
@@ -112,7 +112,7 @@ const b3 = <MainButton {...{goTo:"home"}} extra />;  // goTo has type"home" | "c
 ><MainButton {...{goTo:"home"}} extra /> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; }
 >{goTo:"home"} : { goTo: "home"; }
->goTo : string
+>goTo : "home"
 >"home" : "home"
 >extra : true
 
@@ -120,7 +120,7 @@ const b4 = <MainButton goTo="home" extra />;  // goTo has type "home" | "contact
 >b4 : JSX.Element
 ><MainButton goTo="home" extra /> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; }
->goTo : string
+>goTo : "home"
 >extra : true
 
 export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined }
@@ -159,7 +159,7 @@ const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" |
 ><NoOverload1 {...{goTo:"home"}} extra  /> : JSX.Element
 >NoOverload1 : (linkProps: LinkProps) => JSX.Element
 >{goTo:"home"} : { goTo: "home"; }
->goTo : string
+>goTo : "home"
 >"home" : "home"
 >extra : true
 
diff --git a/tests/baselines/reference/destructuredDeclarationEmit.types b/tests/baselines/reference/destructuredDeclarationEmit.types
index 94845f94885be..c3bdad1bc9c40 100644
--- a/tests/baselines/reference/destructuredDeclarationEmit.types
+++ b/tests/baselines/reference/destructuredDeclarationEmit.types
@@ -29,10 +29,10 @@ const arr: [0, 1, 2, ['a', 'b', 'c', [{def: 'def'}, {sec: 'sec'}]]] = [0, 1, 2,
 >'c' : "c"
 >[{def: 'def'}, {sec: 'sec'}] : [{ def: "def"; }, { sec: "sec"; }]
 >{def: 'def'} : { def: "def"; }
->def : string
+>def : "def"
 >'def' : "def"
 >{sec: 'sec'} : { sec: "sec"; }
->sec : string
+>sec : "sec"
 >'sec' : "sec"
 
 export { foo, arr };
diff --git a/tests/baselines/reference/discriminatedUnionErrorMessage.types b/tests/baselines/reference/discriminatedUnionErrorMessage.types
index 7fb553f37a19f..0c56c1ffd254f 100644
--- a/tests/baselines/reference/discriminatedUnionErrorMessage.types
+++ b/tests/baselines/reference/discriminatedUnionErrorMessage.types
@@ -33,7 +33,7 @@ let shape: Shape = {
 >{    kind: "sq",    x: 12,    y: 13,} : { kind: "sq"; x: number; y: number; }
 
     kind: "sq",
->kind : string
+>kind : "sq"
 >"sq" : "sq"
 
     x: 12,
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.types b/tests/baselines/reference/excessPropertyCheckWithUnions.types
index c2086b90dae01..4ef53e35ecc5a 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.types
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.types
@@ -23,7 +23,7 @@ let wrong: ADT = { tag: "T", a1: "extra" }
 >wrong : ADT
 >ADT : ADT
 >{ tag: "T", a1: "extra" } : { tag: "T"; a1: string; }
->tag : string
+>tag : "T"
 >"T" : "T"
 >a1 : string
 >"extra" : "extra"
@@ -32,7 +32,7 @@ wrong = { tag: "A", d20: 12 }
 >wrong = { tag: "A", d20: 12 } : { tag: "A"; d20: number; }
 >wrong : ADT
 >{ tag: "A", d20: 12 } : { tag: "A"; d20: number; }
->tag : string
+>tag : "A"
 >"A" : "A"
 >d20 : number
 >12 : 12
@@ -41,7 +41,7 @@ wrong = { tag: "D" }
 >wrong = { tag: "D" } : { tag: "D"; }
 >wrong : ADT
 >{ tag: "D" } : { tag: "D"; }
->tag : string
+>tag : "D"
 >"D" : "D"
 
 type Ambiguous = {
@@ -80,7 +80,7 @@ amb = { tag: "A", x: "hi" }
 >amb = { tag: "A", x: "hi" } : { tag: "A"; x: string; }
 >amb : Ambiguous
 >{ tag: "A", x: "hi" } : { tag: "A"; x: string; }
->tag : string
+>tag : "A"
 >"A" : "A"
 >x : string
 >"hi" : "hi"
@@ -89,7 +89,7 @@ amb = { tag: "A", y: 12 }
 >amb = { tag: "A", y: 12 } : { tag: "A"; y: number; }
 >amb : Ambiguous
 >{ tag: "A", y: 12 } : { tag: "A"; y: number; }
->tag : string
+>tag : "A"
 >"A" : "A"
 >y : number
 >12 : 12
@@ -98,7 +98,7 @@ amb = { tag: "A", x: "hi", y: 12 }
 >amb = { tag: "A", x: "hi", y: 12 } : { tag: "A"; x: string; y: number; }
 >amb : Ambiguous
 >{ tag: "A", x: "hi", y: 12 } : { tag: "A"; x: string; y: number; }
->tag : string
+>tag : "A"
 >"A" : "A"
 >x : string
 >"hi" : "hi"
@@ -110,7 +110,7 @@ amb = { tag: "A", x: "hi", extra: 12 }
 >amb = { tag: "A", x: "hi", extra: 12 } : { tag: "A"; x: string; extra: number; }
 >amb : Ambiguous
 >{ tag: "A", x: "hi", extra: 12 } : { tag: "A"; x: string; extra: number; }
->tag : string
+>tag : "A"
 >"A" : "A"
 >x : string
 >"hi" : "hi"
@@ -121,7 +121,7 @@ amb = { tag: "A", y: 12, extra: 12 }
 >amb = { tag: "A", y: 12, extra: 12 } : { tag: "A"; y: number; extra: number; }
 >amb : Ambiguous
 >{ tag: "A", y: 12, extra: 12 } : { tag: "A"; y: number; extra: number; }
->tag : string
+>tag : "A"
 >"A" : "A"
 >y : number
 >12 : 12
@@ -135,14 +135,14 @@ amb = { tag: "A" }
 >amb = { tag: "A" } : { tag: "A"; }
 >amb : Ambiguous
 >{ tag: "A" } : { tag: "A"; }
->tag : string
+>tag : "A"
 >"A" : "A"
 
 amb = { tag: "A", z: true }
 >amb = { tag: "A", z: true } : { tag: "A"; z: boolean; }
 >amb : Ambiguous
 >{ tag: "A", z: true } : { tag: "A"; z: boolean; }
->tag : string
+>tag : "A"
 >"A" : "A"
 >z : boolean
 >true : true
@@ -172,9 +172,9 @@ over = { a: 1, b: 1, first: "ok", second: "error" }
 >over = { a: 1, b: 1, first: "ok", second: "error" } : { a: 1; b: 1; first: string; second: string; }
 >over : Overlapping
 >{ a: 1, b: 1, first: "ok", second: "error" } : { a: 1; b: 1; first: string; second: string; }
->a : number
+>a : 1
 >1 : 1
->b : number
+>b : 1
 >1 : 1
 >first : string
 >"ok" : "ok"
@@ -185,9 +185,9 @@ over = { a: 1, b: 1, first: "ok", third: "error" }
 >over = { a: 1, b: 1, first: "ok", third: "error" } : { a: 1; b: 1; first: string; third: string; }
 >over : Overlapping
 >{ a: 1, b: 1, first: "ok", third: "error" } : { a: 1; b: 1; first: string; third: string; }
->a : number
+>a : 1
 >1 : 1
->b : number
+>b : 1
 >1 : 1
 >first : string
 >"ok" : "ok"
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.types b/tests/baselines/reference/jsxEmitWithAttributes.types
index 044b65222a906..e6848260d2650 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.types
+++ b/tests/baselines/reference/jsxEmitWithAttributes.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : string
+>content : "helloworld"
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxEsprimaFbTestSuite.types b/tests/baselines/reference/jsxEsprimaFbTestSuite.types
index f36758fb7d325..b8cbac4e6ce30 100644
--- a/tests/baselines/reference/jsxEsprimaFbTestSuite.types
+++ b/tests/baselines/reference/jsxEsprimaFbTestSuite.types
@@ -31,19 +31,19 @@ declare var props;
 <a b={" "} c=" " d="&amp;" e="id=1&group=2" f="&#123456789" g="&#123*;" h="&#x;" />;
 ><a b={" "} c=" " d="&amp;" e="id=1&group=2" f="&#123456789" g="&#123*;" h="&#x;" /> : any
 >a : any
->b : string
+>b : " "
 >" " : " "
->c : string
->d : string
->e : string
->f : string
->g : string
->h : string
+>c : " "
+>d : "&amp;"
+>e : "id=1&group=2"
+>f : "&#123456789"
+>g : "&#123*;"
+>h : "&#x;"
 
 <a b="&notanentity;" />;
 ><a b="&notanentity;" /> : any
 >a : any
->b : string
+>b : "&notanentity;"
 
 <a
 ><a/> : any
@@ -61,7 +61,7 @@ declare var props;
 >AbC_def : any
 
   test="&#x0026;&#38;">
->test : string
+>test : "&#x0026;&#38;"
 
 bar
 baz
@@ -155,13 +155,13 @@ baz
 ><div {...props} post="attribute" /> : any
 >div : any
 >props : any
->post : string
+>post : "attribute"
 
 <div pre="leading" pre2="attribute" {...props}></div>;
 ><div pre="leading" pre2="attribute" {...props}></div> : any
 >div : any
->pre : string
->pre2 : string
+>pre : "leading"
+>pre2 : "attribute"
 >props : any
 >div : any
 
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.types b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
index 044b65222a906..e6848260d2650 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.types
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : string
+>content : "helloworld"
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.types b/tests/baselines/reference/jsxFactoryIdentifier.types
index f6faa0784cd46..1797abfea2354 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.types
+++ b/tests/baselines/reference/jsxFactoryIdentifier.types
@@ -119,7 +119,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : string
+>content : "helloworld"
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
index 044b65222a906..e6848260d2650 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : string
+>content : "helloworld"
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
index 044b65222a906..e6848260d2650 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : string
+>content : "helloworld"
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.types b/tests/baselines/reference/jsxFactoryQualifiedName.types
index 044b65222a906..e6848260d2650 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : string
+>content : "helloworld"
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.types b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.types
index 0791b6d9e855b..f289abe412e49 100644
--- a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.types
+++ b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.types
@@ -50,7 +50,7 @@ declare var React: any;
 <a foo="bar;
 ><a foo="bar; : any
 >a : any
->foo : string
+>foo : "bar;"
 
 === tests/cases/conformance/jsx/8.tsx ===
 <a:b></b>;
@@ -195,8 +195,8 @@ var x = <div>one</div> /* intervening comment */ <div>two</div>;;
 <span className="a", id="b" />;
 ><span className="a", id="b" /> : any
 >span : any
->className : string
->id : string
+>className : "a"
+>id : "b"
 
 === tests/cases/conformance/jsx/22.tsx ===
 <div className"app">;
diff --git a/tests/baselines/reference/jsxMultilineAttributeStringValues.types b/tests/baselines/reference/jsxMultilineAttributeStringValues.types
index b9e1b99267f49..6a47bb2fe1b00 100644
--- a/tests/baselines/reference/jsxMultilineAttributeStringValues.types
+++ b/tests/baselines/reference/jsxMultilineAttributeStringValues.types
@@ -3,7 +3,7 @@ const a = <input value="
 >a : any
 ><input value="  foo: 23"></input> : any
 >input : any
->value : string
+>value : "\n  foo: 23\n"
 
   foo: 23
 "></input>;
@@ -13,7 +13,7 @@ const b = <input value='
 >b : any
 ><input value='foo: 23'></input> : any
 >input : any
->value : string
+>value : "\nfoo: 23\n"
 
 foo: 23
 '></input>;
diff --git a/tests/baselines/reference/jsxMultilineAttributeValuesReact.types b/tests/baselines/reference/jsxMultilineAttributeValuesReact.types
index 2d5dd820b2176..5e024cb2c7761 100644
--- a/tests/baselines/reference/jsxMultilineAttributeValuesReact.types
+++ b/tests/baselines/reference/jsxMultilineAttributeValuesReact.types
@@ -6,7 +6,7 @@ const a = <input value="
 >a : any
 ><input value="foo: 23"></input> : any
 >input : any
->value : string
+>value : "\nfoo: 23\n"
 
 foo: 23
 "></input>;
@@ -16,7 +16,7 @@ const b = <input value='
 >b : any
 ><input value='foo: 23'></input> : any
 >input : any
->value : string
+>value : "\nfoo: 23\n"
 
 foo: 23
 '></input>;
@@ -26,7 +26,7 @@ const c = <input value='
 >c : any
 ><input value='foo: 23\n'></input> : any
 >input : any
->value : string
+>value : "\nfoo: 23\\n\n"
 
 foo: 23\n
 '></input>;
diff --git a/tests/baselines/reference/jsxParsingError1.types b/tests/baselines/reference/jsxParsingError1.types
index 5047237043d4a..a693a6d048203 100644
--- a/tests/baselines/reference/jsxParsingError1.types
+++ b/tests/baselines/reference/jsxParsingError1.types
@@ -26,7 +26,7 @@ const elem = <div className={class1, class2}/>;
 >elem : JSX.Element
 ><div className={class1, class2 : JSX.Element
 >div : any
->className : string
+>className : "foo"
 >class1 : "foo"
 >class2 : true
 >/>; : RegExp
diff --git a/tests/baselines/reference/jsxPropsAsIdentifierNames.types b/tests/baselines/reference/jsxPropsAsIdentifierNames.types
index 1d52871b41943..5b7fb7954316f 100644
--- a/tests/baselines/reference/jsxPropsAsIdentifierNames.types
+++ b/tests/baselines/reference/jsxPropsAsIdentifierNames.types
@@ -20,6 +20,6 @@ declare namespace JSX {
 export default <div static={true} />;
 ><div static={true} /> : any
 >div : any
->static : boolean
+>static : true
 >true : true
 
diff --git a/tests/baselines/reference/jsxReactTestSuite.types b/tests/baselines/reference/jsxReactTestSuite.types
index 28ed2e5960adf..a342a3ff75667 100644
--- a/tests/baselines/reference/jsxReactTestSuite.types
+++ b/tests/baselines/reference/jsxReactTestSuite.types
@@ -153,7 +153,7 @@ var x =
       // Extra line here.
     }
     attr4="baz">
->attr4 : string
+>attr4 : "baz"
 
   </div>;
 >div : any
@@ -197,14 +197,14 @@ var x =
     /* a multi-line
        comment */
     attr1="foo">
->attr1 : string
+>attr1 : "foo"
 
     <span // a double-slash comment
 ><span // a double-slash comment      attr2="bar"    /> : any
 >span : any
 
       attr2="bar"
->attr2 : string
+>attr2 : "bar"
 
     />
   </div>
@@ -230,7 +230,7 @@ var x =
 <Component constructor="foo" />;
 ><Component constructor="foo" /> : any
 >Component : any
->constructor : string
+>constructor : "foo"
 
 <Namespace.Component />;
 ><Namespace.Component /> : any
@@ -250,7 +250,7 @@ var x =
 ><Component { ... x } y={2 } z /> : any
 >Component : any
 >x : any
->y : number
+>y : 2
 
 ={2 } z />;
 >2 : 2
@@ -264,7 +264,7 @@ var x =
 >this.props : any
 >this : any
 >props : any
->sound : string
+>sound : "moo"
 
 <font-face />;
 ><font-face /> : any
@@ -289,21 +289,21 @@ var x =
 ><Component { ...x } y={2} /> : any
 >Component : any
 >x : any
->y : number
+>y : 2
 >2 : 2
 
 <Component { ... x } y={2} z />;
 ><Component { ... x } y={2} z /> : any
 >Component : any
 >x : any
->y : number
+>y : 2
 >2 : 2
 >z : true
 
 <Component x={1} {...y} />;
 ><Component x={1} {...y} /> : any
 >Component : any
->x : number
+>x : 1
 >1 : 1
 >y : any
 
@@ -311,9 +311,9 @@ var x =
 <Component x={1} y="2" {...z} {...z}><Child /></Component>;
 ><Component x={1} y="2" {...z} {...z}><Child /></Component> : any
 >Component : any
->x : number
+>x : 1
 >1 : 1
->y : string
+>y : "2"
 >z : any
 >z : any
 ><Child /> : any
@@ -323,7 +323,7 @@ var x =
 <Component x="1" {...(z = { y: 2 }, z)} z={3}>Text</Component>;
 ><Component x="1" {...(z = { y: 2 }, z)} z={3}>Text</Component> : any
 >Component : any
->x : string
+>x : "1"
 >(z = { y: 2 }, z) : any
 >z = { y: 2 }, z : any
 >z = { y: 2 } : { y: number; }
@@ -332,7 +332,7 @@ var x =
 >y : number
 >2 : 2
 >z : any
->z : number
+>z : 3
 >3 : 3
 >Component : any
 
diff --git a/tests/baselines/reference/keywordInJsxIdentifier.types b/tests/baselines/reference/keywordInJsxIdentifier.types
index 09ae09340de5e..fc308414acb6b 100644
--- a/tests/baselines/reference/keywordInJsxIdentifier.types
+++ b/tests/baselines/reference/keywordInJsxIdentifier.types
@@ -15,10 +15,10 @@ declare var React: any;
 <foo class-id="1"/>;
 ><foo class-id="1"/> : any
 >foo : any
->class-id : string
+>class-id : "1"
 
 <foo class="1"/>;
 ><foo class="1"/> : any
 >foo : any
->class : string
+>class : "1"
 
diff --git a/tests/baselines/reference/literalIntersectionYieldsLiteral.types b/tests/baselines/reference/literalIntersectionYieldsLiteral.types
index b169a19aef8f6..81eb311a5a2a0 100644
--- a/tests/baselines/reference/literalIntersectionYieldsLiteral.types
+++ b/tests/baselines/reference/literalIntersectionYieldsLiteral.types
@@ -4,6 +4,6 @@ const x: { type: string } & { type: "string" } = { type: "string" };
 >type : string
 >type : "string"
 >{ type: "string" } : { type: "string"; }
->type : string
+>type : "string"
 >"string" : "string"
 
diff --git a/tests/baselines/reference/literalTypes2.types b/tests/baselines/reference/literalTypes2.types
index b2ec339490fc6..85775fb06e3ef 100644
--- a/tests/baselines/reference/literalTypes2.types
+++ b/tests/baselines/reference/literalTypes2.types
@@ -262,7 +262,7 @@ function f3() {
 >c6 : { kind: 123; }
 >kind : 123
 >{ kind: 123 } : { kind: 123; }
->kind : number
+>kind : 123
 >123 : 123
 
     const c7: [1 | 2, "foo" | "bar"] = [1, "bar"];
@@ -412,9 +412,9 @@ function f4() {
 >a : 0 | 1
 >b : "foo" | "bar"
 >{ a: 1, b: "foo" } : { a: 1; b: "foo"; }
->a : number
+>a : 1
 >1 : 1
->b : string
+>b : "foo"
 >"foo" : "foo"
 
     let x1 = { a: 1, b: "foo" };
@@ -430,9 +430,9 @@ function f4() {
 >a : 0 | 1
 >b : "foo" | "bar"
 >{ a: 1, b: "foo" } : { a: 1; b: "foo"; }
->a : number
+>a : 1
 >1 : 1
->b : string
+>b : "foo"
 >"foo" : "foo"
 }
 
@@ -487,11 +487,11 @@ function f6() {
 >c3 : "foo" | "bar"
 >"foo" : "foo"
 >{ c1: false, c2: 1, c3: "bar" } : { c1?: false; c2?: 1; c3?: "bar"; }
->c1 : boolean
+>c1 : false
 >false : false
->c2 : number
+>c2 : 1
 >1 : 1
->c3 : string
+>c3 : "bar"
 >"bar" : "bar"
 
     let { x1 = true, x2 = 0, x3 = "foo" } = { x1: false, x2: 1, x3: "bar" };
diff --git a/tests/baselines/reference/literalTypesAndTypeAssertions.types b/tests/baselines/reference/literalTypesAndTypeAssertions.types
index 4c38f74fd723c..1730c0ac42091 100644
--- a/tests/baselines/reference/literalTypesAndTypeAssertions.types
+++ b/tests/baselines/reference/literalTypesAndTypeAssertions.types
@@ -40,7 +40,7 @@ let { b = "foo" as "foo" } = { b: "bar" };
 >"foo" as "foo" : "foo"
 >"foo" : "foo"
 >{ b: "bar" } : { b?: "bar"; }
->b : string
+>b : "bar"
 >"bar" : "bar"
 
 let { c = "foo" } = { c: "bar" as "bar" };
diff --git a/tests/baselines/reference/mappedTypeIndexedAccess.types b/tests/baselines/reference/mappedTypeIndexedAccess.types
index 345636b86ca3c..03335c7b49c71 100644
--- a/tests/baselines/reference/mappedTypeIndexedAccess.types
+++ b/tests/baselines/reference/mappedTypeIndexedAccess.types
@@ -47,7 +47,7 @@ let pair1: Pair<FooBar> = {
 >{    key: "foo",    value: 3} : { key: "foo"; value: number; }
 
     key: "foo",
->key : string
+>key : "foo"
 >"foo" : "foo"
 
     value: 3
@@ -65,7 +65,7 @@ let pair2: Pairs<FooBar>[keyof FooBar] = {
 >{    key: "foo",    value: 3} : { key: "foo"; value: number; }
 
     key: "foo",
->key : string
+>key : "foo"
 >"foo" : "foo"
 
     value: 3
diff --git a/tests/baselines/reference/nestedTypeVariableInfersLiteral.types b/tests/baselines/reference/nestedTypeVariableInfersLiteral.types
index ed52dbb41b5b3..f93e367584760 100644
--- a/tests/baselines/reference/nestedTypeVariableInfersLiteral.types
+++ b/tests/baselines/reference/nestedTypeVariableInfersLiteral.types
@@ -47,7 +47,7 @@ const nestedSingle = nested({fields: "z"})
 >nested({fields: "z"}) : Record<"z", string>
 >nested : <A extends string>(a: { fields: A; }) => Record<A, string>
 >{fields: "z"} : { fields: "z"; }
->fields : string
+>fields : "z"
 >"z" : "z"
 
 const nestedUnionSingle = nestedUnion({fields: "z"})
@@ -55,7 +55,7 @@ const nestedUnionSingle = nestedUnion({fields: "z"})
 >nestedUnion({fields: "z"}) : Record<"z", string>
 >nestedUnion : <A extends string>(a: { fields: A | A[]; }) => Record<A, string>
 >{fields: "z"} : { fields: "z"; }
->fields : string
+>fields : "z"
 >"z" : "z"
 
 const nestedUnionArray = nestedUnion({fields: ["z", "y"]})
diff --git a/tests/baselines/reference/objectRestForOf.types b/tests/baselines/reference/objectRestForOf.types
index 43d42a045e182..30e10999bc78e 100644
--- a/tests/baselines/reference/objectRestForOf.types
+++ b/tests/baselines/reference/objectRestForOf.types
@@ -23,7 +23,7 @@ let rrestOff: { y: string };
 
 for ({ x: xx, ...rrestOff } of array ) {
 >{ x: xx, ...rrestOff } : { y: string; x: number; }
->x : { x: number; y: string; }
+>x : number
 >xx : number
 >rrestOff : { y: string; }
 >array : { x: number; y: string; }[]
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.types b/tests/baselines/reference/reactNamespaceJSXEmit.types
index e1d76dbfcec51..c30c132071244 100644
--- a/tests/baselines/reference/reactNamespaceJSXEmit.types
+++ b/tests/baselines/reference/reactNamespaceJSXEmit.types
@@ -38,7 +38,7 @@ declare var x: any;
 ><Bar { ...x } y={2} /> : any
 >Bar : any
 >x : any
->y : number
+>y : 2
 >2 : 2
 
 <_Bar { ...x } />;
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.types b/tests/baselines/reference/stringLiteralTypesAsTags01.types
index 6caf851a72648..d7245af4978dd 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags01.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags01.types
@@ -78,7 +78,7 @@ let x: A = {
 >{    kind: "A",    a: 100,} : { kind: "A"; a: number; }
 
     kind: "A",
->kind : string
+>kind : "A"
 >"A" : "A"
 
     a: 100,
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.types b/tests/baselines/reference/stringLiteralTypesAsTags02.types
index f90ea6c6a0645..13b5235050230 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags02.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags02.types
@@ -72,7 +72,7 @@ let x: A = {
 >{    kind: "A",    a: 100,} : { kind: "A"; a: number; }
 
     kind: "A",
->kind : string
+>kind : "A"
 >"A" : "A"
 
     a: 100,
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.types b/tests/baselines/reference/stringLiteralTypesAsTags03.types
index 64622e28ac828..54b9b30453531 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags03.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags03.types
@@ -75,7 +75,7 @@ let x: A = {
 >{    kind: "A",    a: 100,} : { kind: "A"; a: number; }
 
     kind: "A",
->kind : string
+>kind : "A"
 >"A" : "A"
 
     a: 100,
diff --git a/tests/baselines/reference/tsxAttributeErrors.types b/tests/baselines/reference/tsxAttributeErrors.types
index a18afcbbc7315..cb28f6cda7ebe 100644
--- a/tests/baselines/reference/tsxAttributeErrors.types
+++ b/tests/baselines/reference/tsxAttributeErrors.types
@@ -27,14 +27,14 @@ declare namespace JSX {
 <div text={42} />;
 ><div text={42} /> : JSX.Element
 >div : any
->text : number
+>text : 42
 >42 : 42
 
 // Error, string is not assignable to number
 <div width={'foo'} />;
 ><div width={'foo'} /> : JSX.Element
 >div : any
->width : string
+>width : "foo"
 >'foo' : "foo"
 
 // Error, number is not assignable to string
@@ -53,7 +53,7 @@ var attribs = { text: 100 };
 <span foo='bar' bar={'foo'} />;
 ><span foo='bar' bar={'foo'} /> : JSX.Element
 >span : any
->foo : string
->bar : string
+>foo : "bar"
+>bar : "foo"
 >'foo' : "foo"
 
diff --git a/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.js b/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.js
new file mode 100644
index 0000000000000..cbd8ab48feadf
--- /dev/null
+++ b/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.js
@@ -0,0 +1,25 @@
+//// [tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx]
+namespace JSX {
+    export interface IntrinsicElements {
+        span: {};
+    }
+    export interface Element {
+		something?: any;
+    }
+}
+
+const Foo = (props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</span>;
+
+Foo({
+    foo: "B"
+});
+
+<Foo foo="B" />
+
+
+//// [tsxAttributeQuickinfoTypesSameAsObjectLiteral.jsx]
+var Foo = function (props) { return <span>{props.foo}</span>; };
+Foo({
+    foo: "B"
+});
+<Foo foo="B"/>;
diff --git a/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.symbols b/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.symbols
new file mode 100644
index 0000000000000..b531b689c1c47
--- /dev/null
+++ b/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.symbols
@@ -0,0 +1,40 @@
+=== tests/cases/compiler/tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx ===
+namespace JSX {
+>JSX : Symbol(JSX, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 0, 0))
+
+    export interface IntrinsicElements {
+>IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 0, 15))
+
+        span: {};
+>span : Symbol(IntrinsicElements.span, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 1, 40))
+    }
+    export interface Element {
+>Element : Symbol(Element, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 3, 5))
+
+		something?: any;
+>something : Symbol(Element.something, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 4, 30))
+    }
+}
+
+const Foo = (props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</span>;
+>Foo : Symbol(Foo, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 9, 5))
+>props : Symbol(props, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 9, 13))
+>foo : Symbol(foo, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 9, 21))
+>span : Symbol(JSX.IntrinsicElements.span, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 1, 40))
+>props.foo : Symbol(foo, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 9, 21))
+>props : Symbol(props, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 9, 13))
+>foo : Symbol(foo, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 9, 21))
+>span : Symbol(JSX.IntrinsicElements.span, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 1, 40))
+
+Foo({
+>Foo : Symbol(Foo, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 9, 5))
+
+    foo: "B"
+>foo : Symbol(foo, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 11, 5))
+
+});
+
+<Foo foo="B" />
+>Foo : Symbol(Foo, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 9, 5))
+>foo : Symbol(foo, Decl(tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx, 15, 4))
+
diff --git a/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.types b/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.types
new file mode 100644
index 0000000000000..5c3dc77c7eedf
--- /dev/null
+++ b/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.types
@@ -0,0 +1,46 @@
+=== tests/cases/compiler/tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx ===
+namespace JSX {
+>JSX : any
+
+    export interface IntrinsicElements {
+>IntrinsicElements : IntrinsicElements
+
+        span: {};
+>span : {}
+    }
+    export interface Element {
+>Element : Element
+
+		something?: any;
+>something : any
+    }
+}
+
+const Foo = (props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</span>;
+>Foo : (props: { foo: "A" | "B" | "C"; }) => JSX.Element
+>(props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</span> : (props: { foo: "A" | "B" | "C"; }) => JSX.Element
+>props : { foo: "A" | "B" | "C"; }
+>foo : "A" | "B" | "C"
+><span>{props.foo}</span> : JSX.Element
+>span : any
+>props.foo : "A" | "B" | "C"
+>props : { foo: "A" | "B" | "C"; }
+>foo : "A" | "B" | "C"
+>span : any
+
+Foo({
+>Foo({    foo: "B"}) : JSX.Element
+>Foo : (props: { foo: "A" | "B" | "C"; }) => JSX.Element
+>{    foo: "B"} : { foo: "B"; }
+
+    foo: "B"
+>foo : "B"
+>"B" : "B"
+
+});
+
+<Foo foo="B" />
+><Foo foo="B" /> : JSX.Element
+>Foo : (props: { foo: "A" | "B" | "C"; }) => JSX.Element
+>foo : "B"
+
diff --git a/tests/baselines/reference/tsxAttributeResolution1.types b/tests/baselines/reference/tsxAttributeResolution1.types
index 7fe9aa12b657b..fb1521ba78850 100644
--- a/tests/baselines/reference/tsxAttributeResolution1.types
+++ b/tests/baselines/reference/tsxAttributeResolution1.types
@@ -35,7 +35,7 @@ interface Attribs1 {
 <test1 x={0} />; // OK
 ><test1 x={0} /> : JSX.Element
 >test1 : any
->x : number
+>x : 0
 >0 : 0
 
 <test1 />; // OK
@@ -45,47 +45,47 @@ interface Attribs1 {
 <test1 data-x={true} />; // OK
 ><test1 data-x={true} /> : JSX.Element
 >test1 : any
->data-x : boolean
+>data-x : true
 >true : true
 
 <test2 reqd='true' />; // OK
 ><test2 reqd='true' /> : JSX.Element
 >test2 : any
->reqd : string
+>reqd : "true"
 
 <test2 reqd={'true'} />; // OK
 ><test2 reqd={'true'} /> : JSX.Element
 >test2 : any
->reqd : string
+>reqd : "true"
 >'true' : "true"
 
 // Errors
 <test1 x={'0'} />; // Error, '0' is not number
 ><test1 x={'0'} /> : JSX.Element
 >test1 : any
->x : string
+>x : "0"
 >'0' : "0"
 
 <test1 y={0} />; // Error, no property "y"
 ><test1 y={0} /> : JSX.Element
 >test1 : any
->y : number
+>y : 0
 >0 : 0
 
 <test1 y="foo" />; // Error, no property "y"
 ><test1 y="foo" /> : JSX.Element
 >test1 : any
->y : string
+>y : "foo"
 
 <test1 x="32" />; // Error, "32" is not number
 ><test1 x="32" /> : JSX.Element
 >test1 : any
->x : string
+>x : "32"
 
 <test1 var="10" />; // Error, no 'var' property
 ><test1 var="10" /> : JSX.Element
 >test1 : any
->var : string
+>var : "10"
 
 <test2 />; // Error, missing reqd
 ><test2 /> : JSX.Element
@@ -94,12 +94,12 @@ interface Attribs1 {
 <test2 reqd={10} />; // Error, reqd is not string
 ><test2 reqd={10} /> : JSX.Element
 >test2 : any
->reqd : number
+>reqd : 10
 >10 : 10
 
 // Should be OK
 <var var='var' />;
 ><var var='var' /> : JSX.Element
 >var : any
->var : string
+>var : "var"
 
diff --git a/tests/baselines/reference/tsxAttributeResolution10.types b/tests/baselines/reference/tsxAttributeResolution10.types
index 2dbb56bc12c75..4f2e08f36e3bb 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.types
+++ b/tests/baselines/reference/tsxAttributeResolution10.types
@@ -36,18 +36,18 @@ export class MyComponent {
 <MyComponent bar='world' />;
 ><MyComponent bar='world' /> : JSX.Element
 >MyComponent : typeof MyComponent
->bar : string
+>bar : "world"
 
 // Should be OK
 <MyComponent bar={true} />;
 ><MyComponent bar={true} /> : JSX.Element
 >MyComponent : typeof MyComponent
->bar : boolean
+>bar : true
 >true : true
 
 // Should be ok
 <MyComponent data-bar='hello' />;
 ><MyComponent data-bar='hello' /> : JSX.Element
 >MyComponent : typeof MyComponent
->data-bar : string
+>data-bar : "hello"
 
diff --git a/tests/baselines/reference/tsxAttributeResolution11.types b/tests/baselines/reference/tsxAttributeResolution11.types
index 307a1a130a207..b441d1202c011 100644
--- a/tests/baselines/reference/tsxAttributeResolution11.types
+++ b/tests/baselines/reference/tsxAttributeResolution11.types
@@ -43,6 +43,6 @@ var x = <MyComponent bar='world' />;
 >x : JSX.Element
 ><MyComponent bar='world' /> : JSX.Element
 >MyComponent : typeof MyComponent
->bar : string
+>bar : "world"
 
 
diff --git a/tests/baselines/reference/tsxAttributeResolution14.types b/tests/baselines/reference/tsxAttributeResolution14.types
index 0887ab3124186..a48f09e94a19d 100644
--- a/tests/baselines/reference/tsxAttributeResolution14.types
+++ b/tests/baselines/reference/tsxAttributeResolution14.types
@@ -51,23 +51,23 @@ function VerticalNav() {
       <VerticalNavMenuItem primaryText={2} />  // error
 ><VerticalNavMenuItem primaryText={2} /> : JSX.Element
 >VerticalNavMenuItem : (prop: IProps) => JSX.Element
->primaryText : number
+>primaryText : 2
 >2 : 2
 
       <VerticalNavMenuItem justRandomProp={2} primaryText={"hello"} />  // ok
 ><VerticalNavMenuItem justRandomProp={2} primaryText={"hello"} /> : JSX.Element
 >VerticalNavMenuItem : (prop: IProps) => JSX.Element
->justRandomProp : number
+>justRandomProp : 2
 >2 : 2
->primaryText : string
+>primaryText : "hello"
 >"hello" : "hello"
 
       <VerticalNavMenuItem justRandomProp1={true} primaryText={"hello"} />  // error
 ><VerticalNavMenuItem justRandomProp1={true} primaryText={"hello"} /> : JSX.Element
 >VerticalNavMenuItem : (prop: IProps) => JSX.Element
->justRandomProp1 : boolean
+>justRandomProp1 : true
 >true : true
->primaryText : string
+>primaryText : "hello"
 >"hello" : "hello"
 
     </div>
diff --git a/tests/baselines/reference/tsxAttributeResolution15.types b/tests/baselines/reference/tsxAttributeResolution15.types
index b95dcffcaf7bb..87b9b0c3cd8d1 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.types
+++ b/tests/baselines/reference/tsxAttributeResolution15.types
@@ -25,7 +25,7 @@ let a = <BigGreeter prop1="hello" />
 >a : JSX.Element
 ><BigGreeter prop1="hello" /> : JSX.Element
 >BigGreeter : typeof BigGreeter
->prop1 : string
+>prop1 : "hello"
 
 // OK
 let b = <BigGreeter ref={(input) => { this.textInput = input; }} />
@@ -45,5 +45,5 @@ let c = <BigGreeter data-extra="hi" />
 >c : JSX.Element
 ><BigGreeter data-extra="hi" /> : JSX.Element
 >BigGreeter : typeof BigGreeter
->data-extra : string
+>data-extra : "hi"
 
diff --git a/tests/baselines/reference/tsxAttributeResolution16.types b/tests/baselines/reference/tsxAttributeResolution16.types
index c7f13ca509691..9ac70198864a4 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.types
+++ b/tests/baselines/reference/tsxAttributeResolution16.types
@@ -52,7 +52,7 @@ let a = <AddressComp postalCode='T1B 0L3' street="vancouver" country="CA" />
 >a : JSX.Element
 ><AddressComp postalCode='T1B 0L3' street="vancouver" country="CA" /> : JSX.Element
 >AddressComp : typeof AddressComp
->postalCode : string
->street : string
->country : string
+>postalCode : "T1B 0L3"
+>street : "vancouver"
+>country : "CA"
 
diff --git a/tests/baselines/reference/tsxAttributeResolution3.types b/tests/baselines/reference/tsxAttributeResolution3.types
index c7148398dab49..47abfb504f83c 100644
--- a/tests/baselines/reference/tsxAttributeResolution3.types
+++ b/tests/baselines/reference/tsxAttributeResolution3.types
@@ -75,7 +75,7 @@ var obj4 = { x: 32, y: 32 };
 ><test1 {...obj4} x="ok" /> : JSX.Element
 >test1 : any
 >obj4 : { x: number; y: number; }
->x : string
+>x : "ok"
 
 // Error
 var obj5 = { x: 32, y: 32 };
@@ -89,7 +89,7 @@ var obj5 = { x: 32, y: 32 };
 <test1 x="ok" {...obj5} />
 ><test1 x="ok" {...obj5} /> : JSX.Element
 >test1 : any
->x : string
+>x : "ok"
 >obj5 : { x: number; y: number; }
 
 // Ok
@@ -118,7 +118,7 @@ var obj7 = { x: 'foo' };
 <test1 x={32} {...obj7} />
 ><test1 x={32} {...obj7} /> : JSX.Element
 >test1 : any
->x : number
+>x : 32
 >32 : 32
 >obj7 : { x: string; }
 
diff --git a/tests/baselines/reference/tsxAttributeResolution6.types b/tests/baselines/reference/tsxAttributeResolution6.types
index c5aeafa81d639..fdbaa535cab87 100644
--- a/tests/baselines/reference/tsxAttributeResolution6.types
+++ b/tests/baselines/reference/tsxAttributeResolution6.types
@@ -28,7 +28,7 @@ declare module JSX {
 <test1 n='true' />;
 ><test1 n='true' /> : JSX.Element
 >test1 : any
->n : string
+>n : "true"
 
 <test2 />;
 ><test2 /> : JSX.Element
@@ -43,7 +43,7 @@ declare module JSX {
 <test1 n={false} />;
 ><test1 n={false} /> : JSX.Element
 >test1 : any
->n : boolean
+>n : false
 >false : false
 
 <test2 n />;
diff --git a/tests/baselines/reference/tsxAttributeResolution7.types b/tests/baselines/reference/tsxAttributeResolution7.types
index 257d423a41eb8..c421327afc846 100644
--- a/tests/baselines/reference/tsxAttributeResolution7.types
+++ b/tests/baselines/reference/tsxAttributeResolution7.types
@@ -17,25 +17,25 @@ declare module JSX {
 <test1 data-foo={32} />;
 ><test1 data-foo={32} /> : JSX.Element
 >test1 : any
->data-foo : number
+>data-foo : 32
 >32 : 32
 
 // OK
 <test1 data-foo={'32'} />;
 ><test1 data-foo={'32'} /> : JSX.Element
 >test1 : any
->data-foo : string
+>data-foo : "32"
 >'32' : "32"
 
 <test1 data-bar={'32'} />;
 ><test1 data-bar={'32'} /> : JSX.Element
 >test1 : any
->data-bar : string
+>data-bar : "32"
 >'32' : "32"
 
 <test1 data-bar={32} />;
 ><test1 data-bar={32} /> : JSX.Element
 >test1 : any
->data-bar : number
+>data-bar : 32
 >32 : 32
 
diff --git a/tests/baselines/reference/tsxAttributeResolution9.types b/tests/baselines/reference/tsxAttributeResolution9.types
index 8e7b5f2fe6155..1952f5606950a 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.types
+++ b/tests/baselines/reference/tsxAttributeResolution9.types
@@ -39,11 +39,11 @@ export class MyComponent {
 <MyComponent foo="bar" />; // ok  
 ><MyComponent foo="bar" /> : JSX.Element
 >MyComponent : typeof MyComponent
->foo : string
+>foo : "bar"
 
 <MyComponent foo={0} />; // should be an error
 ><MyComponent foo={0} /> : JSX.Element
 >MyComponent : typeof MyComponent
->foo : number
+>foo : 0
 >0 : 0
 
diff --git a/tests/baselines/reference/tsxElementResolution.types b/tests/baselines/reference/tsxElementResolution.types
index df429d1c54dcf..ba70fb21d39ec 100644
--- a/tests/baselines/reference/tsxElementResolution.types
+++ b/tests/baselines/reference/tsxElementResolution.types
@@ -32,7 +32,7 @@ var a = <foundFirst  x="hello" />;
 >a : any
 ><foundFirst  x="hello" /> : any
 >foundFirst : typeof foundFirst
->x : string
+>x : "hello"
 
 var b = <string_named />;
 >b : any
diff --git a/tests/baselines/reference/tsxElementResolution10.types b/tests/baselines/reference/tsxElementResolution10.types
index a8209774dcfd1..bdc45b9399401 100644
--- a/tests/baselines/reference/tsxElementResolution10.types
+++ b/tests/baselines/reference/tsxElementResolution10.types
@@ -29,7 +29,7 @@ var Obj1: Obj1type;
 <Obj1 x={10} />; // Error, no render member
 ><Obj1 x={10} /> : JSX.Element
 >Obj1 : Obj1type
->x : number
+>x : 10
 >10 : 10
 
 interface Obj2type {
@@ -47,8 +47,8 @@ var Obj2: Obj2type;
 <Obj2 x={32} render={100} />; // OK
 ><Obj2 x={32} render={100} /> : JSX.Element
 >Obj2 : Obj2type
->x : number
+>x : 32
 >32 : 32
->render : number
+>render : 100
 >100 : 100
 
diff --git a/tests/baselines/reference/tsxElementResolution11.types b/tests/baselines/reference/tsxElementResolution11.types
index 81f41aff7b636..f2b07ddd8e3f7 100644
--- a/tests/baselines/reference/tsxElementResolution11.types
+++ b/tests/baselines/reference/tsxElementResolution11.types
@@ -25,7 +25,7 @@ var Obj1: Obj1type;
 <Obj1 x={10} />; // OK
 ><Obj1 x={10} /> : JSX.Element
 >Obj1 : Obj1type
->x : number
+>x : 10
 >10 : 10
 
 interface Obj2type {
@@ -42,7 +42,7 @@ var Obj2: Obj2type;
 <Obj2 x={10} />; // Error
 ><Obj2 x={10} /> : JSX.Element
 >Obj2 : Obj2type
->x : number
+>x : 10
 >10 : 10
 
 interface Obj3type {
@@ -59,6 +59,6 @@ var Obj3: Obj3type;
 <Obj3 x={10} />; // OK
 ><Obj3 x={10} /> : JSX.Element
 >Obj3 : Obj3type
->x : number
+>x : 10
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution12.types b/tests/baselines/reference/tsxElementResolution12.types
index 855130cf8cc50..a310d993cb493 100644
--- a/tests/baselines/reference/tsxElementResolution12.types
+++ b/tests/baselines/reference/tsxElementResolution12.types
@@ -26,7 +26,7 @@ var Obj1: Obj1type;
 <Obj1 x={10} />; // OK
 ><Obj1 x={10} /> : JSX.Element
 >Obj1 : Obj1type
->x : number
+>x : 10
 >10 : 10
 
 interface Obj2type {
@@ -44,7 +44,7 @@ var Obj2: Obj2type;
 <Obj2 x={10} />; // OK
 ><Obj2 x={10} /> : JSX.Element
 >Obj2 : Obj2type
->x : number
+>x : 10
 >10 : 10
 
 interface Obj3type {
@@ -61,7 +61,7 @@ var Obj3: Obj3type;
 <Obj3 x={10} />; // Error
 ><Obj3 x={10} /> : JSX.Element
 >Obj3 : Obj3type
->x : number
+>x : 10
 >10 : 10
 
 var attributes: any;
@@ -93,12 +93,12 @@ var Obj4: Obj4type;
 <Obj4 x={10} />; // OK
 ><Obj4 x={10} /> : JSX.Element
 >Obj4 : Obj4type
->x : number
+>x : 10
 >10 : 10
 
 <Obj4 x={'10'} />; // Error
 ><Obj4 x={'10'} /> : JSX.Element
 >Obj4 : Obj4type
->x : string
+>x : "10"
 >'10' : "10"
 
diff --git a/tests/baselines/reference/tsxElementResolution13.types b/tests/baselines/reference/tsxElementResolution13.types
index b2a6e54633ab4..4bae4b06586c8 100644
--- a/tests/baselines/reference/tsxElementResolution13.types
+++ b/tests/baselines/reference/tsxElementResolution13.types
@@ -24,6 +24,6 @@ var obj1: Obj1;
 <obj1 x={10} />; // Error
 ><obj1 x={10} /> : JSX.Element
 >obj1 : Obj1
->x : number
+>x : 10
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution14.types b/tests/baselines/reference/tsxElementResolution14.types
index a6e8cc5283475..7d06fa2b3018d 100644
--- a/tests/baselines/reference/tsxElementResolution14.types
+++ b/tests/baselines/reference/tsxElementResolution14.types
@@ -19,6 +19,6 @@ var obj1: Obj1;
 <obj1 x={10} />; // OK
 ><obj1 x={10} /> : JSX.Element
 >obj1 : Obj1
->x : number
+>x : 10
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution15.types b/tests/baselines/reference/tsxElementResolution15.types
index 43fc60a38765b..b7ba416e8e1c8 100644
--- a/tests/baselines/reference/tsxElementResolution15.types
+++ b/tests/baselines/reference/tsxElementResolution15.types
@@ -27,6 +27,6 @@ var Obj1: Obj1type;
 <Obj1 x={10} />; // Error
 ><Obj1 x={10} /> : JSX.Element
 >Obj1 : Obj1type
->x : number
+>x : 10
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution16.types b/tests/baselines/reference/tsxElementResolution16.types
index cb2d483ad43ed..0c8323184ef8f 100644
--- a/tests/baselines/reference/tsxElementResolution16.types
+++ b/tests/baselines/reference/tsxElementResolution16.types
@@ -16,6 +16,6 @@ var obj1: Obj1;
 <obj1 x={10} />; // Error (JSX.Element is implicit any)
 ><obj1 x={10} /> : any
 >obj1 : Obj1
->x : number
+>x : 10
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution18.types b/tests/baselines/reference/tsxElementResolution18.types
index e236bbbb10885..1b787ad3e1f51 100644
--- a/tests/baselines/reference/tsxElementResolution18.types
+++ b/tests/baselines/reference/tsxElementResolution18.types
@@ -10,5 +10,5 @@ declare module JSX {
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : string
+>n : "x"
 
diff --git a/tests/baselines/reference/tsxElementResolution3.types b/tests/baselines/reference/tsxElementResolution3.types
index 84db9327ae56d..8a45cd00a79ef 100644
--- a/tests/baselines/reference/tsxElementResolution3.types
+++ b/tests/baselines/reference/tsxElementResolution3.types
@@ -18,11 +18,11 @@ declare module JSX {
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : string
+>n : "x"
 
 // Error
 <span w='err' />;
 ><span w='err' /> : JSX.Element
 >span : any
->w : string
+>w : "err"
 
diff --git a/tests/baselines/reference/tsxElementResolution4.types b/tests/baselines/reference/tsxElementResolution4.types
index f8f4faf308824..6ddff265b662d 100644
--- a/tests/baselines/reference/tsxElementResolution4.types
+++ b/tests/baselines/reference/tsxElementResolution4.types
@@ -22,17 +22,17 @@ declare module JSX {
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : string
+>n : "x"
 
 // OK
 <span m='ok' />;
 ><span m='ok' /> : JSX.Element
 >span : any
->m : string
+>m : "ok"
 
 // Error
 <span q='' />;
 ><span q='' /> : JSX.Element
 >span : any
->q : string
+>q : ""
 
diff --git a/tests/baselines/reference/tsxElementResolution5.types b/tests/baselines/reference/tsxElementResolution5.types
index cd2f3d2633784..b9f4c2ba76793 100644
--- a/tests/baselines/reference/tsxElementResolution5.types
+++ b/tests/baselines/reference/tsxElementResolution5.types
@@ -10,5 +10,5 @@ declare module JSX {
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : string
+>n : "x"
 
diff --git a/tests/baselines/reference/tsxElementResolution6.types b/tests/baselines/reference/tsxElementResolution6.types
index db99201381ca8..192eadfbd312e 100644
--- a/tests/baselines/reference/tsxElementResolution6.types
+++ b/tests/baselines/reference/tsxElementResolution6.types
@@ -16,5 +16,5 @@ var div: any;
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : string
+>n : "x"
 
diff --git a/tests/baselines/reference/tsxElementResolution7.types b/tests/baselines/reference/tsxElementResolution7.types
index 208e65361d879..1c93677c63e4c 100644
--- a/tests/baselines/reference/tsxElementResolution7.types
+++ b/tests/baselines/reference/tsxElementResolution7.types
@@ -21,7 +21,7 @@ module my {
 >my.div : any
 >my : typeof my
 >div : any
->n : string
+>n : "x"
 
 // Error
 <my.other />;
@@ -43,7 +43,7 @@ module q {
 >mine.div : any
 >mine : typeof mine
 >div : any
->n : string
+>n : "x"
 
     // Error
     <mine.non />;
diff --git a/tests/baselines/reference/tsxElementResolution9.types b/tests/baselines/reference/tsxElementResolution9.types
index 4d9fb4e73e9fa..6a5e29f6f393d 100644
--- a/tests/baselines/reference/tsxElementResolution9.types
+++ b/tests/baselines/reference/tsxElementResolution9.types
@@ -67,6 +67,6 @@ var Obj3: Obj3;
 <Obj3 x={42} />; // OK
 ><Obj3 x={42} /> : JSX.Element
 >Obj3 : Obj3
->x : number
+>x : 42
 >42 : 42
 
diff --git a/tests/baselines/reference/tsxGenericArrowFunctionParsing.types b/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
index 0e601daecafa9..ddc05a809e9f2 100644
--- a/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
+++ b/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
@@ -50,7 +50,7 @@ var x4 = <T extends={true}>() => {}</T>;
 >x4 : JSX.Element
 ><T extends={true}>() => {}</T> : JSX.Element
 >T : any
->extends : boolean
+>extends : true
 >true : true
 >T : any
 
diff --git a/tests/baselines/reference/tsxGenericAttributesType1.types b/tests/baselines/reference/tsxGenericAttributesType1.types
index 50be358302ea6..281e20b29949c 100644
--- a/tests/baselines/reference/tsxGenericAttributesType1.types
+++ b/tests/baselines/reference/tsxGenericAttributesType1.types
@@ -43,7 +43,7 @@ const decorator2 = function <T extends { x: number }>(Component: React.Stateless
 ><Component {...props} x={2} ></Component> : JSX.Element
 >Component : React.StatelessComponent<T>
 >props : T & { children?: React.ReactNode; }
->x : number
+>x : 2
 >2 : 2
 >Component : React.StatelessComponent<T>
 
@@ -69,7 +69,7 @@ const decorator3 = function <T extends { x: number }, U extends { x: number } >(
 >props : T & { children?: React.ReactNode; }
 ><Component x={2} {...props} ></Component> : JSX.Element
 >Component : React.StatelessComponent<T>
->x : number
+>x : 2
 >2 : 2
 >props : T & { children?: React.ReactNode; }
 >Component : React.StatelessComponent<T>
diff --git a/tests/baselines/reference/tsxGenericAttributesType2.types b/tests/baselines/reference/tsxGenericAttributesType2.types
index 19c2e2ce03304..d20a4a44cd5e5 100644
--- a/tests/baselines/reference/tsxGenericAttributesType2.types
+++ b/tests/baselines/reference/tsxGenericAttributesType2.types
@@ -21,7 +21,7 @@ const decorator4 = function <T extends { x: number }>(Component: React.Stateless
 ><Component {...props} y={"blah"} ></Component> : JSX.Element
 >Component : React.StatelessComponent<T>
 >props : T & { children?: React.ReactNode; }
->y : string
+>y : "blah"
 >"blah" : "blah"
 >Component : React.StatelessComponent<T>
 
diff --git a/tests/baselines/reference/tsxGenericAttributesType3.types b/tests/baselines/reference/tsxGenericAttributesType3.types
index 72674ac5bf763..d0a942f8f1d6b 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.types
+++ b/tests/baselines/reference/tsxGenericAttributesType3.types
@@ -38,6 +38,6 @@ class B<U> extends React.Component<U, {}> {
 >this.props : U & { children?: React.ReactNode; }
 >this : this
 >props : U & { children?: React.ReactNode; }
->x : string
+>x : "hi"
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType4.types b/tests/baselines/reference/tsxGenericAttributesType4.types
index ede5a874a42db..5de36a2762c05 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.types
+++ b/tests/baselines/reference/tsxGenericAttributesType4.types
@@ -38,6 +38,6 @@ class B<U> extends React.Component<U, {}> {
 >this.props : U & { children?: React.ReactNode; }
 >this : this
 >props : U & { children?: React.ReactNode; }
->x : string
+>x : "hi"
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType5.types b/tests/baselines/reference/tsxGenericAttributesType5.types
index c5320a5a8c4aa..ec4f2f7cde8c0 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.types
+++ b/tests/baselines/reference/tsxGenericAttributesType5.types
@@ -42,6 +42,6 @@ class B<U> extends React.Component<U, {}> {
 >this.props : U
 >this : this
 >props : U
->x : string
+>x : "hi"
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType6.types b/tests/baselines/reference/tsxGenericAttributesType6.types
index 662b6299dad85..ca8154d075a0a 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.types
+++ b/tests/baselines/reference/tsxGenericAttributesType6.types
@@ -42,6 +42,6 @@ class B<U> extends React.Component<U, {}> {
 >this.props : U
 >this : this
 >props : U
->x : string
+>x : "hi"
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType7.types b/tests/baselines/reference/tsxGenericAttributesType7.types
index 58d853e4881f1..bf227f6291a28 100644
--- a/tests/baselines/reference/tsxGenericAttributesType7.types
+++ b/tests/baselines/reference/tsxGenericAttributesType7.types
@@ -35,5 +35,5 @@ const decorator1 = function <U extends {x: string}>(props: U) {
 ><Component {...props} x="hi"/> : JSX.Element
 >Component : <T>(props: T) => JSX.Element
 >props : U
->x : string
+>x : "hi"
 }
diff --git a/tests/baselines/reference/tsxInArrowFunction.types b/tests/baselines/reference/tsxInArrowFunction.types
index 5134ec0e6992b..f702fa4da3a33 100644
--- a/tests/baselines/reference/tsxInArrowFunction.types
+++ b/tests/baselines/reference/tsxInArrowFunction.types
@@ -25,7 +25,7 @@ declare namespace JSX {
 >() => <div text="wat" /> : () => JSX.Element
 ><div text="wat" /> : JSX.Element
 >div : any
->text : string
+>text : "wat"
 >div : any
 
 // didn't work
@@ -36,7 +36,7 @@ declare namespace JSX {
 >x : any
 ><div text="wat" /> : JSX.Element
 >div : any
->text : string
+>text : "wat"
 >div : any
 
 // worked
@@ -47,7 +47,7 @@ declare namespace JSX {
 >(<div text="wat" />) : JSX.Element
 ><div text="wat" /> : JSX.Element
 >div : any
->text : string
+>text : "wat"
 >div : any
 
 // worked (!)
@@ -57,7 +57,7 @@ declare namespace JSX {
 >() => <div text="wat"></div> : () => JSX.Element
 ><div text="wat"></div> : JSX.Element
 >div : any
->text : string
+>text : "wat"
 >div : any
 >div : any
 
diff --git a/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types b/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
index 68ad55854a797..5c4590c0c9a01 100644
--- a/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
+++ b/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
@@ -87,14 +87,14 @@ const f1 = <ShouldInferFromData data={"1"} />;
 >f1 : JSX.Element
 ><ShouldInferFromData data={"1"} /> : JSX.Element
 >ShouldInferFromData : <T>(props: Props<T>) => JSX.Element
->data : string
+>data : "1"
 >"1" : "1"
 
 const f2 = <ShouldInferFromData data={"1"} convert={n => "" + n} />;
 >f2 : JSX.Element
 ><ShouldInferFromData data={"1"} convert={n => "" + n} /> : JSX.Element
 >ShouldInferFromData : <T>(props: Props<T>) => JSX.Element
->data : string
+>data : "1"
 >"1" : "1"
 >convert : (n: "1") => string
 >n => "" + n : (n: "1") => string
@@ -107,7 +107,7 @@ const f3 = <ShouldInferFromData data={2} convert={n => "" + n} />;
 >f3 : JSX.Element
 ><ShouldInferFromData data={2} convert={n => "" + n} /> : JSX.Element
 >ShouldInferFromData : <T>(props: Props<T>) => JSX.Element
->data : number
+>data : 2
 >2 : 2
 >convert : (n: 2) => string
 >n => "" + n : (n: 2) => string
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
index 07eb311f7ec9f..949a0032ed02a 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
@@ -30,7 +30,7 @@ let x = <MyComp a={10} b="hi" />
 >x : JSX.Element
 ><MyComp a={10} b="hi" /> : JSX.Element
 >MyComp : typeof MyComp
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
index 0dc264c272094..9fcf43172e9b8 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
@@ -36,5 +36,5 @@ let x1 = <MyComp a="hi"/>
 >x1 : JSX.Element
 ><MyComp a="hi"/> : JSX.Element
 >MyComp : typeof MyComp
->a : string
+>a : "hi"
 
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
index 5463e2fe4b0d2..79c62355d75ae 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
@@ -37,13 +37,13 @@ let x = <MyComp a={10} b="hi" />
 >x : JSX.Element
 ><MyComp a={10} b="hi" /> : JSX.Element
 >MyComp : typeof MyComp
->a : number
+>a : 10
 >10 : 10
->b : string
+>b : "hi"
 
 let x2 = <MyComp a="hi"/>
 >x2 : JSX.Element
 ><MyComp a="hi"/> : JSX.Element
 >MyComp : typeof MyComp
->a : string
+>a : "hi"
 
diff --git a/tests/baselines/reference/tsxReactEmit4.types b/tests/baselines/reference/tsxReactEmit4.types
index 33090c35263ca..8401262648ade 100644
--- a/tests/baselines/reference/tsxReactEmit4.types
+++ b/tests/baselines/reference/tsxReactEmit4.types
@@ -35,6 +35,6 @@ var spread1 = <div {...p} x={0} />;
 ><div {...p} x={0} /> : JSX.Element
 >div : any
 >p : any
->x : number
+>x : 0
 >0 : 0
 
diff --git a/tests/baselines/reference/tsxReactEmit5.types b/tests/baselines/reference/tsxReactEmit5.types
index f6def92af5b45..bf937b4d141b1 100644
--- a/tests/baselines/reference/tsxReactEmit5.types
+++ b/tests/baselines/reference/tsxReactEmit5.types
@@ -30,7 +30,7 @@ var spread1 = <div x='' {...foo} y='' />;
 >spread1 : JSX.Element
 ><div x='' {...foo} y='' /> : JSX.Element
 >div : any
->x : string
+>x : ""
 >foo : any
->y : string
+>y : ""
 
diff --git a/tests/baselines/reference/tsxReactEmit6.types b/tests/baselines/reference/tsxReactEmit6.types
index c92ad2493a60e..fd3666b5944bf 100644
--- a/tests/baselines/reference/tsxReactEmit6.types
+++ b/tests/baselines/reference/tsxReactEmit6.types
@@ -33,9 +33,9 @@ namespace M {
 >spread1 : JSX.Element
 ><div x='' {...foo} y='' /> : JSX.Element
 >div : any
->x : string
+>x : ""
 >foo : any
->y : string
+>y : ""
 
 	// Quotes
 	var x = <div>This "quote" thing</div>;
diff --git a/tests/baselines/reference/tsxReactEmit7.types b/tests/baselines/reference/tsxReactEmit7.types
index d282439e953ab..859d83d06d362 100644
--- a/tests/baselines/reference/tsxReactEmit7.types
+++ b/tests/baselines/reference/tsxReactEmit7.types
@@ -17,28 +17,28 @@ var m = <div x-y="val"></div>;
 >m : JSX.Element
 ><div x-y="val"></div> : JSX.Element
 >div : any
->x-y : string
+>x-y : "val"
 >div : any
 
 var n = <div xx-y="val"></div>;
 >n : JSX.Element
 ><div xx-y="val"></div> : JSX.Element
 >div : any
->xx-y : string
+>xx-y : "val"
 >div : any
 
 var o = <div x-yy="val"></div>;
 >o : JSX.Element
 ><div x-yy="val"></div> : JSX.Element
 >div : any
->x-yy : string
+>x-yy : "val"
 >div : any
 
 var p = <div xx-yy="val"></div>;
 >p : JSX.Element
 ><div xx-yy="val"></div> : JSX.Element
 >div : any
->xx-yy : string
+>xx-yy : "val"
 >div : any
 
 // Investigation
@@ -46,34 +46,34 @@ var a = <div x="val"></div>;
 >a : JSX.Element
 ><div x="val"></div> : JSX.Element
 >div : any
->x : string
+>x : "val"
 >div : any
 
 var b = <div xx="val"></div>;
 >b : JSX.Element
 ><div xx="val"></div> : JSX.Element
 >div : any
->xx : string
+>xx : "val"
 >div : any
 
 var c = <div xxx="val"></div>;
 >c : JSX.Element
 ><div xxx="val"></div> : JSX.Element
 >div : any
->xxx : string
+>xxx : "val"
 >div : any
 
 var d = <div xxxx="val"></div>;
 >d : JSX.Element
 ><div xxxx="val"></div> : JSX.Element
 >div : any
->xxxx : string
+>xxxx : "val"
 >div : any
 
 var e = <div xxxxx="val"></div>;
 >e : JSX.Element
 ><div xxxxx="val"></div> : JSX.Element
 >div : any
->xxxxx : string
+>xxxxx : "val"
 >div : any
 
diff --git a/tests/baselines/reference/tsxReactEmitEntities.types b/tests/baselines/reference/tsxReactEmitEntities.types
index 92d2b729dd552..518efa2289339 100644
--- a/tests/baselines/reference/tsxReactEmitEntities.types
+++ b/tests/baselines/reference/tsxReactEmitEntities.types
@@ -40,14 +40,14 @@ declare var React: any;
 <div attr="&#0123;&hellip;&#x7D;\"></div>;
 ><div attr="&#0123;&hellip;&#x7D;\"></div> : JSX.Element
 >div : any
->attr : string
+>attr : "&#0123;&hellip;&#x7D;\\"
 >div : any
 
 // Does not happen for a string literal that happens to be inside an attribute (and escapes then work)
 <div attr={"&#0123;&hellip;&#x7D;\""}></div>;
 ><div attr={"&#0123;&hellip;&#x7D;\""}></div> : JSX.Element
 >div : any
->attr : string
+>attr : "&#0123;&hellip;&#x7D;\""
 >"&#0123;&hellip;&#x7D;\"" : "&#0123;&hellip;&#x7D;\""
 >div : any
 
@@ -55,6 +55,6 @@ declare var React: any;
 <div attr='"'></div>
 ><div attr='"'></div> : JSX.Element
 >div : any
->attr : string
+>attr : "\""
 >div : any
 
diff --git a/tests/baselines/reference/tsxReactEmitNesting.types b/tests/baselines/reference/tsxReactEmitNesting.types
index 46c55667e4afd..0cfed5ae1f08d 100644
--- a/tests/baselines/reference/tsxReactEmitNesting.types
+++ b/tests/baselines/reference/tsxReactEmitNesting.types
@@ -18,12 +18,12 @@ let render = (ctrl, model) =>
     <section class="todoapp">
 ><section class="todoapp">        <header class="header">            <h1>todos &lt;x&gt;</h1>            <input class="new-todo" autofocus autocomplete="off" placeholder="What needs to be done?" value={model.newTodo} onKeyup={ctrl.addTodo.bind(ctrl, model)} />        </header>        <section class="main" style={{display:(model.todos && model.todos.length) ? "block" : "none"}}>            <input class="toggle-all" type="checkbox" onChange={ctrl.toggleAll.bind(ctrl)}/>            <ul class="todo-list">                {model.filteredTodos.map((todo) =>                    <li class={{todo: true, completed: todo.completed, editing: todo == model.editedTodo}}>                        <div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div>                    </li>                )}            </ul>        </section>    </section> : any
 >section : any
->class : string
+>class : "todoapp"
 
         <header class="header">
 ><header class="header">            <h1>todos &lt;x&gt;</h1>            <input class="new-todo" autofocus autocomplete="off" placeholder="What needs to be done?" value={model.newTodo} onKeyup={ctrl.addTodo.bind(ctrl, model)} />        </header> : any
 >header : any
->class : string
+>class : "header"
 
             <h1>todos &lt;x&gt;</h1>
 ><h1>todos &lt;x&gt;</h1> : any
@@ -33,10 +33,10 @@ let render = (ctrl, model) =>
             <input class="new-todo" autofocus autocomplete="off" placeholder="What needs to be done?" value={model.newTodo} onKeyup={ctrl.addTodo.bind(ctrl, model)} />
 ><input class="new-todo" autofocus autocomplete="off" placeholder="What needs to be done?" value={model.newTodo} onKeyup={ctrl.addTodo.bind(ctrl, model)} /> : any
 >input : any
->class : string
+>class : "new-todo"
 >autofocus : true
->autocomplete : string
->placeholder : string
+>autocomplete : "off"
+>placeholder : "What needs to be done?"
 >value : any
 >model.newTodo : any
 >model : any
@@ -57,7 +57,7 @@ let render = (ctrl, model) =>
         <section class="main" style={{display:(model.todos && model.todos.length) ? "block" : "none"}}>
 ><section class="main" style={{display:(model.todos && model.todos.length) ? "block" : "none"}}>            <input class="toggle-all" type="checkbox" onChange={ctrl.toggleAll.bind(ctrl)}/>            <ul class="todo-list">                {model.filteredTodos.map((todo) =>                    <li class={{todo: true, completed: todo.completed, editing: todo == model.editedTodo}}>                        <div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div>                    </li>                )}            </ul>        </section> : any
 >section : any
->class : string
+>class : "main"
 >style : { display: string; }
 >{display:(model.todos && model.todos.length) ? "block" : "none"} : { display: string; }
 >display : string
@@ -78,8 +78,8 @@ let render = (ctrl, model) =>
             <input class="toggle-all" type="checkbox" onChange={ctrl.toggleAll.bind(ctrl)}/>
 ><input class="toggle-all" type="checkbox" onChange={ctrl.toggleAll.bind(ctrl)}/> : any
 >input : any
->class : string
->type : string
+>class : "toggle-all"
+>type : "checkbox"
 >onChange : any
 >ctrl.toggleAll.bind(ctrl) : any
 >ctrl.toggleAll.bind : any
@@ -92,7 +92,7 @@ let render = (ctrl, model) =>
             <ul class="todo-list">
 ><ul class="todo-list">                {model.filteredTodos.map((todo) =>                    <li class={{todo: true, completed: todo.completed, editing: todo == model.editedTodo}}>                        <div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div>                    </li>                )}            </ul> : any
 >ul : any
->class : string
+>class : "todo-list"
 
                 {model.filteredTodos.map((todo) =>
 >model.filteredTodos.map((todo) =>                    <li class={{todo: true, completed: todo.completed, editing: todo == model.editedTodo}}>                        <div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div>                    </li>                ) : any
@@ -125,7 +125,7 @@ let render = (ctrl, model) =>
                         <div class="view">
 ><div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div> : any
 >div : any
->class : string
+>class : "view"
 
                             {(!todo.editable) ?
 >(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null : any
@@ -138,8 +138,8 @@ let render = (ctrl, model) =>
                                 <input class="toggle" type="checkbox"></input>
 ><input class="toggle" type="checkbox"></input> : any
 >input : any
->class : string
->type : string
+>class : "toggle"
+>type : "checkbox"
 >input : any
 
                                 : null
@@ -163,7 +163,7 @@ let render = (ctrl, model) =>
                             <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>
 ><button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button> : any
 >button : any
->class : string
+>class : "destroy"
 >onClick : any
 >ctrl.removeTodo.bind(ctrl,todo) : any
 >ctrl.removeTodo.bind : any
@@ -178,12 +178,12 @@ let render = (ctrl, model) =>
                             <div class="iconBorder">
 ><div class="iconBorder">                                <div class="icon"/>                            </div> : any
 >div : any
->class : string
+>class : "iconBorder"
 
                                 <div class="icon"/>
 ><div class="icon"/> : any
 >div : any
->class : string
+>class : "icon"
 
                             </div>
 >div : any
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution10.types b/tests/baselines/reference/tsxSpreadAttributesResolution10.types
index 851fa97dec2a7..e3a5a4a25067e 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.types
@@ -37,7 +37,7 @@ const obj1: OptionProp = {
 >{    x: 2} : { x: 2; }
 
     x: 2
->x : number
+>x : 2
 >2 : 2
 }
 
@@ -47,7 +47,7 @@ let y = <Opt {...obj} x={3}/>;
 ><Opt {...obj} x={3}/> : JSX.Element
 >Opt : typeof Opt
 >obj : OptionProp
->x : number
+>x : 3
 >3 : 3
 
 let y1 = <Opt {...obj1} x="Hi"/>;
@@ -55,14 +55,14 @@ let y1 = <Opt {...obj1} x="Hi"/>;
 ><Opt {...obj1} x="Hi"/> : JSX.Element
 >Opt : typeof Opt
 >obj1 : OptionProp
->x : string
+>x : "Hi"
 
 let y2 = <Opt {...obj1} x={3}/>;
 >y2 : JSX.Element
 ><Opt {...obj1} x={3}/> : JSX.Element
 >Opt : typeof Opt
 >obj1 : OptionProp
->x : number
+>x : 3
 >3 : 3
 
 let y3 = <Opt x />;
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution11.types b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
index bcf6690a60000..9c974edcbb123 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
@@ -12,7 +12,7 @@ const obj1: { x: 2 } = {
 >{    x: 2} : { x: 2; }
 
     x: 2
->x : number
+>x : 2
 >2 : 2
 }
 const obj3: {y: true, overwrite: string } = {
@@ -23,7 +23,7 @@ const obj3: {y: true, overwrite: string } = {
 >{    y: true,    overwrite: "hi"} : { y: true; overwrite: string; }
 
     y: true,
->y : boolean
+>y : true
 >true : true
 
     overwrite: "hi"
@@ -72,7 +72,7 @@ let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
 >OverWriteAttr : typeof OverWriteAttr
 >obj : {}
 >y : true
->overwrite : string
+>overwrite : "hi"
 >obj1 : { x: 2; }
 
 let x1 = <OverWriteAttr {...obj1} {...obj3} />
@@ -86,26 +86,26 @@ let x2 = <OverWriteAttr x={3} overwrite="hi" {...obj1} {...{y: true}} />
 >x2 : JSX.Element
 ><OverWriteAttr x={3} overwrite="hi" {...obj1} {...{y: true}} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
->x : number
+>x : 3
 >3 : 3
->overwrite : string
+>overwrite : "hi"
 >obj1 : { x: 2; }
 >{y: true} : { y: true; }
->y : boolean
+>y : true
 >true : true
 
 let x3 = <OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true, x: 2, overwrite:"world"}} />
 >x3 : JSX.Element
 ><OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true, x: 2, overwrite:"world"}} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
->overwrite : string
+>overwrite : "hi"
 >obj1 : { x: 2; }
->x : number
+>x : 3
 >3 : 3
 >{y: true, x: 2, overwrite:"world"} : { y: true; x: 2; overwrite: string; }
->y : boolean
+>y : true
 >true : true
->x : number
+>x : 2
 >2 : 2
 >overwrite : string
 >"world" : "world"
@@ -115,13 +115,13 @@ let x4 = <OverWriteAttr {...{x: 2}} {...{overwrite: "world"}} {...{y: true}} />
 ><OverWriteAttr {...{x: 2}} {...{overwrite: "world"}} {...{y: true}} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
 >{x: 2} : { x: 2; }
->x : number
+>x : 2
 >2 : 2
 >{overwrite: "world"} : { overwrite: string; }
 >overwrite : string
 >"world" : "world"
 >{y: true} : { y: true; }
->y : boolean
+>y : true
 >true : true
 
 let x5 = <OverWriteAttr {...anyobj} />
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.types b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
index bbeeac5a07385..244a66e5d06bc 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
@@ -12,7 +12,7 @@ const obj1: {x: 2} = {
 >{    x: 2} : { x: 2; }
 
     x: 2
->x : number
+>x : 2
 >2 : 2
 }
 const obj3: {y: false, overwrite: string} = {
@@ -23,7 +23,7 @@ const obj3: {y: false, overwrite: string} = {
 >{    y: false,    overwrite: "hi"} : { y: false; overwrite: string; }
 
     y: false,
->y : boolean
+>y : false
 >false : false
 
     overwrite: "hi"
@@ -72,19 +72,19 @@ let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
 >OverWriteAttr : typeof OverWriteAttr
 >obj : {}
 >y : true
->overwrite : string
+>overwrite : "hi"
 >obj1 : { x: 2; }
 
 let x1 = <OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true}} />
 >x1 : JSX.Element
 ><OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true}} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
->overwrite : string
+>overwrite : "hi"
 >obj1 : { x: 2; }
->x : number
+>x : 3
 >3 : 3
 >{y: true} : { y: true; }
->y : boolean
+>y : true
 >true : true
 
 let x2 = <OverWriteAttr {...anyobj} x={3} />
@@ -92,17 +92,17 @@ let x2 = <OverWriteAttr {...anyobj} x={3} />
 ><OverWriteAttr {...anyobj} x={3} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
 >anyobj : any
->x : number
+>x : 3
 >3 : 3
 
 let x3 = <OverWriteAttr overwrite="hi" {...obj1} {...{y: true}} />
 >x3 : JSX.Element
 ><OverWriteAttr overwrite="hi" {...obj1} {...{y: true}} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
->overwrite : string
+>overwrite : "hi"
 >obj1 : { x: 2; }
 >{y: true} : { y: true; }
->y : boolean
+>y : true
 >true : true
 
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution13.types b/tests/baselines/reference/tsxSpreadAttributesResolution13.types
index 0ad324c25b18f..74f9788ca805a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution13.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution13.types
@@ -39,7 +39,7 @@ export default function Component(props: ComponentProps) {
 ><ChildComponent {...props} property1="NewString" /> : JSX.Element
 >ChildComponent : ({ property1 }: AnotherComponentProps) => JSX.Element
 >props : ComponentProps
->property1 : string
+>property1 : "NewString"
     }
 }
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution15.types b/tests/baselines/reference/tsxSpreadAttributesResolution15.types
index 152ad3f696eac..0a7183b8f0d51 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution15.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution15.types
@@ -25,7 +25,7 @@ export default function Component(props: ComponentProps) {
 >AnotherComponent : ({ property1 }: AnotherComponentProps) => JSX.Element
 >props : ComponentProps
 >property2 : true
->AnotherProperty1 : string
+>AnotherProperty1 : "hi"
 
     );
 }
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.types b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
index 92bf2118c98a9..80c94ada9ffc2 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
@@ -59,7 +59,7 @@ let w = <Poisoned {...{x: 5, y: "2"}}/>;
 >{x: 5, y: "2"} : { x: number; y: "2"; }
 >x : number
 >5 : 5
->y : string
+>y : "2"
 >"2" : "2"
 
 let w1 = <Poisoned {...{x: 5, y: "2"}} X="hi" />;
@@ -69,7 +69,7 @@ let w1 = <Poisoned {...{x: 5, y: "2"}} X="hi" />;
 >{x: 5, y: "2"} : { x: number; y: "2"; }
 >x : number
 >5 : 5
->y : string
+>y : "2"
 >"2" : "2"
->X : string
+>X : "hi"
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution3.types b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
index 13ea6343298f1..2363ef7b7ccc4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
@@ -54,7 +54,7 @@ let y = <Poisoned x="hi" y={2} />;
 >y : JSX.Element
 ><Poisoned x="hi" y={2} /> : JSX.Element
 >Poisoned : typeof Poisoned
->x : string
->y : number
+>x : "hi"
+>y : 2
 >2 : 2
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.types b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
index bf952a719f967..532e7828df98c 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
@@ -39,7 +39,7 @@ const obj: PoisonedProp = {
 >"hello world" : "hello world"
 
     y: 2
->y : number
+>y : 2
 >2 : 2
 
 };
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.types b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
index 1c18e87fa1767..d5e40bdf278d8 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
@@ -35,7 +35,7 @@ let x = <TextComponent editable={true} />
 >x : JSX.Element
 ><TextComponent editable={true} /> : JSX.Element
 >TextComponent : typeof TextComponent
->editable : boolean
+>editable : true
 >true : true
 
 const textProps: TextProps = {
@@ -44,7 +44,7 @@ const textProps: TextProps = {
 >{    editable: false} : { editable: false; }
 
     editable: false
->editable : boolean
+>editable : false
 >false : false
 
 };
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.types b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
index 02b7a11c4241f..4275b5301f8aa 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
@@ -37,7 +37,7 @@ const textPropsFalse: TextProps = {
 >{    editable: false} : { editable: false; }
 
     editable: false
->editable : boolean
+>editable : false
 >false : false
 
 };
@@ -54,7 +54,7 @@ const textPropsTrue: TextProps = {
 >{    editable: true,    onEdit: () => {}} : { editable: true; onEdit: () => void; }
 
     editable: true,
->editable : boolean
+>editable : true
 >true : true
 
     onEdit: () => {}
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution8.types b/tests/baselines/reference/tsxSpreadAttributesResolution8.types
index ad6caef41cb48..7f07213aeaba7 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.types
@@ -64,7 +64,7 @@ let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
 >OverWriteAttr : typeof OverWriteAttr
 >obj : {}
 >y : true
->overwrite : string
+>overwrite : "hi"
 >obj1 : { x: number; }
 
 let x1 = <OverWriteAttr {...obj1} {...obj3}  />
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution9.types b/tests/baselines/reference/tsxSpreadAttributesResolution9.types
index 2ba929cfe9d3a..dd8e154227f02 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.types
@@ -40,7 +40,7 @@ const obj1: OptionProp = {
 >{    x: 2} : { x: 2; }
 
     x: 2
->x : number
+>x : 2
 >2 : 2
 }
 
@@ -73,6 +73,6 @@ let y3 = <Opt x={2} />;
 >y3 : JSX.Element
 ><Opt x={2} /> : JSX.Element
 >Opt : typeof Opt
->x : number
+>x : 2
 >2 : 2
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
index cb1908845ddfd..bfec805860bdb 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
@@ -46,35 +46,35 @@ const c1 = <OneThing yxx='ok' />
 >c1 : JSX.Element
 ><OneThing yxx='ok' /> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->yxx : string
+>yxx : "ok"
 
 const c2 = <OneThing yy={100}  yy1="hello"/>
 >c2 : JSX.Element
 ><OneThing yy={100}  yy1="hello"/> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->yy : number
+>yy : 100
 >100 : 100
->yy1 : string
+>yy1 : "hello"
 
 const c3 = <OneThing yxx="hello" ignore-prop />
 >c3 : JSX.Element
 ><OneThing yxx="hello" ignore-prop /> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->yxx : string
+>yxx : "hello"
 >ignore-prop : true
 
 const c4 = <OneThing data="hello" data-prop />
 >c4 : JSX.Element
 ><OneThing data="hello" data-prop /> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->data : string
+>data : "hello"
 >data-prop : true
 
 const c5 = <OneThing yxx1='ok'>Hello</OneThing>
 >c5 : JSX.Element
 ><OneThing yxx1='ok'>Hello</OneThing> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->yxx1 : string
+>yxx1 : "ok"
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
 
 
@@ -120,32 +120,32 @@ const d2 = <TestingOneThing extra-data="hello" />;
 >d2 : JSX.Element
 ><TestingOneThing extra-data="hello" /> : JSX.Element
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
->extra-data : string
+>extra-data : "hello"
 
 const d3 = <TestingOneThing extra-data="hello" yy="hihi" />;
 >d3 : JSX.Element
 ><TestingOneThing extra-data="hello" yy="hihi" /> : JSX.Element
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
->extra-data : string
->yy : string
+>extra-data : "hello"
+>yy : "hihi"
 
 const d4 = <TestingOneThing extra-data="hello" yy={9} direction={10} />;
 >d4 : JSX.Element
 ><TestingOneThing extra-data="hello" yy={9} direction={10} /> : JSX.Element
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
->extra-data : string
->yy : number
+>extra-data : "hello"
+>yy : 9
 >9 : 9
->direction : number
+>direction : 10
 >10 : 10
 
 const d5 = <TestingOneThing extra-data="hello" yy="hello" name="Bob" />;
 >d5 : JSX.Element
 ><TestingOneThing extra-data="hello" yy="hello" name="Bob" /> : JSX.Element
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
->extra-data : string
->yy : string
->name : string
+>extra-data : "hello"
+>yy : "hello"
+>name : "Bob"
 
 
 declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
@@ -175,14 +175,14 @@ const e3 = <TestingOptional y1="hello"/>
 >e3 : JSX.Element
 ><TestingOptional y1="hello"/> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : string
+>y1 : "hello"
 
 const e4 = <TestingOptional y1="hello" y2={1000} />
 >e4 : JSX.Element
 ><TestingOptional y1="hello" y2={1000} /> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : string
->y2 : number
+>y1 : "hello"
+>y2 : 1000
 >1000 : 1000
 
 const e5 = <TestingOptional y1 y3/>
@@ -198,7 +198,7 @@ const e6 = <TestingOptional y1 y3 y2={10} />
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
 >y1 : true
 >y3 : true
->y2 : number
+>y2 : 10
 >10 : 10
 
 const e2 = <TestingOptional y1 y3 extra-prop/>
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
index d1cc5774447df..fbf06619cf2ec 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
@@ -82,7 +82,7 @@ const c5 = <OneThing {...obj1} yy={42} {...{yy1: "hi"}}/>
 ><OneThing {...obj1} yy={42} {...{yy1: "hi"}}/> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >obj1 : { yy: boolean; }
->yy : number
+>yy : 42
 >42 : 42
 >{yy1: "hi"} : { yy1: string; }
 >yy1 : string
@@ -111,7 +111,7 @@ const c8 = <OneThing ignore-prop={100} />
 >c8 : JSX.Element
 ><OneThing ignore-prop={100} /> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
->ignore-prop : number
+>ignore-prop : 100
 >100 : 100
 
 const c9 = <OneThing {...{ "ignore-prop":200 }} />;
@@ -126,5 +126,5 @@ const c10 = <OneThing {...obj2} yy1="boo" />;
 ><OneThing {...obj2} yy1="boo" /> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >obj2 : { yy: number; "ignore-prop": string; }
->yy1 : string
+>yy1 : "boo"
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
index 6574f46f483ec..c1f08044d3c1f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
@@ -33,9 +33,9 @@ const two2 = <ZeroThingOrTwoThing yy={100}  yy1="hello"/>;
 >two2 : JSX.Element
 ><ZeroThingOrTwoThing yy={100}  yy1="hello"/> : JSX.Element
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
->yy : number
+>yy : 100
 >100 : 100
->yy1 : string
+>yy1 : "hello"
 
 const two3 = <ZeroThingOrTwoThing {...obj2} />;  // it is just any so we allow it to pass through
 >two3 : JSX.Element
@@ -47,7 +47,7 @@ const two4 = <ZeroThingOrTwoThing  yy={1000} {...obj2} />;  // it is just any so
 >two4 : JSX.Element
 ><ZeroThingOrTwoThing  yy={1000} {...obj2} /> : JSX.Element
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
->yy : number
+>yy : 1000
 >1000 : 1000
 >obj2 : any
 
@@ -56,7 +56,7 @@ const two5 = <ZeroThingOrTwoThing  {...obj2} yy={1000} />;  // it is just any so
 ><ZeroThingOrTwoThing  {...obj2} yy={1000} /> : JSX.Element
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
 >obj2 : any
->yy : number
+>yy : 1000
 >1000 : 1000
 
 declare function ThreeThing(l: {y1: string}): JSX.Element;
@@ -89,21 +89,21 @@ const three1 = <ThreeThing yy={99} yy1="hello world" />;
 >three1 : JSX.Element
 ><ThreeThing yy={99} yy1="hello world" /> : JSX.Element
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
->yy : number
+>yy : 99
 >99 : 99
->yy1 : string
+>yy1 : "hello world"
 
 const three2 = <ThreeThing y2="Bye" />;
 >three2 : JSX.Element
 ><ThreeThing y2="Bye" /> : JSX.Element
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
->y2 : string
+>y2 : "Bye"
 
 const three3 = <ThreeThing {...obj2} y2={10} />;  // it is just any so we allow it to pass through
 >three3 : JSX.Element
 ><ThreeThing {...obj2} y2={10} /> : JSX.Element
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
 >obj2 : any
->y2 : number
+>y2 : 10
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
index fe265c5c4d063..fb4cc66bd9cd0 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
@@ -41,7 +41,7 @@ const c1 = <OneThing yy={10}/>;  // missing property;
 >c1 : JSX.Element
 ><OneThing yy={10}/> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
->yy : number
+>yy : 10
 >10 : 10
 
 const c2 = <OneThing {...obj} yy1 />; // type incompatible;
@@ -65,7 +65,7 @@ const c4 = <OneThing {...obj} y1={10000} />;  // extra property;
 ><OneThing {...obj} y1={10000} /> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >obj : { yy: number; yy1: string; }
->y1 : number
+>y1 : 10000
 >10000 : 10000
 
 const c5 = <OneThing {...obj} {...{yy: true}} />;  // type incompatible;
@@ -118,8 +118,8 @@ const d2 = <TestingOneThing yy="hello" direction="left" />
 >d2 : JSX.Element
 ><TestingOneThing yy="hello" direction="left" /> : JSX.Element
 >TestingOneThing : { (j: { "extra-data": string; }): JSX.Element; (n: { yy: string; direction?: number; }): JSX.Element; }
->yy : string
->direction : string
+>yy : "hello"
+>direction : "left"
 
 declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
@@ -155,14 +155,14 @@ const e1 = <TestingOptional y1 y3="hello"/>
 ><TestingOptional y1 y3="hello"/> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
 >y1 : true
->y3 : string
+>y3 : "hello"
 
 const e2 = <TestingOptional y1="hello" y2={1000} y3 />
 >e2 : JSX.Element
 ><TestingOptional y1="hello" y2={1000} y3 /> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : string
->y2 : number
+>y1 : "hello"
+>y2 : 1000
 >1000 : 1000
 >y3 : true
 
@@ -170,17 +170,17 @@ const e3 = <TestingOptional y1="hello" y2={1000} children="hi" />
 >e3 : JSX.Element
 ><TestingOptional y1="hello" y2={1000} children="hi" /> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : string
->y2 : number
+>y1 : "hello"
+>y2 : 1000
 >1000 : 1000
->children : string
+>children : "hi"
 
 const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
 >e4 : JSX.Element
 ><TestingOptional y1="hello" y2={1000}>Hi</TestingOptional> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : string
->y2 : number
+>y1 : "hello"
+>y2 : 1000
 >1000 : 1000
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
index b60a5a2d3f03e..2bd3281eb2e21 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
@@ -134,7 +134,7 @@ const b0 = <MainButton to='/some/path' onClick={(e)=>{}}>GO</MainButton>;  // ex
 >b0 : JSX.Element
 ><MainButton to='/some/path' onClick={(e)=>{}}>GO</MainButton> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->to : string
+>to : "/some/path"
 >onClick : (e: React.MouseEvent<any>) => void
 >(e)=>{} : (e: React.MouseEvent<any>) => void
 >e : React.MouseEvent<any>
@@ -194,7 +194,7 @@ const b6 = <MainButton {...{ onClick(e: any){} }} children={10} />;  // incorrec
 >{ onClick(e: any){} } : { onClick(e: any): void; }
 >onClick : (e: any) => void
 >e : any
->children : number
+>children : 10
 >10 : 10
 
 const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;  // incorrect type for optional attribute
@@ -204,7 +204,7 @@ const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;
 >{ onClick(e: any){} } : { onClick(e: any): void; }
 >onClick : (e: any) => void
 >e : any
->children : string
+>children : "hello"
 >className : true
 
 const b8 = <MainButton data-format />;  // incorrect type for specified hyphanated name
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
index 6f7f04e3cf3b3..6272288c035e9 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
@@ -123,7 +123,7 @@ const b0 = <MainButton to='/some/path'>GO</MainButton>;
 >b0 : JSX.Element
 ><MainButton to='/some/path'>GO</MainButton> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->to : string
+>to : "/some/path"
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 
 const b1 = <MainButton onClick={(e) => {}}>Hello world</MainButton>;
@@ -161,7 +161,7 @@ const b5 = <MainButton {...obj1} to="/to/somewhere" />;  // should pick the seco
 ><MainButton {...obj1} to="/to/somewhere" /> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >obj1 : any
->to : string
+>to : "/to/somewhere"
 
 const b6 = <MainButton {...obj2} />;
 >b6 : JSX.Element
@@ -193,7 +193,7 @@ const b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
 >b9 : JSX.Element
 ><MainButton to='/some/path' extra-prop>GO</MainButton> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->to : string
+>to : "/some/path"
 >extra-prop : true
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 
@@ -201,8 +201,8 @@ const b10 = <MainButton to='/some/path' children="hi" ></MainButton>;
 >b10 : JSX.Element
 ><MainButton to='/some/path' children="hi" ></MainButton> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->to : string
->children : string
+>to : "/some/path"
+>children : "hi"
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 
 const b11 = <MainButton onClick={(e) => {}} className="hello" data-format>Hello world</MainButton>;
@@ -212,7 +212,7 @@ const b11 = <MainButton onClick={(e) => {}} className="hello" data-format>Hello
 >onClick : (e: React.MouseEvent<any>) => void
 >(e) => {} : (e: React.MouseEvent<any>) => void
 >e : React.MouseEvent<any>
->className : string
+>className : "hello"
 >data-format : true
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 
@@ -220,7 +220,7 @@ const b12 = <MainButton data-format="Hello world" />
 >b12 : JSX.Element
 ><MainButton data-format="Hello world" /> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->data-format : string
+>data-format : "Hello world"
 
 
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
index ddbeb8deca017..8c545b19e089f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
@@ -33,5 +33,5 @@ let i1 = <MyComponent values="Hello"/>;
 >i1 : JSX.Element
 ><MyComponent values="Hello"/> : JSX.Element
 >MyComponent : <T = MyComponentProp>(attr: T) => JSX.Element
->values : string
+>values : "Hello"
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
index fe9439447f453..d43e7419d3400 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
@@ -28,6 +28,6 @@ let i1 = <MyComponent1 values={5}/>;
 >i1 : JSX.Element
 ><MyComponent1 values={5}/> : JSX.Element
 >MyComponent1 : <T extends MyComponentProp>(attr: T) => JSX.Element
->values : number
+>values : 5
 >5 : 5
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.types b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
index ffd52cb497815..ffea243867519 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
@@ -45,13 +45,13 @@ let a = <Greet name='world' />;
 >a : JSX.Element
 ><Greet name='world' /> : JSX.Element
 >Greet : (x: { name: string; }) => JSX.Element
->name : string
+>name : "world"
 
 let a1 = <Greet name='world' extra-prop />;
 >a1 : JSX.Element
 ><Greet name='world' extra-prop /> : JSX.Element
 >Greet : (x: { name: string; }) => JSX.Element
->name : string
+>name : "world"
 >extra-prop : true
 
 // Error
@@ -59,7 +59,7 @@ let b = <Greet naaame='world' />;
 >b : JSX.Element
 ><Greet naaame='world' /> : JSX.Element
 >Greet : (x: { name: string; }) => JSX.Element
->naaame : string
+>naaame : "world"
 
 // OK
 let c = <Meet />;
@@ -78,14 +78,14 @@ let d = <Meet name='me' />;
 >d : JSX.Element
 ><Meet name='me' /> : JSX.Element
 >Meet : ({ name }: { name?: string; }) => JSX.Element
->name : string
+>name : "me"
 
 // Error
 let e = <Meet name={42} />;
 >e : JSX.Element
 ><Meet name={42} /> : JSX.Element
 >Meet : ({ name }: { name?: string; }) => JSX.Element
->name : number
+>name : 42
 >42 : 42
 
 // Error
@@ -93,21 +93,21 @@ let f = <Meet naaaaaaame='no' />;
 >f : JSX.Element
 ><Meet naaaaaaame='no' /> : JSX.Element
 >Meet : ({ name }: { name?: string; }) => JSX.Element
->naaaaaaame : string
+>naaaaaaame : "no"
 
 // OK
 let g = <MeetAndGreet prop-name="Bob" />;
 >g : JSX.Element
 ><MeetAndGreet prop-name="Bob" /> : JSX.Element
 >MeetAndGreet : (k: { "prop-name": string; }) => JSX.Element
->prop-name : string
+>prop-name : "Bob"
 
 // Error
 let h = <MeetAndGreet extra-prop-name="World" />;
 >h : JSX.Element
 ><MeetAndGreet extra-prop-name="World" /> : JSX.Element
 >MeetAndGreet : (k: { "prop-name": string; }) => JSX.Element
->extra-prop-name : string
+>extra-prop-name : "World"
 
 // Error
 let i = <EmptyPropSFC prop1 />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.types b/tests/baselines/reference/tsxStatelessFunctionComponents2.types
index 05fe1a8897bc4..f033d50fd721b 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.types
@@ -44,14 +44,14 @@ let b = <Greet key="k" />;
 >b : JSX.Element
 ><Greet key="k" /> : JSX.Element
 >Greet : (x: { name?: string; }) => JSX.Element
->key : string
+>key : "k"
 
 // Error - not allowed to specify 'ref' on SFCs
 let c = <Greet ref="myRef" />;
 >c : JSX.Element
 ><Greet ref="myRef" /> : JSX.Element
 >Greet : (x: { name?: string; }) => JSX.Element
->ref : string
+>ref : "myRef"
 
 
 // OK - ref is valid for classes
@@ -103,7 +103,7 @@ let g = <BigGreeter key={100} />;
 >g : JSX.Element
 ><BigGreeter key={100} /> : JSX.Element
 >BigGreeter : typeof BigGreeter
->key : number
+>key : 100
 >100 : 100
 
 // OK - contextually typed intrinsic ref callback parameter
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
index 851839ea921b6..808fe38ee09d5 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
@@ -33,7 +33,7 @@ function Bar<T extends {prop: number}>(arg: T) {
 ><ComponentSpecific1 {...arg} ignore-prop={10} /> : JSX.Element
 >ComponentSpecific1 : <U>(l: { prop: U; "ignore-prop": string; }) => JSX.Element
 >arg : T
->ignore-prop : number
+>ignore-prop : 10
 >10 : 10
  }
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
index aa38d2ccf8ac5..8bc938a48618a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
@@ -48,7 +48,7 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 ><OverloadComponent {...arg1} a="hello" ignore-prop /> : JSX.Element
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
 >arg1 : T
->a : string
+>a : "hello"
 >ignore-prop : true
 
     let a1 = <OverloadComponent {...arg2} ignore-pro="hello world" />;
@@ -56,7 +56,7 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 ><OverloadComponent {...arg2} ignore-pro="hello world" /> : JSX.Element
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
 >arg2 : U
->ignore-pro : string
+>ignore-pro : "hello world"
 
     let a2 = <OverloadComponent {...arg2} />;
 >a2 : JSX.Element
@@ -81,7 +81,7 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 ><OverloadComponent {...arg2} ignore-prop="hello" {...arg1} /> : JSX.Element
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
 >arg2 : U
->ignore-prop : string
+>ignore-prop : "hello"
 >arg1 : T
 
     let a6 = <OverloadComponent {...arg2} ignore-prop {...arg1} />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
index 98a9c62179732..627ac387449a1 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
@@ -61,14 +61,14 @@ function Bar<T extends { prop: number }>(arg: T) {
 ><ComponentSpecific {...arg} ignore-prop="hi" /> : JSX.Element
 >ComponentSpecific : <U>(l: { prop: U; }) => JSX.Element
 >arg : T
->ignore-prop : string
+>ignore-prop : "hi"
 
     let a2 = <ComponentSpecific1 {...arg} ignore-prop={10} />;  // U is number
 >a2 : JSX.Element
 ><ComponentSpecific1 {...arg} ignore-prop={10} /> : JSX.Element
 >ComponentSpecific1 : <U>(l: { prop: U; "ignore-prop": number; }) => JSX.Element
 >arg : T
->ignore-prop : number
+>ignore-prop : 10
 >10 : 10
 
     let a3 = <ComponentSpecific {...arg} prop="hello" />;   // U is "hello"
@@ -76,13 +76,13 @@ function Bar<T extends { prop: number }>(arg: T) {
 ><ComponentSpecific {...arg} prop="hello" /> : JSX.Element
 >ComponentSpecific : <U>(l: { prop: U; }) => JSX.Element
 >arg : T
->prop : string
+>prop : "hello"
 
     let a4 = <ComponentSpecific {...arg} prop1="hello" />;   // U is "hello"
 >a4 : JSX.Element
 ><ComponentSpecific {...arg} prop1="hello" /> : JSX.Element
 >ComponentSpecific : <U>(l: { prop: U; }) => JSX.Element
 >arg : T
->prop1 : string
+>prop1 : "hello"
 }
 
diff --git a/tests/baselines/reference/tsxTypeErrors.types b/tests/baselines/reference/tsxTypeErrors.types
index 91740cf88dea1..1203bb4f0257a 100644
--- a/tests/baselines/reference/tsxTypeErrors.types
+++ b/tests/baselines/reference/tsxTypeErrors.types
@@ -4,14 +4,14 @@ var a1 = <div id="foo" />;
 >a1 : any
 ><div id="foo" /> : any
 >div : any
->id : string
+>id : "foo"
 
 // A built-in element with a mistyped property (error)
 var a2 = <img srce="foo.jpg" />
 >a2 : any
 ><img srce="foo.jpg" /> : any
 >img : any
->srce : string
+>srce : "foo.jpg"
 
 // A built-in element with a badly-typed attribute value (error)
 var thing = { oops: 100 };
@@ -32,7 +32,7 @@ var e1 = <imag src="bar.jpg" />
 >e1 : any
 ><imag src="bar.jpg" /> : any
 >imag : any
->src : string
+>src : "bar.jpg"
 
 // A custom type
 class MyClass {
@@ -60,7 +60,7 @@ var b1 = <MyClass reqd={true} />;
 >b1 : any
 ><MyClass reqd={true} /> : any
 >MyClass : typeof MyClass
->reqd : boolean
+>reqd : true
 >true : true
 
 // Mistyped attribute member
diff --git a/tests/baselines/reference/tsxUnionElementType2.types b/tests/baselines/reference/tsxUnionElementType2.types
index 3b2df619596a8..822ba7f0028ee 100644
--- a/tests/baselines/reference/tsxUnionElementType2.types
+++ b/tests/baselines/reference/tsxUnionElementType2.types
@@ -34,6 +34,6 @@ var SFCComp = SFC1 || SFC2;
 <SFCComp x={"hi"}/>
 ><SFCComp x={"hi"}/> : JSX.Element
 >SFCComp : ((prop: { x: number; }) => JSX.Element) | ((prop: { x: boolean; }) => JSX.Element)
->x : string
+>x : "hi"
 >"hi" : "hi"
 
diff --git a/tests/baselines/reference/tsxUnionElementType3.types b/tests/baselines/reference/tsxUnionElementType3.types
index 5a797ea483b59..8f3ad7056bd26 100644
--- a/tests/baselines/reference/tsxUnionElementType3.types
+++ b/tests/baselines/reference/tsxUnionElementType3.types
@@ -85,7 +85,7 @@ let a = <RCComp x="Hi" />;
 >a : JSX.Element
 ><RCComp x="Hi" /> : JSX.Element
 >RCComp : typeof RC1 | typeof RC2
->x : string
+>x : "Hi"
 
 let a1 = <EmptyRCComp />;
 >a1 : JSX.Element
@@ -96,7 +96,7 @@ let a2 = <EmptyRCComp data-prop="hello" />;
 >a2 : JSX.Element
 ><EmptyRCComp data-prop="hello" /> : JSX.Element
 >EmptyRCComp : typeof RC3
->data-prop : string
+>data-prop : "hello"
 
 let b = <PartRCComp />
 >b : JSX.Element
@@ -107,5 +107,5 @@ let c = <PartRCComp data-extra="hello" />
 >c : JSX.Element
 ><PartRCComp data-extra="hello" /> : JSX.Element
 >PartRCComp : typeof RC4
->data-extra : string
+>data-extra : "hello"
 
diff --git a/tests/baselines/reference/tsxUnionElementType4.types b/tests/baselines/reference/tsxUnionElementType4.types
index c0961eb6d1644..9d60f0462fd42 100644
--- a/tests/baselines/reference/tsxUnionElementType4.types
+++ b/tests/baselines/reference/tsxUnionElementType4.types
@@ -91,7 +91,7 @@ let b = <PartRCComp x={10} />
 >b : JSX.Element
 ><PartRCComp x={10} /> : JSX.Element
 >PartRCComp : typeof RC4
->x : number
+>x : 10
 >10 : 10
 
 let c = <EmptyRCComp prop />;
diff --git a/tests/baselines/reference/tsxUnionElementType6.types b/tests/baselines/reference/tsxUnionElementType6.types
index db36bad01f063..5b7a1c0a5031f 100644
--- a/tests/baselines/reference/tsxUnionElementType6.types
+++ b/tests/baselines/reference/tsxUnionElementType6.types
@@ -54,7 +54,7 @@ let b = <SFC2AndEmptyComp x="hi" />;
 >b : JSX.Element
 ><SFC2AndEmptyComp x="hi" /> : JSX.Element
 >SFC2AndEmptyComp : (prop: { x: boolean; }) => JSX.Element
->x : string
+>x : "hi"
 
 let c = <SFC2AndEmptyComp />;
 >c : JSX.Element
diff --git a/tests/baselines/reference/tsxUnionSpread.types b/tests/baselines/reference/tsxUnionSpread.types
index 11e6308fe18c4..0d3c34cb33bf0 100644
--- a/tests/baselines/reference/tsxUnionSpread.types
+++ b/tests/baselines/reference/tsxUnionSpread.types
@@ -39,7 +39,7 @@ function getProps(): AnimalInfo {
     // this may be from server or whatever ...
     return { type: 'Cat', subType: 'Large' };
 >{ type: 'Cat', subType: 'Large' } : { type: "Cat"; subType: string; }
->type : string
+>type : "Cat"
 >'Cat' : "Cat"
 >subType : string
 >'Large' : "Large"
@@ -61,7 +61,7 @@ var props2:AnimalInfo = { type: 'Cat', subType: 'Large' };
 >props2 : AnimalInfo
 >AnimalInfo : AnimalInfo
 >{ type: 'Cat', subType: 'Large' } : { type: "Cat"; subType: string; }
->type : string
+>type : "Cat"
 >'Cat' : "Cat"
 >subType : string
 >'Large' : "Large"
diff --git a/tests/cases/compiler/tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx b/tests/cases/compiler/tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx
new file mode 100644
index 0000000000000..3f89d6e1cc70a
--- /dev/null
+++ b/tests/cases/compiler/tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx
@@ -0,0 +1,19 @@
+// @jsx: preserve
+
+
+namespace JSX {
+    export interface IntrinsicElements {
+        span: {};
+    }
+    export interface Element {
+		something?: any;
+    }
+}
+
+const Foo = (props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</span>;
+
+Foo({
+    foo: "B"
+});
+
+<Foo foo="B" />

From fa85c9bb606ba36bbfe821aee351a49fa4c78a06 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 14 Dec 2017 17:52:19 -0800
Subject: [PATCH 2/7] Handle all those edge cases that weren;t explicitly
 handled

---
 src/compiler/checker.ts                       | 55 +++++++++-----
 src/compiler/declarationEmitter.ts            |  4 +-
 src/compiler/parser.ts                        | 42 +++++++++--
 src/compiler/types.ts                         | 75 ++++++++++++++-----
 src/compiler/utilities.ts                     | 30 ++++++--
 src/services/completions.ts                   |  2 +-
 src/services/findAllReferences.ts             | 16 ++--
 .../reference/api/tsserverlibrary.d.ts        | 13 +---
 tests/baselines/reference/api/typescript.d.ts | 13 +---
 .../checkJsdocTypeTagOnObjectProperty1.types  |  6 +-
 .../checkJsdocTypeTagOnObjectProperty2.types  |  8 +-
 ...mitDestructuringObjectLiteralPattern.types |  2 +-
 ...itDestructuringObjectLiteralPattern2.types |  2 +-
 .../declarationsAndAssignments.types          |  2 +-
 .../for-inStatementsDestructuring4.types      |  4 +-
 tests/baselines/reference/for-of47.types      |  4 +-
 tests/baselines/reference/for-of48.types      |  4 +-
 .../shorthand-property-es5-es6.types          |  2 +-
 .../shorthand-property-es6-amd.types          |  2 +-
 .../shorthand-property-es6-es6.types          |  2 +-
 ...portedEntity01_targetES2015_CommonJS.types |  2 +-
 ...fExportedEntity02_targetES5_CommonJS.types |  2 +-
 ...ndPropertyAssignmentsInDestructuring.types | 16 ++--
 ...opertyAssignmentsInDestructuring_ES6.types | 16 ++--
 ...tructuringForOfObjectBindingPattern2.types | 72 +++++++++---------
 ...OfObjectBindingPatternDefaultValues2.types | 72 +++++++++---------
 tests/baselines/reference/tsxEmit1.types      | 26 +++----
 tests/baselines/reference/tsxReactEmit1.types | 26 +++----
 ...FunctionComponentsWithTypeArguments1.types |  2 +-
 ...lRefsObjectBindingElementPropertyName06.ts |  2 +-
 tests/cases/fourslash/tsxQuickInfo3.ts        |  2 +-
 tests/cases/fourslash/tsxQuickInfo4.ts        |  2 +-
 32 files changed, 307 insertions(+), 221 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 581796e76d2d0..858bab12c7d7c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4216,7 +4216,7 @@ namespace ts {
 
         // Return the type of a binding element parent. We check SymbolLinks first to see if a type has been
         // assigned by contextual typing.
-        function getTypeForBindingElementParent(node: VariableLikeDeclaration) {
+        function getTypeForBindingElementParent(node: BindingElement["parent"]["parent"]) {
             const symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
@@ -4371,7 +4371,7 @@ namespace ts {
         }
 
         // Return the inferred type for a variable, parameter, or property declaration
-        function getTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration, includeOptionality: boolean): Type {
+        function getTypeForVariableLikeDeclaration(declaration: ParameterDeclaration | PropertyDeclaration | PropertySignature | VariableDeclaration | BindingElement, includeOptionality: boolean): Type {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
             // right hand expression is of a type parameter type.
             if (declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
@@ -4392,11 +4392,12 @@ namespace ts {
                 return getTypeForBindingElement(<BindingElement>declaration);
             }
 
+            const isOptional = !isBindingElement(declaration) && !isVariableDeclaration(declaration) && !!declaration.questionToken && includeOptionality;
             // Use type from type annotation if one is present
             const typeNode = getEffectiveTypeAnnotationNode(declaration);
             if (typeNode) {
                 const declaredType = getTypeFromTypeNode(typeNode);
-                return addOptionality(declaredType, /*optional*/ !!declaration.questionToken && includeOptionality);
+                return addOptionality(declaredType, isOptional);
             }
 
             if ((noImplicitAny || isInJavaScriptFile(declaration)) &&
@@ -4440,14 +4441,14 @@ namespace ts {
                     type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
                 }
                 if (type) {
-                    return addOptionality(type, /*optional*/ !!declaration.questionToken && includeOptionality);
+                    return addOptionality(type, isOptional);
                 }
             }
 
             // Use the type of the initializer expression if one is present
             if (declaration.initializer) {
                 const type = checkDeclarationInitializer(declaration);
-                return addOptionality(type, /*optional*/ !!declaration.questionToken && includeOptionality);
+                return addOptionality(type, isOptional);
             }
 
             if (isJsxAttribute(declaration)) {
@@ -4456,11 +4457,6 @@ namespace ts {
                 return trueType;
             }
 
-            // If it is a short-hand property assignment, use the type of the identifier
-            if (declaration.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                return checkIdentifier(<Identifier>declaration.name);
-            }
-
             // If the declaration specifies a binding pattern, use the type implied by the binding pattern
             if (isBindingPattern(declaration.name)) {
                 return getTypeFromBindingPattern(<BindingPattern>declaration.name, /*includePatternInType*/ false, /*reportErrors*/ true);
@@ -4672,12 +4668,31 @@ namespace ts {
                     declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
                     type = getWidenedTypeFromJSSpecialPropertyDeclarations(symbol);
                 }
+                else if (isJSDocPropertyTag(declaration)) {
+                    type = anyType; // TODO: Mimics old behavior from incorrect usage of getWidenedTypeForVariableLikeDeclaration, but seems incorrect
+                }
+                else if (isPropertyAccessExpression(declaration) || isMethodDeclaration(declaration) && !isObjectLiteralMethod(declaration)) {
+                    // TODO: Mimics old behavior from incorrect usage of getWidenedTypeForVariableLikeDeclaration, but seems lacking
+                    const typeNode = getEffectiveTypeAnnotationNode(declaration);
+                    if (typeNode) {
+                        type = getTypeFromTypeNode(typeNode);
+                    }
+                    else {
+                        type = anyType;
+                    }
+                }
                 else if (isPropertyAssignment(declaration)) {
                     type = checkPropertyAssignment(declaration);
                 }
                 else if (isJsxAttribute(declaration)) {
                     type = checkJsxAttribute(declaration);
                 }
+                else if (isShorthandPropertyAssignment(declaration)) {
+                    type = checkExpressionForMutableLocation(declaration.name, CheckMode.Normal);
+                }
+                else if (isObjectLiteralMethod(declaration)) {
+                    type = checkObjectLiteralMethod(declaration, CheckMode.Normal);
+                }
                 else if (isParameter(declaration)
                     || isPropertyDeclaration(declaration)
                     || isPropertySignature(declaration)
@@ -5458,7 +5473,7 @@ namespace ts {
          */
         function isThislessVariableLikeDeclaration(node: VariableLikeDeclaration): boolean {
             const typeNode = getEffectiveTypeAnnotationNode(node);
-            return typeNode ? isThislessType(typeNode) : !node.initializer;
+            return typeNode ? isThislessType(typeNode) : !hasInitializer(node);
         }
 
         /**
@@ -13899,7 +13914,7 @@ namespace ts {
         //   the contextual type of an initializer expression is the type annotation of the containing declaration, if present.
         function getContextualTypeForInitializerExpression(node: Expression): Type {
             const declaration = <VariableLikeDeclaration>node.parent;
-            if (node === declaration.initializer || node.kind === SyntaxKind.EqualsToken) {
+            if (hasInitializer(declaration) && node === declaration.initializer || node.kind === SyntaxKind.EqualsToken) {
                 const typeNode = getEffectiveTypeAnnotationNode(declaration);
                 if (typeNode) {
                     return getTypeFromTypeNode(typeNode);
@@ -13915,7 +13930,7 @@ namespace ts {
                 }
                 if (isBindingPattern(declaration.parent)) {
                     const parentDeclaration = declaration.parent.parent;
-                    const name = declaration.propertyName || declaration.name;
+                    const name = (declaration as BindingElement).propertyName || (declaration as BindingElement).name;
                     if (parentDeclaration.kind !== SyntaxKind.BindingElement) {
                         const parentTypeNode = getEffectiveTypeAnnotationNode(parentDeclaration);
                         if (parentTypeNode && !isBindingPattern(name)) {
@@ -17818,7 +17833,7 @@ namespace ts {
             const type = getTypeOfSymbol(symbol);
             if (strictNullChecks) {
                 const declaration = symbol.valueDeclaration;
-                if (declaration && (<VariableLikeDeclaration>declaration).initializer) {
+                if (declaration && hasInitializer(declaration)) {
                     return getOptionalType(type);
                 }
             }
@@ -19102,7 +19117,7 @@ namespace ts {
             return node.kind === SyntaxKind.TypeAssertionExpression || node.kind === SyntaxKind.AsExpression;
         }
 
-        function checkDeclarationInitializer(declaration: VariableLikeDeclaration) {
+        function checkDeclarationInitializer(declaration: HasExpressionInitializer) {
             const type = getTypeOfExpression(declaration.initializer, /*cache*/ true);
             return getCombinedNodeFlags(declaration) & NodeFlags.Const ||
                 (getCombinedModifierFlags(declaration) & ModifierFlags.Readonly && !isParameterPropertyDeclaration(declaration)) ||
@@ -21465,7 +21480,7 @@ namespace ts {
         }
 
         // Check that a parameter initializer contains no references to parameters declared to the right of itself
-        function checkParameterInitializer(node: VariableLikeDeclaration): void {
+        function checkParameterInitializer(node: HasExpressionInitializer): void {
             if (getRootDeclaration(node).kind !== SyntaxKind.Parameter) {
                 return;
             }
@@ -21552,7 +21567,7 @@ namespace ts {
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
             if (node.name.kind === SyntaxKind.ComputedPropertyName) {
-                checkComputedPropertyName(<ComputedPropertyName>node.name);
+                checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
@@ -21564,11 +21579,11 @@ namespace ts {
                 }
                 // check computed properties inside property names of binding elements
                 if (node.propertyName && node.propertyName.kind === SyntaxKind.ComputedPropertyName) {
-                    checkComputedPropertyName(<ComputedPropertyName>node.propertyName);
+                    checkComputedPropertyName(node.propertyName);
                 }
 
                 // check private/protected variable access
-                const parent = <VariableLikeDeclaration>(<BindingPattern>node.parent).parent;
+                const parent = node.parent.parent;
                 const parentType = getTypeForBindingElementParent(parent);
                 const name = node.propertyName || <Identifier>node.name;
                 const property = getPropertyOfType(parentType, getTextOfPropertyName(name));
@@ -24514,7 +24529,7 @@ namespace ts {
             }
 
             if (isBindingPattern(node)) {
-                return getTypeForVariableLikeDeclaration(<VariableLikeDeclaration>node.parent, /*includeOptionality*/ true);
+                return getTypeForVariableLikeDeclaration(node.parent, /*includeOptionality*/ true);
             }
 
             if (isInRightSideOfImportOrExportAssignment(<Identifier>node)) {
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index dc76e0ddf5028..b4ff7c7f641eb 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -64,7 +64,7 @@ namespace ts {
         let currentIdentifiers: Map<string>;
         let isCurrentFileExternalModule: boolean;
         let reportedDeclarationError = false;
-        let errorNameNode: DeclarationName;
+        let errorNameNode: DeclarationName | QualifiedName;
         const emitJsDocComments = compilerOptions.removeComments ? noop : writeJsDocComments;
         const emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         let needsDeclare = true;
@@ -1372,7 +1372,7 @@ namespace ts {
             // if this is property of type literal,
             // or is parameter of method/call/construct/index signature of type literal
             // emit only if type is specified
-            if (node.type) {
+            if (hasType(node)) {
                 write(": ");
                 emitType(node.type);
             }
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 52776f8e6a237..ce4115b08d439 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -88,20 +88,48 @@ namespace ts {
             case SyntaxKind.SpreadAssignment:
                 return visitNode(cbNode, (<SpreadAssignment>node).expression);
             case SyntaxKind.Parameter:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, (<ParameterDeclaration>node).dotDotDotToken) ||
+                    visitNode(cbNode, (<ParameterDeclaration>node).name) ||
+                    visitNode(cbNode, (<ParameterDeclaration>node).questionToken) ||
+                    visitNode(cbNode, (<ParameterDeclaration>node).type) ||
+                    visitNode(cbNode, (<ParameterDeclaration>node).initializer);
             case SyntaxKind.PropertyDeclaration:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, (<PropertyDeclaration>node).name) ||
+                    visitNode(cbNode, (<PropertyDeclaration>node).questionToken) ||
+                    visitNode(cbNode, (<PropertyDeclaration>node).exclamationToken) ||
+                    visitNode(cbNode, (<PropertyDeclaration>node).type) ||
+                    visitNode(cbNode, (<PropertyDeclaration>node).initializer);
             case SyntaxKind.PropertySignature:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, (<PropertySignature>node).name) ||
+                    visitNode(cbNode, (<PropertySignature>node).questionToken) ||
+                    visitNode(cbNode, (<PropertySignature>node).type) ||
+                    visitNode(cbNode, (<PropertySignature>node).initializer);
             case SyntaxKind.PropertyAssignment:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, (<PropertyAssignment>node).name) ||
+                    visitNode(cbNode, (<PropertyAssignment>node).questionToken) ||
+                    visitNode(cbNode, (<PropertyAssignment>node).initializer);
             case SyntaxKind.VariableDeclaration:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, (<VariableDeclaration>node).name) ||
+                    visitNode(cbNode, (<VariableDeclaration>node).exclamationToken) ||
+                    visitNode(cbNode, (<VariableDeclaration>node).type) ||
+                    visitNode(cbNode, (<VariableDeclaration>node).initializer);
             case SyntaxKind.BindingElement:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
-                    visitNode(cbNode, (<VariableLikeDeclaration>node).propertyName) ||
-                    visitNode(cbNode, (<VariableLikeDeclaration>node).dotDotDotToken) ||
-                    visitNode(cbNode, (<VariableLikeDeclaration>node).name) ||
-                    visitNode(cbNode, (<VariableLikeDeclaration>node).questionToken) ||
-                    visitNode(cbNode, (<VariableLikeDeclaration>node).exclamationToken) ||
-                    visitNode(cbNode, (<VariableLikeDeclaration>node).type) ||
-                    visitNode(cbNode, (<VariableLikeDeclaration>node).initializer);
+                    visitNode(cbNode, (<BindingElement>node).propertyName) ||
+                    visitNode(cbNode, (<BindingElement>node).dotDotDotToken) ||
+                    visitNode(cbNode, (<BindingElement>node).name) ||
+                    visitNode(cbNode, (<BindingElement>node).initializer);
             case SyntaxKind.FunctionType:
             case SyntaxKind.ConstructorType:
             case SyntaxKind.CallSignature:
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 54f2ebfae420d..5283dc974967d 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -584,6 +584,50 @@ namespace ts {
         | JSDocFunctionType
         | EndOfFileToken;
 
+    /* @internal */
+    export interface TypeContainer {
+        type?: TypeNode;
+    }
+
+    export type HasType =
+        | SignatureDeclaration
+        | VariableDeclaration
+        | ParameterDeclaration
+        | PropertySignature
+        | PropertyDeclaration
+        | TypePredicateNode
+        | ParenthesizedTypeNode
+        | TypeOperatorNode
+        | MappedTypeNode
+        | AssertionExpression
+        | TypeAliasDeclaration
+        | JSDocTypeExpression
+        | JSDocNonNullableType
+        | JSDocNullableType
+        | JSDocOptionalType
+        | JSDocVariadicType;
+
+    /* @internal */
+    export interface InitializerContainer {
+        initializer?: Expression;
+    }
+
+    export type HasInitializer =
+        | HasExpressionInitializer
+        | ForStatement
+        | ForInStatement
+        | ForOfStatement
+        | JsxAttribute;
+
+    export type HasExpressionInitializer =
+        | VariableDeclaration
+        | ParameterDeclaration
+        | BindingElement
+        | PropertySignature
+        | PropertyDeclaration
+        | PropertyAssignment
+        | EnumMember;
+
     /* @internal */
     export type MutableNodeArray<T extends Node> = NodeArray<T> & T[];
 
@@ -848,25 +892,18 @@ namespace ts {
         expression: Expression;
     }
 
-    // SyntaxKind.VariableDeclaration
-    // SyntaxKind.Parameter
-    // SyntaxKind.BindingElement
-    // SyntaxKind.Property
-    // SyntaxKind.PropertyAssignment
-    // SyntaxKind.JsxAttribute
-    // SyntaxKind.ShorthandPropertyAssignment
-    // SyntaxKind.EnumMember
-    // SyntaxKind.JSDocPropertyTag
-    // SyntaxKind.JSDocParameterTag
-    export interface VariableLikeDeclaration extends NamedDeclaration {
-        propertyName?: PropertyName;
-        dotDotDotToken?: DotDotDotToken;
-        name: DeclarationName;
-        questionToken?: QuestionToken;
-        exclamationToken?: ExclamationToken;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
+    export type VariableLikeDeclaration =
+        | VariableDeclaration
+        | ParameterDeclaration
+        | BindingElement
+        | PropertyDeclaration
+        | PropertyAssignment
+        | PropertySignature
+        | JsxAttribute
+        | ShorthandPropertyAssignment
+        | EnumMember
+        | JSDocPropertyTag
+        | JSDocParameterTag;
 
     export interface PropertyLikeDeclaration extends NamedDeclaration {
         name: PropertyName;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 4a7b46a8b0ee2..91e63019f30a6 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -548,7 +548,7 @@ namespace ts {
     // Return display name of an identifier
     // Computed property names will just be emitted as "[<expr>]", where <expr> is the source
     // text of the expression in the computed property.
-    export function declarationNameToString(name: DeclarationName) {
+    export function declarationNameToString(name: DeclarationName | QualifiedName) {
         return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
     }
 
@@ -784,7 +784,7 @@ namespace ts {
                     case SyntaxKind.PropertySignature:
                     case SyntaxKind.Parameter:
                     case SyntaxKind.VariableDeclaration:
-                        return node === (<VariableLikeDeclaration>parent).type;
+                        return node === (parent as Node & { type: Node }).type;
                     case SyntaxKind.FunctionDeclaration:
                     case SyntaxKind.FunctionExpression:
                     case SyntaxKind.ArrowFunction:
@@ -1340,7 +1340,7 @@ namespace ts {
             case SyntaxKind.EnumMember:
             case SyntaxKind.PropertyAssignment:
             case SyntaxKind.BindingElement:
-                return (<VariableLikeDeclaration>parent).initializer === node;
+                return (parent as Node & { initializer: Node }).initializer === node;
             case SyntaxKind.ExpressionStatement:
             case SyntaxKind.IfStatement:
             case SyntaxKind.DoStatement:
@@ -1650,7 +1650,7 @@ namespace ts {
                 result = addRange(result, getJSDocParameterTags(node as ParameterDeclaration));
             }
 
-            if (isVariableLike(node) && node.initializer && hasJSDocNodes(node.initializer)) {
+            if (isVariableLike(node) && hasInitializer(node) && hasJSDocNodes(node.initializer)) {
                 result = addRange(result, node.initializer.jsDoc);
             }
 
@@ -2816,8 +2816,8 @@ namespace ts {
      * Gets the effective type annotation of a variable, parameter, or property. If the node was
      * parsed in a JavaScript file, gets the type annotation from JSDoc.
      */
-    export function getEffectiveTypeAnnotationNode(node: VariableLikeDeclaration, checkJSDoc?: boolean): TypeNode | undefined {
-        if (node.type) {
+    export function getEffectiveTypeAnnotationNode(node: VariableLikeDeclaration | Expression, checkJSDoc?: boolean): TypeNode | undefined {
+        if (hasType(node)) {
             return node.type;
         }
         if (checkJSDoc || isInJavaScriptFile(node)) {
@@ -5812,4 +5812,22 @@ namespace ts {
     export function hasJSDocNodes(node: Node): node is HasJSDoc {
         return !!(node as JSDocContainer).jsDoc && (node as JSDocContainer).jsDoc.length > 0;
     }
+
+    /** True if has type node attached to it. */
+    /* @internal */
+    export function hasType(node: Node): node is HasType {
+        return !!(node as TypeContainer).type;
+    }
+
+    /** True if has initializer node attached to it. */
+    /* @internal */
+    export function hasInitializer(node: Node): node is HasInitializer {
+        return !!(node as InitializerContainer).initializer;
+    }
+
+    /** True if has initializer node attached to it. */
+    /* @internal */
+    export function hasOnlyExpressionInitializer(node: Node): node is HasExpressionInitializer {
+        return hasInitializer(node) && !isForStatement(node) && !isForInStatement(node) && !isForOfStatement(node) && !isJsxAttribute(node);
+    }
 }
diff --git a/src/services/completions.ts b/src/services/completions.ts
index d893f4852e4f8..a264ad10bc7e8 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -1325,7 +1325,7 @@ namespace ts.Completions {
                 // through type declaration or inference.
                 // Also proceed if rootDeclaration is a parameter and if its containing function expression/arrow function is contextually typed -
                 // type of parameter will flow in from the contextual type of the function
-                let canGetType = rootDeclaration.initializer || rootDeclaration.type || rootDeclaration.parent.parent.kind === SyntaxKind.ForOfStatement;
+                let canGetType = hasInitializer(rootDeclaration) || hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === SyntaxKind.ForOfStatement;
                 if (!canGetType && rootDeclaration.kind === SyntaxKind.Parameter) {
                     if (isExpression(rootDeclaration.parent)) {
                         canGetType = !!typeChecker.getContextualType(<Expression>rootDeclaration.parent);
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 59353cb8686ed..9726df1487da8 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -1060,7 +1060,7 @@ namespace ts.FindAllReferences.Core {
         const containingTypeReference = getContainingTypeReference(refNode);
         if (containingTypeReference && state.markSeenContainingTypeReference(containingTypeReference)) {
             const parent = containingTypeReference.parent;
-            if (isVariableLike(parent) && parent.type === containingTypeReference && parent.initializer && isImplementationExpression(parent.initializer)) {
+            if (hasType(parent) && parent.type === containingTypeReference && hasInitializer(parent) && isImplementationExpression(parent.initializer)) {
                 addReference(parent.initializer);
             }
             else if (isFunctionLike(parent) && parent.type === containingTypeReference && (parent as FunctionLikeDeclaration).body) {
@@ -1670,14 +1670,12 @@ namespace ts.FindAllReferences.Core {
         if (!node) {
             return false;
         }
-        else if (isVariableLike(node)) {
-            if (node.initializer) {
-                return true;
-            }
-            else if (node.kind === SyntaxKind.VariableDeclaration) {
-                const parentStatement = getParentStatementOfVariableDeclaration(<VariableDeclaration>node);
-                return parentStatement && hasModifier(parentStatement, ModifierFlags.Ambient);
-            }
+        else if (isVariableLike(node) && hasInitializer(node)) {
+            return true;
+        }
+        else if (node.kind === SyntaxKind.VariableDeclaration) {
+            const parentStatement = getParentStatementOfVariableDeclaration(<VariableDeclaration>node);
+            return parentStatement && hasModifier(parentStatement, ModifierFlags.Ambient);
         }
         else if (isFunctionLike(node)) {
             return !!(node as FunctionLikeDeclaration).body || hasModifier(node, ModifierFlags.Ambient);
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 464e70671f4bd..d90b7cdc3a989 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -453,6 +453,9 @@ declare namespace ts {
     interface JSDocContainer {
     }
     type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | EndOfFileToken;
+    type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType;
+    type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute;
+    type HasExpressionInitializer = VariableDeclaration | ParameterDeclaration | BindingElement | PropertySignature | PropertyDeclaration | PropertyAssignment | EnumMember;
     interface NodeArray<T extends Node> extends ReadonlyArray<T>, TextRange {
         hasTrailingComma?: boolean;
     }
@@ -604,15 +607,7 @@ declare namespace ts {
         kind: SyntaxKind.SpreadAssignment;
         expression: Expression;
     }
-    interface VariableLikeDeclaration extends NamedDeclaration {
-        propertyName?: PropertyName;
-        dotDotDotToken?: DotDotDotToken;
-        name: DeclarationName;
-        questionToken?: QuestionToken;
-        exclamationToken?: ExclamationToken;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
+    type VariableLikeDeclaration = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyDeclaration | PropertyAssignment | PropertySignature | JsxAttribute | ShorthandPropertyAssignment | EnumMember | JSDocPropertyTag | JSDocParameterTag;
     interface PropertyLikeDeclaration extends NamedDeclaration {
         name: PropertyName;
     }
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index bc7115a089a89..4d06e48dc2565 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -453,6 +453,9 @@ declare namespace ts {
     interface JSDocContainer {
     }
     type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | EndOfFileToken;
+    type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType;
+    type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute;
+    type HasExpressionInitializer = VariableDeclaration | ParameterDeclaration | BindingElement | PropertySignature | PropertyDeclaration | PropertyAssignment | EnumMember;
     interface NodeArray<T extends Node> extends ReadonlyArray<T>, TextRange {
         hasTrailingComma?: boolean;
     }
@@ -604,15 +607,7 @@ declare namespace ts {
         kind: SyntaxKind.SpreadAssignment;
         expression: Expression;
     }
-    interface VariableLikeDeclaration extends NamedDeclaration {
-        propertyName?: PropertyName;
-        dotDotDotToken?: DotDotDotToken;
-        name: DeclarationName;
-        questionToken?: QuestionToken;
-        exclamationToken?: ExclamationToken;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
+    type VariableLikeDeclaration = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyDeclaration | PropertyAssignment | PropertySignature | JsxAttribute | ShorthandPropertyAssignment | EnumMember | JSDocPropertyTag | JSDocParameterTag;
     interface PropertyLikeDeclaration extends NamedDeclaration {
         name: PropertyName;
     }
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
index 72c5c55228e0d..60aa4bc0a8000 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
@@ -10,12 +10,12 @@ const obj = {
 
   /** @type {string|undefined} */
   foo: undefined,
->foo : string | undefined
+>foo : undefined
 >undefined : undefined
 
   /** @type {string|undefined} */
   bar: "42",
->bar : string | undefined
+>bar : string
 >"42" : "42"
 
   /** @type {function(number): number} */
@@ -42,7 +42,7 @@ const obj = {
 
   /** @type {function(number): number} */
   arrowFunc: (num) => num + 42
->arrowFunc : (arg0: number) => number
+>arrowFunc : (num: any) => any
 >(num) => num + 42 : (num: any) => any
 >num : any
 >num + 42 : any
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
index 443826c7aeb58..8f16ebfae5d3f 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
@@ -9,7 +9,7 @@ const obj = {
 
   /** @type {string|undefined} */
   bar: 42,
->bar : string | undefined
+>bar : number
 >42 : 42
 
   /** @type {function(number): number} */
@@ -23,14 +23,14 @@ const obj = {
   },
   /** @type {function(number): number} */
   method2: (n1) => "lol",
->method2 : (arg0: number) => number
+>method2 : (n1: any) => string
 >(n1) => "lol" : (n1: any) => string
 >n1 : any
 >"lol" : "lol"
 
   /** @type {function(number): number} */
   arrowFunc: (num="0") => num + 42,
->arrowFunc : (arg0: number) => number
+>arrowFunc : (num?: string) => string
 >(num="0") => num + 42 : (num?: string) => string
 >num : string
 >"0" : "0"
@@ -40,7 +40,7 @@ const obj = {
 
   /** @type {string} */
   lol
->lol : string
+>lol : undefined
 }
 lol = "string"
 >lol = "string" : "string"
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types
index fb2c7b295b275..7e6efdf426439 100644
--- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types
+++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types
@@ -100,7 +100,7 @@ function f15() {
 >{ a4, b4, c4 } : { a4: string; b4: number; c4: boolean; }
 >a4 : string
 >b4 : number
->c4 : true
+>c4 : boolean
 }
 var { a4, b4, c4 } = f15();
 >a4 : string
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types
index a86976c0d1f40..c73afd0b9cff9 100644
--- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types
+++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types
@@ -39,7 +39,7 @@ function f15() {
 >{ a4, b4, c4 } : { a4: string; b4: number; c4: boolean; }
 >a4 : string
 >b4 : number
->c4 : true
+>c4 : boolean
 }
 var { a4, b4, c4 } = f15();
 >a4 : string
diff --git a/tests/baselines/reference/declarationsAndAssignments.types b/tests/baselines/reference/declarationsAndAssignments.types
index e03a8cc6d3861..b49868c475083 100644
--- a/tests/baselines/reference/declarationsAndAssignments.types
+++ b/tests/baselines/reference/declarationsAndAssignments.types
@@ -495,7 +495,7 @@ function f15() {
 >{ a, b, c } : { a: string; b: number; c: boolean; }
 >a : string
 >b : number
->c : true
+>c : boolean
 }
 
 function f16() {
diff --git a/tests/baselines/reference/for-inStatementsDestructuring4.types b/tests/baselines/reference/for-inStatementsDestructuring4.types
index 67278e3d7a364..26b833a1feb66 100644
--- a/tests/baselines/reference/for-inStatementsDestructuring4.types
+++ b/tests/baselines/reference/for-inStatementsDestructuring4.types
@@ -5,7 +5,7 @@ var a, b;
 
 for ({a, b} in []) { }
 >{a, b} : { a: any; b: any; }
->a : string
->b : string
+>a : any
+>b : any
 >[] : undefined[]
 
diff --git a/tests/baselines/reference/for-of47.types b/tests/baselines/reference/for-of47.types
index 5e8cd4d04ded1..9f98a2c63b409 100644
--- a/tests/baselines/reference/for-of47.types
+++ b/tests/baselines/reference/for-of47.types
@@ -18,8 +18,8 @@ enum E { x }
 
 for ({x, y: y = E.x} of array) {
 >{x, y: y = E.x} : { x: string; y?: E; }
->x : { x: string; y: boolean; }
->y : { x: string; y: boolean; }
+>x : string
+>y : E
 >y = E.x : E
 >y : number
 >E.x : E
diff --git a/tests/baselines/reference/for-of48.types b/tests/baselines/reference/for-of48.types
index 6bb3efeeee7d3..af93d4968f249 100644
--- a/tests/baselines/reference/for-of48.types
+++ b/tests/baselines/reference/for-of48.types
@@ -18,8 +18,8 @@ enum E { x }
 
 for ({x, y = E.x} of array) {
 >{x, y = E.x} : { x: string; y?: number; }
->x : { x: string; y: boolean; }
->y : { x: string; y: boolean; }
+>x : string
+>y : number
 >E.x : E
 >E : typeof E
 >x : E
diff --git a/tests/baselines/reference/shorthand-property-es5-es6.types b/tests/baselines/reference/shorthand-property-es5-es6.types
index d15c5104f9260..298aae2c58d90 100644
--- a/tests/baselines/reference/shorthand-property-es5-es6.types
+++ b/tests/baselines/reference/shorthand-property-es5-es6.types
@@ -10,5 +10,5 @@ const bar = { foo, baz };
 >bar : { foo: any; baz: number; }
 >{ foo, baz } : { foo: any; baz: number; }
 >foo : any
->baz : 42
+>baz : number
 
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.types b/tests/baselines/reference/shorthand-property-es6-amd.types
index d15c5104f9260..298aae2c58d90 100644
--- a/tests/baselines/reference/shorthand-property-es6-amd.types
+++ b/tests/baselines/reference/shorthand-property-es6-amd.types
@@ -10,5 +10,5 @@ const bar = { foo, baz };
 >bar : { foo: any; baz: number; }
 >{ foo, baz } : { foo: any; baz: number; }
 >foo : any
->baz : 42
+>baz : number
 
diff --git a/tests/baselines/reference/shorthand-property-es6-es6.types b/tests/baselines/reference/shorthand-property-es6-es6.types
index d15c5104f9260..298aae2c58d90 100644
--- a/tests/baselines/reference/shorthand-property-es6-es6.types
+++ b/tests/baselines/reference/shorthand-property-es6-es6.types
@@ -10,5 +10,5 @@ const bar = { foo, baz };
 >bar : { foo: any; baz: number; }
 >{ foo, baz } : { foo: any; baz: number; }
 >foo : any
->baz : 42
+>baz : number
 
diff --git a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.types b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.types
index 2959acfeb64ec..6cb51a8f0b4a4 100644
--- a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.types
+++ b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.types
@@ -9,6 +9,6 @@ export function foo () {
   const x = { test };
 >x : { test: string; }
 >{ test } : { test: string; }
->test : "test"
+>test : string
 }
 
diff --git a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.types b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.types
index 146a32e14a50f..80316dfb57954 100644
--- a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.types
+++ b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.types
@@ -9,6 +9,6 @@ export function foo () {
   const x = { test };
 >x : { test: string; }
 >{ test } : { test: string; }
->test : "test"
+>test : string
 }
 
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.types b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.types
index 864a04d7b82a2..80d148880527b 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.types
+++ b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.types
@@ -8,7 +8,7 @@
 
 	for ({ s0 = 5 } of [{ s0: 1 }]) {
 >{ s0 = 5 } : { s0?: any; }
->s0 : { s0: number; }
+>s0 : any
 >[{ s0: 1 }] : { s0: number; }[]
 >{ s0: 1 } : { s0: number; }
 >s0 : number
@@ -24,7 +24,7 @@
 
 	for ({ s0:s0 = 5 } of [{ s0: 1 }]) {
 >{ s0:s0 = 5 } : { s0?: number; }
->s0 : { s0: number; }
+>s0 : number
 >s0 = 5 : 5
 >s0 : any
 >5 : 5
@@ -44,7 +44,7 @@
 
 	for ({ s1 = 5 } of [{}]) {
 >{ s1 = 5 } : { s1?: any; }
->s1 : {}
+>s1 : any
 >[{}] : {}[]
 >{} : {}
 	}
@@ -59,7 +59,7 @@
 
 	for ({ s1:s1 = 5 } of [{}]) {
 >{ s1:s1 = 5 } : { s1?: number; }
->s1 : {}
+>s1 : number
 >s1 = 5 : 5
 >s1 : any
 >5 : 5
@@ -77,7 +77,7 @@
 
 	for ({ s2 = 5 } of [{ s2: "" }]) {
 >{ s2 = 5 } : { s2?: any; }
->s2 : { s2: string; }
+>s2 : any
 >[{ s2: "" }] : { s2: string; }[]
 >{ s2: "" } : { s2: string; }
 >s2 : string
@@ -94,7 +94,7 @@
 
 	for ({ s2:s2 = 5 } of [{ s2: "" }]) {
 >{ s2:s2 = 5 } : { s2?: number; }
->s2 : { s2: string; }
+>s2 : number
 >s2 = 5 : 5
 >s2 : any
 >5 : 5
@@ -114,7 +114,7 @@
 
 	for ({ s3 = 5 } of [{ s3: "" }]) {
 >{ s3 = 5 } : { s3?: string; }
->s3 : { s3: string; }
+>s3 : string
 >[{ s3: "" }] : { s3: string; }[]
 >{ s3: "" } : { s3: string; }
 >s3 : string
@@ -131,7 +131,7 @@
 
 	for ({ s3:s3 = 5 } of [{ s3: "" }]) {
 >{ s3:s3 = 5 } : { s3?: number; }
->s3 : { s3: string; }
+>s3 : number
 >s3 = 5 : 5
 >s3 : string
 >5 : 5
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.types b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.types
index 939d9864fd086..5e3d61d09b149 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.types
+++ b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.types
@@ -8,7 +8,7 @@
 
 	for ({ s0 = 5 } of [{ s0: 1 }]) {
 >{ s0 = 5 } : { s0?: any; }
->s0 : { s0: number; }
+>s0 : any
 >[{ s0: 1 }] : { s0: number; }[]
 >{ s0: 1 } : { s0: number; }
 >s0 : number
@@ -24,7 +24,7 @@
 
 	for ({ s0:s0 = 5 } of [{ s0: 1 }]) {
 >{ s0:s0 = 5 } : { s0?: number; }
->s0 : { s0: number; }
+>s0 : number
 >s0 = 5 : 5
 >s0 : any
 >5 : 5
@@ -44,7 +44,7 @@
 
 	for ({ s1 = 5 } of [{}]) {
 >{ s1 = 5 } : { s1?: any; }
->s1 : {}
+>s1 : any
 >[{}] : {}[]
 >{} : {}
 	}
@@ -59,7 +59,7 @@
 
 	for ({ s1:s1 = 5 } of [{}]) {
 >{ s1:s1 = 5 } : { s1?: number; }
->s1 : {}
+>s1 : number
 >s1 = 5 : 5
 >s1 : any
 >5 : 5
@@ -77,7 +77,7 @@
 
 	for ({ s2 = 5 } of [{ s2: "" }]) {
 >{ s2 = 5 } : { s2?: any; }
->s2 : { s2: string; }
+>s2 : any
 >[{ s2: "" }] : { s2: string; }[]
 >{ s2: "" } : { s2: string; }
 >s2 : string
@@ -94,7 +94,7 @@
 
 	for ({ s2:s2 = 5 } of [{ s2: "" }]) {
 >{ s2:s2 = 5 } : { s2?: number; }
->s2 : { s2: string; }
+>s2 : number
 >s2 = 5 : 5
 >s2 : any
 >5 : 5
@@ -114,7 +114,7 @@
 
 	for ({ s3 = 5 } of [{ s3: "" }]) {
 >{ s3 = 5 } : { s3?: string; }
->s3 : { s3: string; }
+>s3 : string
 >[{ s3: "" }] : { s3: string; }[]
 >{ s3: "" } : { s3: string; }
 >s3 : string
@@ -131,7 +131,7 @@
 
 	for ({ s3:s3 = 5 } of [{ s3: "" }]) {
 >{ s3:s3 = 5 } : { s3?: number; }
->s3 : { s3: string; }
+>s3 : number
 >s3 = 5 : 5
 >s3 : string
 >5 : 5
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
index 64680d66001d9..6479900ef1a5a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
@@ -103,7 +103,7 @@ let name: string, primary: string, secondary: string, skill: string;
 
 for ({name: nameA } of robots) {
 >{name: nameA } : { name: string; }
->name : Robot
+>name : string
 >nameA : string
 >robots : Robot[]
 
@@ -116,7 +116,7 @@ for ({name: nameA } of robots) {
 }
 for ({name: nameA } of getRobots()) {
 >{name: nameA } : { name: string; }
->name : Robot
+>name : string
 >nameA : string
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
@@ -130,7 +130,7 @@ for ({name: nameA } of getRobots()) {
 }
 for ({name: nameA } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{name: nameA } : { name: string; }
->name : { name: string; skill: string; }
+>name : string
 >nameA : string
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
@@ -153,7 +153,7 @@ for ({name: nameA } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", s
 }
 for ({ skills: { primary: primaryA, secondary: secondaryA } } of multiRobots) {
 >{ skills: { primary: primaryA, secondary: secondaryA } } : { skills: { primary: string; secondary: string; }; }
->skills : MultiRobot
+>skills : { primary: string; secondary: string; }
 >{ primary: primaryA, secondary: secondaryA } : { primary: string; secondary: string; }
 >primary : string
 >primaryA : string
@@ -170,7 +170,7 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } of multiRobots) {
 }
 for ({ skills: { primary: primaryA, secondary: secondaryA } } of getMultiRobots()) {
 >{ skills: { primary: primaryA, secondary: secondaryA } } : { skills: { primary: string; secondary: string; }; }
->skills : MultiRobot
+>skills : { primary: string; secondary: string; }
 >{ primary: primaryA, secondary: secondaryA } : { primary: string; secondary: string; }
 >primary : string
 >primaryA : string
@@ -188,7 +188,7 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } of getMultiRobots(
 }
 for ({ skills: { primary: primaryA, secondary: secondaryA } } of [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >{ skills: { primary: primaryA, secondary: secondaryA } } : { skills: { primary: string; secondary: string; }; }
->skills : { name: string; skills: { primary: string; secondary: string; }; }
+>skills : { primary: string; secondary: string; }
 >{ primary: primaryA, secondary: secondaryA } : { primary: string; secondary: string; }
 >primary : string
 >primaryA : string
@@ -225,7 +225,7 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } of [{ name: "mower
 }
 for ({name } of robots) {
 >{name } : { name: string; }
->name : Robot
+>name : string
 >robots : Robot[]
 
     console.log(nameA);
@@ -237,7 +237,7 @@ for ({name } of robots) {
 }
 for ({name } of getRobots()) {
 >{name } : { name: string; }
->name : Robot
+>name : string
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
 
@@ -250,7 +250,7 @@ for ({name } of getRobots()) {
 }
 for ({name } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{name } : { name: string; }
->name : { name: string; skill: string; }
+>name : string
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -272,7 +272,7 @@ for ({name } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "
 }
 for ({ skills: { primary, secondary } } of multiRobots) {
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
->skills : MultiRobot
+>skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
 >primary : string
 >secondary : string
@@ -287,7 +287,7 @@ for ({ skills: { primary, secondary } } of multiRobots) {
 }
 for ({ skills: { primary, secondary } } of getMultiRobots()) {
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
->skills : MultiRobot
+>skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
 >primary : string
 >secondary : string
@@ -303,7 +303,7 @@ for ({ skills: { primary, secondary } } of getMultiRobots()) {
 }
 for ({ skills: { primary, secondary } } of [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
->skills : { name: string; skills: { primary: string; secondary: string; }; }
+>skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
 >primary : string
 >secondary : string
@@ -340,9 +340,9 @@ for ({ skills: { primary, secondary } } of [{ name: "mower", skills: { primary:
 
 for ({name: nameA, skill: skillA } of robots) {
 >{name: nameA, skill: skillA } : { name: string; skill: string; }
->name : Robot
+>name : string
 >nameA : string
->skill : Robot
+>skill : string
 >skillA : string
 >robots : Robot[]
 
@@ -355,9 +355,9 @@ for ({name: nameA, skill: skillA } of robots) {
 }
 for ({name: nameA, skill: skillA } of getRobots()) {
 >{name: nameA, skill: skillA } : { name: string; skill: string; }
->name : Robot
+>name : string
 >nameA : string
->skill : Robot
+>skill : string
 >skillA : string
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
@@ -371,9 +371,9 @@ for ({name: nameA, skill: skillA } of getRobots()) {
 }
 for ({name: nameA, skill: skillA } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{name: nameA, skill: skillA } : { name: string; skill: string; }
->name : { name: string; skill: string; }
+>name : string
 >nameA : string
->skill : { name: string; skill: string; }
+>skill : string
 >skillA : string
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
@@ -396,9 +396,9 @@ for ({name: nameA, skill: skillA } of [{ name: "mower", skill: "mowing" }, { nam
 }
 for ({name: nameA, skills: { primary: primaryA, secondary: secondaryA } } of multiRobots) {
 >{name: nameA, skills: { primary: primaryA, secondary: secondaryA } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : MultiRobot
+>name : string
 >nameA : string
->skills : MultiRobot
+>skills : { primary: string; secondary: string; }
 >{ primary: primaryA, secondary: secondaryA } : { primary: string; secondary: string; }
 >primary : string
 >primaryA : string
@@ -415,9 +415,9 @@ for ({name: nameA, skills: { primary: primaryA, secondary: secondaryA } } of mul
 }
 for ({name: nameA, skills: { primary: primaryA, secondary: secondaryA } } of getMultiRobots()) {
 >{name: nameA, skills: { primary: primaryA, secondary: secondaryA } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : MultiRobot
+>name : string
 >nameA : string
->skills : MultiRobot
+>skills : { primary: string; secondary: string; }
 >{ primary: primaryA, secondary: secondaryA } : { primary: string; secondary: string; }
 >primary : string
 >primaryA : string
@@ -435,9 +435,9 @@ for ({name: nameA, skills: { primary: primaryA, secondary: secondaryA } } of get
 }
 for ({name: nameA, skills: { primary: primaryA, secondary: secondaryA } } of [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >{name: nameA, skills: { primary: primaryA, secondary: secondaryA } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : { name: string; skills: { primary: string; secondary: string; }; }
+>name : string
 >nameA : string
->skills : { name: string; skills: { primary: string; secondary: string; }; }
+>skills : { primary: string; secondary: string; }
 >{ primary: primaryA, secondary: secondaryA } : { primary: string; secondary: string; }
 >primary : string
 >primaryA : string
@@ -474,8 +474,8 @@ for ({name: nameA, skills: { primary: primaryA, secondary: secondaryA } } of [{
 }
 for ({name, skill } of robots) {
 >{name, skill } : { name: string; skill: string; }
->name : Robot
->skill : Robot
+>name : string
+>skill : string
 >robots : Robot[]
 
     console.log(nameA);
@@ -487,8 +487,8 @@ for ({name, skill } of robots) {
 }
 for ({name, skill } of getRobots()) {
 >{name, skill } : { name: string; skill: string; }
->name : Robot
->skill : Robot
+>name : string
+>skill : string
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
 
@@ -501,8 +501,8 @@ for ({name, skill } of getRobots()) {
 }
 for ({name, skill } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{name, skill } : { name: string; skill: string; }
->name : { name: string; skill: string; }
->skill : { name: string; skill: string; }
+>name : string
+>skill : string
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -524,8 +524,8 @@ for ({name, skill } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", s
 }
 for ({name, skills: { primary, secondary } } of multiRobots) {
 >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : MultiRobot
->skills : MultiRobot
+>name : string
+>skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
 >primary : string
 >secondary : string
@@ -540,8 +540,8 @@ for ({name, skills: { primary, secondary } } of multiRobots) {
 }
 for ({name, skills: { primary, secondary } } of getMultiRobots()) {
 >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : MultiRobot
->skills : MultiRobot
+>name : string
+>skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
 >primary : string
 >secondary : string
@@ -557,8 +557,8 @@ for ({name, skills: { primary, secondary } } of getMultiRobots()) {
 }
 for ({name, skills: { primary, secondary } } of [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : { name: string; skills: { primary: string; secondary: string; }; }
->skills : { name: string; skills: { primary: string; secondary: string; }; }
+>name : string
+>skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
 >primary : string
 >secondary : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
index 6119665124d2d..c3d941870be6b 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
@@ -103,7 +103,7 @@ let name: string, primary: string, secondary: string, skill: string;
 
 for ({name: nameA = "noName" } of robots) {
 >{name: nameA = "noName" } : { name?: string; }
->name : Robot
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
@@ -118,7 +118,7 @@ for ({name: nameA = "noName" } of robots) {
 }
 for ({name: nameA = "noName" } of getRobots()) {
 >{name: nameA = "noName" } : { name?: string; }
->name : Robot
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
@@ -134,7 +134,7 @@ for ({name: nameA = "noName" } of getRobots()) {
 }
 for ({name: nameA = "noName" } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{name: nameA = "noName" } : { name?: string; }
->name : { name: string; skill: string; }
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
@@ -159,7 +159,7 @@ for ({name: nameA = "noName" } of [{ name: "mower", skill: "mowing" }, { name: "
 }
 for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
 >{ skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =    { primary: "nosKill", secondary: "noSkill" } } : { skills?: { primary?: string; secondary?: string; }; }
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{ primary: primaryA = "primary", secondary: secondaryA = "secondary" } =    { primary: "nosKill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{ primary: primaryA = "primary", secondary: secondaryA = "secondary" } : { primary?: string; secondary?: string; }
 >primary : string
@@ -188,7 +188,7 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 }
 for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
 >{ skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =    { primary: "nosKill", secondary: "noSkill" } } : { skills?: { primary?: string; secondary?: string; }; }
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{ primary: primaryA = "primary", secondary: secondaryA = "secondary" } =    { primary: "nosKill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{ primary: primaryA = "primary", secondary: secondaryA = "secondary" } : { primary?: string; secondary?: string; }
 >primary : string
@@ -218,7 +218,7 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 }
 for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =
 >{ skills: { primary: primaryA = "primary", secondary: secondaryA = "secondary" } =    { primary: "nosKill", secondary: "noSkill" } } : { skills?: { primary?: string; secondary?: string; }; }
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{ primary: primaryA = "primary", secondary: secondaryA = "secondary" } =    { primary: "nosKill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{ primary: primaryA = "primary", secondary: secondaryA = "secondary" } : { primary?: string; secondary?: string; }
 >primary : string
@@ -272,7 +272,7 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 
 for ({ name = "noName" } of robots) {
 >{ name = "noName" } : { name?: string; }
->name : Robot
+>name : string
 >robots : Robot[]
 
     console.log(nameA);
@@ -284,7 +284,7 @@ for ({ name = "noName" } of robots) {
 }
 for ({ name = "noName" } of getRobots()) {
 >{ name = "noName" } : { name?: string; }
->name : Robot
+>name : string
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
 
@@ -297,7 +297,7 @@ for ({ name = "noName" } of getRobots()) {
 }
 for ({ name = "noName" } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{ name = "noName" } : { name?: string; }
->name : { name: string; skill: string; }
+>name : string
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -321,7 +321,7 @@ for ({
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { skills?: { primary?: string; secondary?: string; }; }
 
     skills: {
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
@@ -352,7 +352,7 @@ for ({
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { skills?: { primary?: string; secondary?: string; }; }
 
     skills: {
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
@@ -384,7 +384,7 @@ for ({
 >{    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { skills?: { primary?: string; secondary?: string; }; }
 
     skills: {
->skills : { name: string; skills: { primary: string; secondary: string; }; }
+>skills : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
@@ -435,11 +435,11 @@ for ({
 
 for ({name: nameA = "noName", skill: skillA = "noSkill" } of robots) {
 >{name: nameA = "noName", skill: skillA = "noSkill" } : { name?: string; skill?: string; }
->name : Robot
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
->skill : Robot
+>skill : string
 >skillA = "noSkill" : "noSkill"
 >skillA : string
 >"noSkill" : "noSkill"
@@ -454,11 +454,11 @@ for ({name: nameA = "noName", skill: skillA = "noSkill" } of robots) {
 }
 for ({name: nameA = "noName", skill: skillA = "noSkill"  } of getRobots()) {
 >{name: nameA = "noName", skill: skillA = "noSkill"  } : { name?: string; skill?: string; }
->name : Robot
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
->skill : Robot
+>skill : string
 >skillA = "noSkill" : "noSkill"
 >skillA : string
 >"noSkill" : "noSkill"
@@ -474,11 +474,11 @@ for ({name: nameA = "noName", skill: skillA = "noSkill"  } of getRobots()) {
 }
 for ({name: nameA = "noName", skill: skillA = "noSkill"  } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{name: nameA = "noName", skill: skillA = "noSkill"  } : { name?: string; skill?: string; }
->name : { name: string; skill: string; }
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
->skill : { name: string; skill: string; }
+>skill : string
 >skillA = "noSkill" : "noSkill"
 >skillA : string
 >"noSkill" : "noSkill"
@@ -505,13 +505,13 @@ for ({
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name: nameA = "noName",
->name : MultiRobot
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
 
     skills: {
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } : { primary?: string; secondary?: string; }
 
@@ -548,13 +548,13 @@ for ({
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name: nameA = "noName",
->name : MultiRobot
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
 
     skills: {
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } : { primary?: string; secondary?: string; }
 
@@ -592,13 +592,13 @@ for ({
 >{    name: nameA = "noName",    skills: {        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name: nameA = "noName",
->name : MultiRobot
+>name : string
 >nameA = "noName" : "noName"
 >nameA : string
 >"noName" : "noName"
 
     skills: {
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary: primaryA = "primary",        secondary: secondaryA = "secondary"    } : { primary?: string; secondary?: string; }
 
@@ -656,8 +656,8 @@ for ({
 
 for ({ name = "noName", skill  = "noSkill" } of robots) {
 >{ name = "noName", skill  = "noSkill" } : { name?: string; skill?: string; }
->name : Robot
->skill : Robot
+>name : string
+>skill : string
 >robots : Robot[]
 
     console.log(nameA);
@@ -669,8 +669,8 @@ for ({ name = "noName", skill  = "noSkill" } of robots) {
 }
 for ({ name = "noName", skill = "noSkill"  } of getRobots()) {
 >{ name = "noName", skill = "noSkill"  } : { name?: string; skill?: string; }
->name : Robot
->skill : Robot
+>name : string
+>skill : string
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
 
@@ -683,8 +683,8 @@ for ({ name = "noName", skill = "noSkill"  } of getRobots()) {
 }
 for ({ name = "noName", skill  = "noSkill" } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{ name = "noName", skill  = "noSkill" } : { name?: string; skill?: string; }
->name : { name: string; skill: string; }
->skill : { name: string; skill: string; }
+>name : string
+>skill : string
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -708,10 +708,10 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : MultiRobot
+>name : string
 
     skills: {
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
@@ -742,10 +742,10 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : MultiRobot
+>name : string
 
     skills: {
->skills : MultiRobot
+>skills : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
@@ -777,10 +777,10 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : { name: string; skills: { primary: string; secondary: string; }; }
+>name : string
 
     skills: {
->skills : { name: string; skills: { primary: string; secondary: string; }; }
+>skills : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" } : { primary?: string; secondary?: string; }
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
diff --git a/tests/baselines/reference/tsxEmit1.types b/tests/baselines/reference/tsxEmit1.types
index e56ab8dfa0442..9309e03feac87 100644
--- a/tests/baselines/reference/tsxEmit1.types
+++ b/tests/baselines/reference/tsxEmit1.types
@@ -25,36 +25,36 @@ var selfClosed2 = <div x="1" />;
 >selfClosed2 : JSX.Element
 ><div x="1" /> : JSX.Element
 >div : any
->x : string
+>x : "1"
 
 var selfClosed3 = <div x='1' />;
 >selfClosed3 : JSX.Element
 ><div x='1' /> : JSX.Element
 >div : any
->x : string
+>x : "1"
 
 var selfClosed4 = <div x="1" y='0' />;
 >selfClosed4 : JSX.Element
 ><div x="1" y='0' /> : JSX.Element
 >div : any
->x : string
->y : string
+>x : "1"
+>y : "0"
 
 var selfClosed5 = <div x={0} y='0' />;
 >selfClosed5 : JSX.Element
 ><div x={0} y='0' /> : JSX.Element
 >div : any
->x : number
+>x : 0
 >0 : 0
->y : string
+>y : "0"
 
 var selfClosed6 = <div x={"1"} y='0' />;
 >selfClosed6 : JSX.Element
 ><div x={"1"} y='0' /> : JSX.Element
 >div : any
->x : string
+>x : "1"
 >"1" : "1"
->y : string
+>y : "0"
 
 var selfClosed7 = <div x={p} y='p' />;
 >selfClosed7 : JSX.Element
@@ -62,7 +62,7 @@ var selfClosed7 = <div x={p} y='p' />;
 >div : any
 >x : any
 >p : any
->y : string
+>y : "p"
 
 var openClosed1 = <div></div>;
 >openClosed1 : JSX.Element
@@ -74,14 +74,14 @@ var openClosed2 = <div n='m'>foo</div>;
 >openClosed2 : JSX.Element
 ><div n='m'>foo</div> : JSX.Element
 >div : any
->n : string
+>n : "m"
 >div : any
 
 var openClosed3 = <div n='m'>{p}</div>;
 >openClosed3 : JSX.Element
 ><div n='m'>{p}</div> : JSX.Element
 >div : any
->n : string
+>n : "m"
 >p : any
 >div : any
 
@@ -89,7 +89,7 @@ var openClosed4 = <div n='m'>{p < p}</div>;
 >openClosed4 : JSX.Element
 ><div n='m'>{p < p}</div> : JSX.Element
 >div : any
->n : string
+>n : "m"
 >p < p : boolean
 >p : any
 >p : any
@@ -99,7 +99,7 @@ var openClosed5 = <div n='m'>{p > p}</div>;
 >openClosed5 : JSX.Element
 ><div n='m'>{p > p}</div> : JSX.Element
 >div : any
->n : string
+>n : "m"
 >p > p : boolean
 >p : any
 >p : any
diff --git a/tests/baselines/reference/tsxReactEmit1.types b/tests/baselines/reference/tsxReactEmit1.types
index 49dbc0c9fd9b7..488bb2bebd55a 100644
--- a/tests/baselines/reference/tsxReactEmit1.types
+++ b/tests/baselines/reference/tsxReactEmit1.types
@@ -27,36 +27,36 @@ var selfClosed2 = <div x="1" />;
 >selfClosed2 : JSX.Element
 ><div x="1" /> : JSX.Element
 >div : any
->x : string
+>x : "1"
 
 var selfClosed3 = <div x='1' />;
 >selfClosed3 : JSX.Element
 ><div x='1' /> : JSX.Element
 >div : any
->x : string
+>x : "1"
 
 var selfClosed4 = <div x="1" y='0' />;
 >selfClosed4 : JSX.Element
 ><div x="1" y='0' /> : JSX.Element
 >div : any
->x : string
->y : string
+>x : "1"
+>y : "0"
 
 var selfClosed5 = <div x={0} y='0' />;
 >selfClosed5 : JSX.Element
 ><div x={0} y='0' /> : JSX.Element
 >div : any
->x : number
+>x : 0
 >0 : 0
->y : string
+>y : "0"
 
 var selfClosed6 = <div x={"1"} y='0' />;
 >selfClosed6 : JSX.Element
 ><div x={"1"} y='0' /> : JSX.Element
 >div : any
->x : string
+>x : "1"
 >"1" : "1"
->y : string
+>y : "0"
 
 var selfClosed7 = <div x={p} y='p' b />;
 >selfClosed7 : JSX.Element
@@ -64,7 +64,7 @@ var selfClosed7 = <div x={p} y='p' b />;
 >div : any
 >x : any
 >p : any
->y : string
+>y : "p"
 >b : true
 
 var openClosed1 = <div></div>;
@@ -77,14 +77,14 @@ var openClosed2 = <div n='m'>foo</div>;
 >openClosed2 : JSX.Element
 ><div n='m'>foo</div> : JSX.Element
 >div : any
->n : string
+>n : "m"
 >div : any
 
 var openClosed3 = <div n='m'>{p}</div>;
 >openClosed3 : JSX.Element
 ><div n='m'>{p}</div> : JSX.Element
 >div : any
->n : string
+>n : "m"
 >p : any
 >div : any
 
@@ -92,7 +92,7 @@ var openClosed4 = <div n='m'>{p < p}</div>;
 >openClosed4 : JSX.Element
 ><div n='m'>{p < p}</div> : JSX.Element
 >div : any
->n : string
+>n : "m"
 >p < p : boolean
 >p : any
 >p : any
@@ -102,7 +102,7 @@ var openClosed5 = <div n='m' b>{p > p}</div>;
 >openClosed5 : JSX.Element
 ><div n='m' b>{p > p}</div> : JSX.Element
 >div : any
->n : string
+>n : "m"
 >b : true
 >p > p : boolean
 >p : any
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
index 2758ca7e0df1a..2fbb2d333ef6c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
@@ -41,7 +41,7 @@ function Baz<T,U>(key1: T, value: U) {
 >key1 : T
 >value : U
 >value : U
->key : string
+>key : "Component"
 }
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
index c589dccacbc47..ac6efaecf5e11 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
@@ -25,5 +25,5 @@ verify.referenceGroups(r2, [
 ]);
 verify.referenceGroups(r4, [
     { definition: "(property) I.property1: number", ranges: [r0, r1, r2, r3] },
-    { definition: "(property) property1: I", ranges: [r4] }
+    { definition: "(property) property1: any", ranges: [r4] }
 ]);
diff --git a/tests/cases/fourslash/tsxQuickInfo3.ts b/tests/cases/fourslash/tsxQuickInfo3.ts
index 614ffa878ef09..5130627097302 100644
--- a/tests/cases/fourslash/tsxQuickInfo3.ts
+++ b/tests/cases/fourslash/tsxQuickInfo3.ts
@@ -24,7 +24,7 @@
 
 verify.quickInfos({
     1: "class Opt",
-    2: "(JSX attribute) propx: number",
+    2: "(JSX attribute) propx: 2",
     3: "const obj1: OptionProp",
     4: "(JSX attribute) propx: true"
 });
diff --git a/tests/cases/fourslash/tsxQuickInfo4.ts b/tests/cases/fourslash/tsxQuickInfo4.ts
index d9f566571aafd..bc322d2f89287 100644
--- a/tests/cases/fourslash/tsxQuickInfo4.ts
+++ b/tests/cases/fourslash/tsxQuickInfo4.ts
@@ -48,7 +48,7 @@
 
 verify.quickInfos({
     1: "function MainButton(linkProps: LinkProps): any (+1 overload)",
-    2: "(JSX attribute) to: string",
+    2: "(JSX attribute) to: \"/some/path\"",
     3: "function MainButton(buttonProps: ButtonProps): any (+1 overload)",
     4: "(JSX attribute) onClick: () => void",
     5: "(JSX attribute) extra-prop: true"

From f53c7956273e371af51856f01befb29e39c378ee Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 14 Dec 2017 18:01:13 -0800
Subject: [PATCH 3/7] Fix part of bug WRT getTypeAtLocation and for loops

---
 src/compiler/checker.ts                                 | 4 ++--
 tests/baselines/reference/for-inStatements.types        | 6 +++---
 tests/baselines/reference/for-inStatementsInvalid.types | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 858bab12c7d7c..600c8203ab563 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4374,12 +4374,12 @@ namespace ts {
         function getTypeForVariableLikeDeclaration(declaration: ParameterDeclaration | PropertyDeclaration | PropertySignature | VariableDeclaration | BindingElement, includeOptionality: boolean): Type {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
             // right hand expression is of a type parameter type.
-            if (declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
+            if (isVariableDeclaration(declaration) && declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
                 const indexType = getIndexType(checkNonNullExpression((<ForInStatement>declaration.parent.parent).expression));
                 return indexType.flags & (TypeFlags.TypeParameter | TypeFlags.Index) ? indexType : stringType;
             }
 
-            if (declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
+            if (isVariableDeclaration(declaration) && declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
diff --git a/tests/baselines/reference/for-inStatements.types b/tests/baselines/reference/for-inStatements.types
index 8b39d7b59ac8e..97ebc291e8a51 100644
--- a/tests/baselines/reference/for-inStatements.types
+++ b/tests/baselines/reference/for-inStatements.types
@@ -107,12 +107,12 @@ for (var x in (<T>(x: T) => x)) { }
 
 for (var x in function (x: string, y: number) { return x + y }) { }
 >x : string
->function (x: string, y: number) { return x + y } : (x: string, y: string) => string
+>function (x: string, y: number) { return x + y } : (x: string, y: number) => string
 >x : string
->y : string
+>y : number
 >x + y : string
 >x : string
->y : string
+>y : number
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/for-inStatementsInvalid.types b/tests/baselines/reference/for-inStatementsInvalid.types
index 0fdebd738deb2..f991c47a3a424 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.types
+++ b/tests/baselines/reference/for-inStatementsInvalid.types
@@ -93,12 +93,12 @@ for (var x in (<T>(x: T) => x)) { }
 
 for (var x in function (x: string, y: number) { return x + y }) { }
 >x : string
->function (x: string, y: number) { return x + y } : (x: string, y: string) => string
+>function (x: string, y: number) { return x + y } : (x: string, y: number) => string
 >x : string
->y : string
+>y : number
 >x + y : string
 >x : string
->y : string
+>y : number
 
 class A {
 >A : A

From 7405a9c84ee964d67ab86cb70120202036c99861 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 15 Dec 2017 10:16:10 -0800
Subject: [PATCH 4/7] Baseline corrections pursuant to #20710

---
 .../reference/checkJsxChildrenProperty1.types | 14 +++----
 .../checkJsxChildrenProperty13.types          |  2 +-
 .../checkJsxChildrenProperty14.types          | 20 +++++-----
 .../reference/checkJsxChildrenProperty2.types | 30 +++++++--------
 .../reference/checkJsxChildrenProperty5.types | 12 +++---
 .../reference/checkJsxChildrenProperty6.types | 16 ++++----
 .../reference/checkJsxChildrenProperty7.types | 12 +++---
 .../reference/checkJsxChildrenProperty8.types | 16 ++++----
 .../contextualTypingOfOptionalMembers.types   |  2 +-
 .../reference/jsxEmitWithAttributes.types     |  2 +-
 .../reference/jsxEsprimaFbTestSuite.types     | 24 ++++++------
 .../jsxFactoryAndReactNamespace.types         |  2 +-
 .../reference/jsxFactoryIdentifier.types      |  2 +-
 ...xFactoryNotIdentifierOrQualifiedName.types |  2 +-
 ...FactoryNotIdentifierOrQualifiedName2.types |  2 +-
 .../reference/jsxFactoryQualifiedName.types   |  2 +-
 .../jsxInvalidEsprimaTestSuite.types          |  6 +--
 .../jsxMultilineAttributeStringValues.types   |  4 +-
 .../jsxMultilineAttributeValuesReact.types    |  6 +--
 .../reference/jsxParsingError1.types          |  2 +-
 .../reference/jsxPropsAsIdentifierNames.types |  2 +-
 .../reference/jsxReactTestSuite.types         | 26 ++++++-------
 .../reference/keywordInJsxIdentifier.types    |  4 +-
 .../reference/reactNamespaceJSXEmit.types     |  2 +-
 .../reference/tsxAttributeErrors.types        |  8 ++--
 .../reference/tsxAttributeResolution1.types   | 22 +++++------
 .../reference/tsxAttributeResolution10.types  |  6 +--
 .../reference/tsxAttributeResolution11.types  |  2 +-
 .../reference/tsxAttributeResolution14.types  | 10 ++---
 .../reference/tsxAttributeResolution15.types  |  4 +-
 .../reference/tsxAttributeResolution16.types  |  6 +--
 .../reference/tsxAttributeResolution3.types   |  6 +--
 .../reference/tsxAttributeResolution6.types   |  4 +-
 .../reference/tsxAttributeResolution7.types   |  8 ++--
 .../reference/tsxAttributeResolution9.types   |  4 +-
 .../reference/tsxElementResolution.types      |  2 +-
 .../reference/tsxElementResolution10.types    |  6 +--
 .../reference/tsxElementResolution11.types    |  6 +--
 .../reference/tsxElementResolution12.types    | 10 ++---
 .../reference/tsxElementResolution13.types    |  2 +-
 .../reference/tsxElementResolution14.types    |  2 +-
 .../reference/tsxElementResolution15.types    |  2 +-
 .../reference/tsxElementResolution16.types    |  2 +-
 .../reference/tsxElementResolution18.types    |  2 +-
 .../reference/tsxElementResolution3.types     |  4 +-
 .../reference/tsxElementResolution4.types     |  6 +--
 .../reference/tsxElementResolution5.types     |  2 +-
 .../reference/tsxElementResolution6.types     |  2 +-
 .../reference/tsxElementResolution7.types     |  4 +-
 .../reference/tsxElementResolution9.types     |  2 +-
 tests/baselines/reference/tsxEmit1.types      | 26 ++++++-------
 .../tsxGenericArrowFunctionParsing.types      |  2 +-
 .../reference/tsxGenericAttributesType1.types |  4 +-
 .../reference/tsxGenericAttributesType2.types |  2 +-
 .../reference/tsxGenericAttributesType3.types |  2 +-
 .../reference/tsxGenericAttributesType4.types |  2 +-
 .../reference/tsxGenericAttributesType5.types |  2 +-
 .../reference/tsxGenericAttributesType6.types |  2 +-
 .../reference/tsxGenericAttributesType7.types |  2 +-
 .../reference/tsxInArrowFunction.types        |  8 ++--
 ...sxInferenceShouldNotYieldAnyOnUnions.types |  6 +--
 ...ctComponentWithDefaultTypeParameter1.types |  4 +-
 ...ctComponentWithDefaultTypeParameter2.types |  2 +-
 ...ctComponentWithDefaultTypeParameter3.types |  6 +--
 tests/baselines/reference/tsxReactEmit1.types | 26 ++++++-------
 tests/baselines/reference/tsxReactEmit4.types |  2 +-
 tests/baselines/reference/tsxReactEmit5.types |  4 +-
 tests/baselines/reference/tsxReactEmit6.types |  4 +-
 tests/baselines/reference/tsxReactEmit7.types | 18 ++++-----
 .../reference/tsxReactEmitEntities.types      |  6 +--
 .../reference/tsxReactEmitNesting.types       | 30 +++++++--------
 .../tsxSpreadAttributesResolution10.types     |  2 +-
 .../tsxSpreadAttributesResolution11.types     |  6 +--
 .../tsxSpreadAttributesResolution12.types     |  6 +--
 .../tsxSpreadAttributesResolution13.types     |  2 +-
 .../tsxSpreadAttributesResolution15.types     |  2 +-
 .../tsxSpreadAttributesResolution2.types      |  2 +-
 .../tsxSpreadAttributesResolution3.types      |  4 +-
 .../tsxSpreadAttributesResolution6.types      |  2 +-
 .../tsxSpreadAttributesResolution8.types      |  2 +-
 ...xStatelessFunctionComponentOverload1.types | 38 +++++++++----------
 ...xStatelessFunctionComponentOverload2.types |  6 +--
 ...xStatelessFunctionComponentOverload3.types | 16 ++++----
 ...xStatelessFunctionComponentOverload4.types | 24 ++++++------
 ...xStatelessFunctionComponentOverload5.types |  6 +--
 ...xStatelessFunctionComponentOverload6.types | 14 +++----
 ...onComponentWithDefaultTypeParameter1.types |  2 +-
 ...onComponentWithDefaultTypeParameter2.types |  2 +-
 .../tsxStatelessFunctionComponents1.types     | 16 ++++----
 .../tsxStatelessFunctionComponents2.types     |  6 +--
 ...FunctionComponentsWithTypeArguments1.types |  2 +-
 ...FunctionComponentsWithTypeArguments2.types |  2 +-
 ...FunctionComponentsWithTypeArguments3.types |  6 +--
 ...FunctionComponentsWithTypeArguments5.types |  8 ++--
 tests/baselines/reference/tsxTypeErrors.types |  8 ++--
 .../reference/tsxUnionElementType2.types      |  2 +-
 .../reference/tsxUnionElementType3.types      |  6 +--
 .../reference/tsxUnionElementType4.types      |  2 +-
 .../reference/tsxUnionElementType6.types      |  2 +-
 99 files changed, 351 insertions(+), 351 deletions(-)

diff --git a/tests/baselines/reference/checkJsxChildrenProperty1.types b/tests/baselines/reference/checkJsxChildrenProperty1.types
index bf304e3fcd8a0..821f95d9ae71b 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty1.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty1.types
@@ -36,10 +36,10 @@ let k = <Comp a={10} b="hi" children ="lol" />;
 >k : JSX.Element
 ><Comp a={10} b="hi" children ="lol" /> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
->children : "lol"
+>b : string
+>children : string
 
 let k1 =
 >k1 : JSX.Element
@@ -47,9 +47,9 @@ let k1 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        hi hi hi!    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         hi hi hi!
     </Comp>;
@@ -61,9 +61,9 @@ let k2 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <div>hi hi hi!</div>    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         <div>hi hi hi!</div>
 ><div>hi hi hi!</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty13.types b/tests/baselines/reference/checkJsxChildrenProperty13.types
index 5360d78cda4b0..10d3876ae6350 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.types
@@ -34,7 +34,7 @@ class Button extends React.Component<ButtonProp, any> {
 >this.props : ButtonProp & { children?: React.ReactNode; }
 >this : this
 >props : ButtonProp & { children?: React.ReactNode; }
->children : "hi"
+>children : string
 
             <div>Hello World</div>
 ><div>Hello World</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.types b/tests/baselines/reference/checkJsxChildrenProperty14.types
index 2033637751523..a0d9797934c9f 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.types
@@ -65,9 +65,9 @@ let k1 = <Comp a={10} b="hi"><></><Button /><AnotherButton /></Comp>;
 >k1 : JSX.Element
 ><Comp a={10} b="hi"><></><Button /><AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
@@ -79,9 +79,9 @@ let k2 = <Comp a={10} b="hi"><><Button /></><AnotherButton /></Comp>;
 >k2 : JSX.Element
 ><Comp a={10} b="hi"><><Button /></><AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><><Button /></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
@@ -93,9 +93,9 @@ let k3 = <Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp>;
 >k3 : JSX.Element
 ><Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><><Button /><AnotherButton /></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
@@ -137,9 +137,9 @@ let k4 = <SingleChildComp a={10} b="hi"><><Button /><AnotherButton /></></Single
 >k4 : JSX.Element
 ><SingleChildComp a={10} b="hi"><><Button /><AnotherButton /></></SingleChildComp> : JSX.Element
 >SingleChildComp : (p: SingleChildProp) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><><Button /><AnotherButton /></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
@@ -152,9 +152,9 @@ let k5 = <SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></Single
 >k5 : JSX.Element
 ><SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></SingleChildComp> : JSX.Element
 >SingleChildComp : (p: SingleChildProp) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><></> : JSX.Element
 ><Button /> : JSX.Element
 >Button : typeof Button
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.types b/tests/baselines/reference/checkJsxChildrenProperty2.types
index 4e4b99988f63d..2817c1709bdc6 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.types
@@ -36,9 +36,9 @@ let k = <Comp a={10} b="hi" />;
 >k : JSX.Element
 ><Comp a={10} b="hi" /> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
 let k0 =
 >k0 : JSX.Element
@@ -46,10 +46,10 @@ let k0 =
     <Comp a={10} b="hi" children="Random" >
 ><Comp a={10} b="hi" children="Random" >        hi hi hi!    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
->children : "Random"
+>b : string
+>children : string
 
         hi hi hi!
     </Comp>;
@@ -69,9 +69,9 @@ let k1 =
     <Comp a={10} b="hi" {...o} >
 ><Comp a={10} b="hi" {...o} >        hi hi hi!    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 >o : { children: string; }
 
         hi hi hi!
@@ -85,9 +85,9 @@ let k2 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <div> My Div </div>        {(name: string) => <div> My name {name} </div>}    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         <div> My Div </div>
 ><div> My Div </div> : JSX.Element
@@ -111,9 +111,9 @@ let k3 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <div> My Div </div>        {1000000}    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         <div> My Div </div>
 ><div> My Div </div> : JSX.Element
@@ -132,9 +132,9 @@ let k4 =
     <Comp a={10} b="hi" >
 ><Comp a={10} b="hi" >        <div> My Div </div>        hi hi hi!    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         <div> My Div </div>
 ><div> My Div </div> : JSX.Element
@@ -151,9 +151,9 @@ let k5 =
     <Comp a={10} b="hi" >
 ><Comp a={10} b="hi" >        <div> My Div </div>        <div> My Div </div>    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         <div> My Div </div>
 ><div> My Div </div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.types b/tests/baselines/reference/checkJsxChildrenProperty5.types
index 39d0a46755fc4..9535d280b3363 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.types
@@ -52,9 +52,9 @@ let k = <Comp a={10} b="hi" />;
 >k : JSX.Element
 ><Comp a={10} b="hi" /> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
 // Error: JSX.element is not the same as JSX.ElementClass
 let k1 =
@@ -63,9 +63,9 @@ let k1 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <Button />    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         <Button />
 ><Button /> : JSX.Element
@@ -80,9 +80,9 @@ let k2 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        {Button}    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         {Button}
 >Button : typeof Button
diff --git a/tests/baselines/reference/checkJsxChildrenProperty6.types b/tests/baselines/reference/checkJsxChildrenProperty6.types
index 22e117f41cdec..f9af32072d279 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.types
@@ -67,9 +67,9 @@ let k1 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">        <Button />        <AnotherButton />    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
         <Button />
 ><Button /> : JSX.Element
@@ -88,9 +88,9 @@ let k2 =
     <Comp a={10} b="hi">
 ><Comp a={10} b="hi">                     <Button />        <AnotherButton />    </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
      
     
     
@@ -109,9 +109,9 @@ let k3 = <Comp a={10} b="hi"><Button />
 >k3 : JSX.Element
 ><Comp a={10} b="hi"><Button />  <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 
@@ -126,9 +126,9 @@ let k4 = <Comp a={10} b="hi"><Button /></Comp>;
 >k4 : JSX.Element
 ><Comp a={10} b="hi"><Button /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 >Comp : (p: Prop) => JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.types b/tests/baselines/reference/checkJsxChildrenProperty7.types
index d010e56660cda..b34183db881ef 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.types
@@ -65,9 +65,9 @@ let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
 >k1 : JSX.Element
 ><Comp a={10} b="hi"><Button />  <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 ><AnotherButton /> : JSX.Element
@@ -78,9 +78,9 @@ let k2 = <Comp a={10} b="hi"><Button />
 >k2 : JSX.Element
 ><Comp a={10} b="hi"><Button />    <AnotherButton />  </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 
@@ -93,9 +93,9 @@ let k3 = <Comp a={10} b="hi">    <Button />
 >k3 : JSX.Element
 ><Comp a={10} b="hi">    <Button />    <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty8.types b/tests/baselines/reference/checkJsxChildrenProperty8.types
index 5effcc4e7f67b..39d94bae72060 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.types
@@ -65,9 +65,9 @@ let k1 = <Comp a={10} b="hi"><Button />  <AnotherButton /></Comp>;
 >k1 : JSX.Element
 ><Comp a={10} b="hi"><Button />  <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 ><AnotherButton /> : JSX.Element
@@ -78,9 +78,9 @@ let k2 = <Comp a={10} b="hi"><Button />
 >k2 : JSX.Element
 ><Comp a={10} b="hi"><Button />    <AnotherButton />  </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 
@@ -93,9 +93,9 @@ let k3 = <Comp a={10} b="hi">    <Button />
 >k3 : JSX.Element
 ><Comp a={10} b="hi">    <Button />    <AnotherButton /></Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 
@@ -108,9 +108,9 @@ let k4 = <Comp a={10} b="hi"><Button />  </Comp>;
 >k4 : JSX.Element
 ><Comp a={10} b="hi"><Button />  </Comp> : JSX.Element
 >Comp : (p: Prop) => JSX.Element
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 ><Button /> : JSX.Element
 >Button : typeof Button
 >Comp : (p: Prop) => JSX.Element
diff --git a/tests/baselines/reference/contextualTypingOfOptionalMembers.types b/tests/baselines/reference/contextualTypingOfOptionalMembers.types
index 7606bf55c2c64..515685f5c534d 100644
--- a/tests/baselines/reference/contextualTypingOfOptionalMembers.types
+++ b/tests/baselines/reference/contextualTypingOfOptionalMembers.types
@@ -252,7 +252,7 @@ const a = <App4 state={100} foo={s => s} />; // TODO: should be number => number
 >a : JSX.Element
 ><App4 state={100} foo={s => s} /> : JSX.Element
 >App4 : <State, Actions extends ActionsObjectOr<State>>(props: (string & { state: State; }) | (Actions & { state: State; })) => JSX.Element
->state : 100
+>state : number
 >100 : 100
 >foo : (s: any) => any
 >s => s : (s: any) => any
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.types b/tests/baselines/reference/jsxEmitWithAttributes.types
index e6848260d2650..044b65222a906 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.types
+++ b/tests/baselines/reference/jsxEmitWithAttributes.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : "helloworld"
+>content : string
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxEsprimaFbTestSuite.types b/tests/baselines/reference/jsxEsprimaFbTestSuite.types
index b8cbac4e6ce30..f36758fb7d325 100644
--- a/tests/baselines/reference/jsxEsprimaFbTestSuite.types
+++ b/tests/baselines/reference/jsxEsprimaFbTestSuite.types
@@ -31,19 +31,19 @@ declare var props;
 <a b={" "} c=" " d="&amp;" e="id=1&group=2" f="&#123456789" g="&#123*;" h="&#x;" />;
 ><a b={" "} c=" " d="&amp;" e="id=1&group=2" f="&#123456789" g="&#123*;" h="&#x;" /> : any
 >a : any
->b : " "
+>b : string
 >" " : " "
->c : " "
->d : "&amp;"
->e : "id=1&group=2"
->f : "&#123456789"
->g : "&#123*;"
->h : "&#x;"
+>c : string
+>d : string
+>e : string
+>f : string
+>g : string
+>h : string
 
 <a b="&notanentity;" />;
 ><a b="&notanentity;" /> : any
 >a : any
->b : "&notanentity;"
+>b : string
 
 <a
 ><a/> : any
@@ -61,7 +61,7 @@ declare var props;
 >AbC_def : any
 
   test="&#x0026;&#38;">
->test : "&#x0026;&#38;"
+>test : string
 
 bar
 baz
@@ -155,13 +155,13 @@ baz
 ><div {...props} post="attribute" /> : any
 >div : any
 >props : any
->post : "attribute"
+>post : string
 
 <div pre="leading" pre2="attribute" {...props}></div>;
 ><div pre="leading" pre2="attribute" {...props}></div> : any
 >div : any
->pre : "leading"
->pre2 : "attribute"
+>pre : string
+>pre2 : string
 >props : any
 >div : any
 
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.types b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
index e6848260d2650..044b65222a906 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.types
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : "helloworld"
+>content : string
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.types b/tests/baselines/reference/jsxFactoryIdentifier.types
index 1797abfea2354..f6faa0784cd46 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.types
+++ b/tests/baselines/reference/jsxFactoryIdentifier.types
@@ -119,7 +119,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : "helloworld"
+>content : string
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
index e6848260d2650..044b65222a906 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : "helloworld"
+>content : string
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
index e6848260d2650..044b65222a906 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : "helloworld"
+>content : string
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.types b/tests/baselines/reference/jsxFactoryQualifiedName.types
index e6848260d2650..044b65222a906 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.types
@@ -113,7 +113,7 @@ class A {
 			<meta content="helloworld"></meta>,
 ><meta content="helloworld"></meta> : any
 >meta : any
->content : "helloworld"
+>content : string
 >meta : any
 
 			<meta content={c.a!.b}></meta>
diff --git a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.types b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.types
index f289abe412e49..0791b6d9e855b 100644
--- a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.types
+++ b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.types
@@ -50,7 +50,7 @@ declare var React: any;
 <a foo="bar;
 ><a foo="bar; : any
 >a : any
->foo : "bar;"
+>foo : string
 
 === tests/cases/conformance/jsx/8.tsx ===
 <a:b></b>;
@@ -195,8 +195,8 @@ var x = <div>one</div> /* intervening comment */ <div>two</div>;;
 <span className="a", id="b" />;
 ><span className="a", id="b" /> : any
 >span : any
->className : "a"
->id : "b"
+>className : string
+>id : string
 
 === tests/cases/conformance/jsx/22.tsx ===
 <div className"app">;
diff --git a/tests/baselines/reference/jsxMultilineAttributeStringValues.types b/tests/baselines/reference/jsxMultilineAttributeStringValues.types
index 6a47bb2fe1b00..b9e1b99267f49 100644
--- a/tests/baselines/reference/jsxMultilineAttributeStringValues.types
+++ b/tests/baselines/reference/jsxMultilineAttributeStringValues.types
@@ -3,7 +3,7 @@ const a = <input value="
 >a : any
 ><input value="  foo: 23"></input> : any
 >input : any
->value : "\n  foo: 23\n"
+>value : string
 
   foo: 23
 "></input>;
@@ -13,7 +13,7 @@ const b = <input value='
 >b : any
 ><input value='foo: 23'></input> : any
 >input : any
->value : "\nfoo: 23\n"
+>value : string
 
 foo: 23
 '></input>;
diff --git a/tests/baselines/reference/jsxMultilineAttributeValuesReact.types b/tests/baselines/reference/jsxMultilineAttributeValuesReact.types
index 5e024cb2c7761..2d5dd820b2176 100644
--- a/tests/baselines/reference/jsxMultilineAttributeValuesReact.types
+++ b/tests/baselines/reference/jsxMultilineAttributeValuesReact.types
@@ -6,7 +6,7 @@ const a = <input value="
 >a : any
 ><input value="foo: 23"></input> : any
 >input : any
->value : "\nfoo: 23\n"
+>value : string
 
 foo: 23
 "></input>;
@@ -16,7 +16,7 @@ const b = <input value='
 >b : any
 ><input value='foo: 23'></input> : any
 >input : any
->value : "\nfoo: 23\n"
+>value : string
 
 foo: 23
 '></input>;
@@ -26,7 +26,7 @@ const c = <input value='
 >c : any
 ><input value='foo: 23\n'></input> : any
 >input : any
->value : "\nfoo: 23\\n\n"
+>value : string
 
 foo: 23\n
 '></input>;
diff --git a/tests/baselines/reference/jsxParsingError1.types b/tests/baselines/reference/jsxParsingError1.types
index a693a6d048203..5047237043d4a 100644
--- a/tests/baselines/reference/jsxParsingError1.types
+++ b/tests/baselines/reference/jsxParsingError1.types
@@ -26,7 +26,7 @@ const elem = <div className={class1, class2}/>;
 >elem : JSX.Element
 ><div className={class1, class2 : JSX.Element
 >div : any
->className : "foo"
+>className : string
 >class1 : "foo"
 >class2 : true
 >/>; : RegExp
diff --git a/tests/baselines/reference/jsxPropsAsIdentifierNames.types b/tests/baselines/reference/jsxPropsAsIdentifierNames.types
index 5b7fb7954316f..1d52871b41943 100644
--- a/tests/baselines/reference/jsxPropsAsIdentifierNames.types
+++ b/tests/baselines/reference/jsxPropsAsIdentifierNames.types
@@ -20,6 +20,6 @@ declare namespace JSX {
 export default <div static={true} />;
 ><div static={true} /> : any
 >div : any
->static : true
+>static : boolean
 >true : true
 
diff --git a/tests/baselines/reference/jsxReactTestSuite.types b/tests/baselines/reference/jsxReactTestSuite.types
index a342a3ff75667..28ed2e5960adf 100644
--- a/tests/baselines/reference/jsxReactTestSuite.types
+++ b/tests/baselines/reference/jsxReactTestSuite.types
@@ -153,7 +153,7 @@ var x =
       // Extra line here.
     }
     attr4="baz">
->attr4 : "baz"
+>attr4 : string
 
   </div>;
 >div : any
@@ -197,14 +197,14 @@ var x =
     /* a multi-line
        comment */
     attr1="foo">
->attr1 : "foo"
+>attr1 : string
 
     <span // a double-slash comment
 ><span // a double-slash comment      attr2="bar"    /> : any
 >span : any
 
       attr2="bar"
->attr2 : "bar"
+>attr2 : string
 
     />
   </div>
@@ -230,7 +230,7 @@ var x =
 <Component constructor="foo" />;
 ><Component constructor="foo" /> : any
 >Component : any
->constructor : "foo"
+>constructor : string
 
 <Namespace.Component />;
 ><Namespace.Component /> : any
@@ -250,7 +250,7 @@ var x =
 ><Component { ... x } y={2 } z /> : any
 >Component : any
 >x : any
->y : 2
+>y : number
 
 ={2 } z />;
 >2 : 2
@@ -264,7 +264,7 @@ var x =
 >this.props : any
 >this : any
 >props : any
->sound : "moo"
+>sound : string
 
 <font-face />;
 ><font-face /> : any
@@ -289,21 +289,21 @@ var x =
 ><Component { ...x } y={2} /> : any
 >Component : any
 >x : any
->y : 2
+>y : number
 >2 : 2
 
 <Component { ... x } y={2} z />;
 ><Component { ... x } y={2} z /> : any
 >Component : any
 >x : any
->y : 2
+>y : number
 >2 : 2
 >z : true
 
 <Component x={1} {...y} />;
 ><Component x={1} {...y} /> : any
 >Component : any
->x : 1
+>x : number
 >1 : 1
 >y : any
 
@@ -311,9 +311,9 @@ var x =
 <Component x={1} y="2" {...z} {...z}><Child /></Component>;
 ><Component x={1} y="2" {...z} {...z}><Child /></Component> : any
 >Component : any
->x : 1
+>x : number
 >1 : 1
->y : "2"
+>y : string
 >z : any
 >z : any
 ><Child /> : any
@@ -323,7 +323,7 @@ var x =
 <Component x="1" {...(z = { y: 2 }, z)} z={3}>Text</Component>;
 ><Component x="1" {...(z = { y: 2 }, z)} z={3}>Text</Component> : any
 >Component : any
->x : "1"
+>x : string
 >(z = { y: 2 }, z) : any
 >z = { y: 2 }, z : any
 >z = { y: 2 } : { y: number; }
@@ -332,7 +332,7 @@ var x =
 >y : number
 >2 : 2
 >z : any
->z : 3
+>z : number
 >3 : 3
 >Component : any
 
diff --git a/tests/baselines/reference/keywordInJsxIdentifier.types b/tests/baselines/reference/keywordInJsxIdentifier.types
index fc308414acb6b..09ae09340de5e 100644
--- a/tests/baselines/reference/keywordInJsxIdentifier.types
+++ b/tests/baselines/reference/keywordInJsxIdentifier.types
@@ -15,10 +15,10 @@ declare var React: any;
 <foo class-id="1"/>;
 ><foo class-id="1"/> : any
 >foo : any
->class-id : "1"
+>class-id : string
 
 <foo class="1"/>;
 ><foo class="1"/> : any
 >foo : any
->class : "1"
+>class : string
 
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.types b/tests/baselines/reference/reactNamespaceJSXEmit.types
index c30c132071244..e1d76dbfcec51 100644
--- a/tests/baselines/reference/reactNamespaceJSXEmit.types
+++ b/tests/baselines/reference/reactNamespaceJSXEmit.types
@@ -38,7 +38,7 @@ declare var x: any;
 ><Bar { ...x } y={2} /> : any
 >Bar : any
 >x : any
->y : 2
+>y : number
 >2 : 2
 
 <_Bar { ...x } />;
diff --git a/tests/baselines/reference/tsxAttributeErrors.types b/tests/baselines/reference/tsxAttributeErrors.types
index cb28f6cda7ebe..a18afcbbc7315 100644
--- a/tests/baselines/reference/tsxAttributeErrors.types
+++ b/tests/baselines/reference/tsxAttributeErrors.types
@@ -27,14 +27,14 @@ declare namespace JSX {
 <div text={42} />;
 ><div text={42} /> : JSX.Element
 >div : any
->text : 42
+>text : number
 >42 : 42
 
 // Error, string is not assignable to number
 <div width={'foo'} />;
 ><div width={'foo'} /> : JSX.Element
 >div : any
->width : "foo"
+>width : string
 >'foo' : "foo"
 
 // Error, number is not assignable to string
@@ -53,7 +53,7 @@ var attribs = { text: 100 };
 <span foo='bar' bar={'foo'} />;
 ><span foo='bar' bar={'foo'} /> : JSX.Element
 >span : any
->foo : "bar"
->bar : "foo"
+>foo : string
+>bar : string
 >'foo' : "foo"
 
diff --git a/tests/baselines/reference/tsxAttributeResolution1.types b/tests/baselines/reference/tsxAttributeResolution1.types
index fb1521ba78850..7fe9aa12b657b 100644
--- a/tests/baselines/reference/tsxAttributeResolution1.types
+++ b/tests/baselines/reference/tsxAttributeResolution1.types
@@ -35,7 +35,7 @@ interface Attribs1 {
 <test1 x={0} />; // OK
 ><test1 x={0} /> : JSX.Element
 >test1 : any
->x : 0
+>x : number
 >0 : 0
 
 <test1 />; // OK
@@ -45,47 +45,47 @@ interface Attribs1 {
 <test1 data-x={true} />; // OK
 ><test1 data-x={true} /> : JSX.Element
 >test1 : any
->data-x : true
+>data-x : boolean
 >true : true
 
 <test2 reqd='true' />; // OK
 ><test2 reqd='true' /> : JSX.Element
 >test2 : any
->reqd : "true"
+>reqd : string
 
 <test2 reqd={'true'} />; // OK
 ><test2 reqd={'true'} /> : JSX.Element
 >test2 : any
->reqd : "true"
+>reqd : string
 >'true' : "true"
 
 // Errors
 <test1 x={'0'} />; // Error, '0' is not number
 ><test1 x={'0'} /> : JSX.Element
 >test1 : any
->x : "0"
+>x : string
 >'0' : "0"
 
 <test1 y={0} />; // Error, no property "y"
 ><test1 y={0} /> : JSX.Element
 >test1 : any
->y : 0
+>y : number
 >0 : 0
 
 <test1 y="foo" />; // Error, no property "y"
 ><test1 y="foo" /> : JSX.Element
 >test1 : any
->y : "foo"
+>y : string
 
 <test1 x="32" />; // Error, "32" is not number
 ><test1 x="32" /> : JSX.Element
 >test1 : any
->x : "32"
+>x : string
 
 <test1 var="10" />; // Error, no 'var' property
 ><test1 var="10" /> : JSX.Element
 >test1 : any
->var : "10"
+>var : string
 
 <test2 />; // Error, missing reqd
 ><test2 /> : JSX.Element
@@ -94,12 +94,12 @@ interface Attribs1 {
 <test2 reqd={10} />; // Error, reqd is not string
 ><test2 reqd={10} /> : JSX.Element
 >test2 : any
->reqd : 10
+>reqd : number
 >10 : 10
 
 // Should be OK
 <var var='var' />;
 ><var var='var' /> : JSX.Element
 >var : any
->var : "var"
+>var : string
 
diff --git a/tests/baselines/reference/tsxAttributeResolution10.types b/tests/baselines/reference/tsxAttributeResolution10.types
index 4f2e08f36e3bb..2dbb56bc12c75 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.types
+++ b/tests/baselines/reference/tsxAttributeResolution10.types
@@ -36,18 +36,18 @@ export class MyComponent {
 <MyComponent bar='world' />;
 ><MyComponent bar='world' /> : JSX.Element
 >MyComponent : typeof MyComponent
->bar : "world"
+>bar : string
 
 // Should be OK
 <MyComponent bar={true} />;
 ><MyComponent bar={true} /> : JSX.Element
 >MyComponent : typeof MyComponent
->bar : true
+>bar : boolean
 >true : true
 
 // Should be ok
 <MyComponent data-bar='hello' />;
 ><MyComponent data-bar='hello' /> : JSX.Element
 >MyComponent : typeof MyComponent
->data-bar : "hello"
+>data-bar : string
 
diff --git a/tests/baselines/reference/tsxAttributeResolution11.types b/tests/baselines/reference/tsxAttributeResolution11.types
index b441d1202c011..307a1a130a207 100644
--- a/tests/baselines/reference/tsxAttributeResolution11.types
+++ b/tests/baselines/reference/tsxAttributeResolution11.types
@@ -43,6 +43,6 @@ var x = <MyComponent bar='world' />;
 >x : JSX.Element
 ><MyComponent bar='world' /> : JSX.Element
 >MyComponent : typeof MyComponent
->bar : "world"
+>bar : string
 
 
diff --git a/tests/baselines/reference/tsxAttributeResolution14.types b/tests/baselines/reference/tsxAttributeResolution14.types
index a48f09e94a19d..0887ab3124186 100644
--- a/tests/baselines/reference/tsxAttributeResolution14.types
+++ b/tests/baselines/reference/tsxAttributeResolution14.types
@@ -51,23 +51,23 @@ function VerticalNav() {
       <VerticalNavMenuItem primaryText={2} />  // error
 ><VerticalNavMenuItem primaryText={2} /> : JSX.Element
 >VerticalNavMenuItem : (prop: IProps) => JSX.Element
->primaryText : 2
+>primaryText : number
 >2 : 2
 
       <VerticalNavMenuItem justRandomProp={2} primaryText={"hello"} />  // ok
 ><VerticalNavMenuItem justRandomProp={2} primaryText={"hello"} /> : JSX.Element
 >VerticalNavMenuItem : (prop: IProps) => JSX.Element
->justRandomProp : 2
+>justRandomProp : number
 >2 : 2
->primaryText : "hello"
+>primaryText : string
 >"hello" : "hello"
 
       <VerticalNavMenuItem justRandomProp1={true} primaryText={"hello"} />  // error
 ><VerticalNavMenuItem justRandomProp1={true} primaryText={"hello"} /> : JSX.Element
 >VerticalNavMenuItem : (prop: IProps) => JSX.Element
->justRandomProp1 : true
+>justRandomProp1 : boolean
 >true : true
->primaryText : "hello"
+>primaryText : string
 >"hello" : "hello"
 
     </div>
diff --git a/tests/baselines/reference/tsxAttributeResolution15.types b/tests/baselines/reference/tsxAttributeResolution15.types
index 87b9b0c3cd8d1..b95dcffcaf7bb 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.types
+++ b/tests/baselines/reference/tsxAttributeResolution15.types
@@ -25,7 +25,7 @@ let a = <BigGreeter prop1="hello" />
 >a : JSX.Element
 ><BigGreeter prop1="hello" /> : JSX.Element
 >BigGreeter : typeof BigGreeter
->prop1 : "hello"
+>prop1 : string
 
 // OK
 let b = <BigGreeter ref={(input) => { this.textInput = input; }} />
@@ -45,5 +45,5 @@ let c = <BigGreeter data-extra="hi" />
 >c : JSX.Element
 ><BigGreeter data-extra="hi" /> : JSX.Element
 >BigGreeter : typeof BigGreeter
->data-extra : "hi"
+>data-extra : string
 
diff --git a/tests/baselines/reference/tsxAttributeResolution16.types b/tests/baselines/reference/tsxAttributeResolution16.types
index 9ac70198864a4..c7f13ca509691 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.types
+++ b/tests/baselines/reference/tsxAttributeResolution16.types
@@ -52,7 +52,7 @@ let a = <AddressComp postalCode='T1B 0L3' street="vancouver" country="CA" />
 >a : JSX.Element
 ><AddressComp postalCode='T1B 0L3' street="vancouver" country="CA" /> : JSX.Element
 >AddressComp : typeof AddressComp
->postalCode : "T1B 0L3"
->street : "vancouver"
->country : "CA"
+>postalCode : string
+>street : string
+>country : string
 
diff --git a/tests/baselines/reference/tsxAttributeResolution3.types b/tests/baselines/reference/tsxAttributeResolution3.types
index 47abfb504f83c..c7148398dab49 100644
--- a/tests/baselines/reference/tsxAttributeResolution3.types
+++ b/tests/baselines/reference/tsxAttributeResolution3.types
@@ -75,7 +75,7 @@ var obj4 = { x: 32, y: 32 };
 ><test1 {...obj4} x="ok" /> : JSX.Element
 >test1 : any
 >obj4 : { x: number; y: number; }
->x : "ok"
+>x : string
 
 // Error
 var obj5 = { x: 32, y: 32 };
@@ -89,7 +89,7 @@ var obj5 = { x: 32, y: 32 };
 <test1 x="ok" {...obj5} />
 ><test1 x="ok" {...obj5} /> : JSX.Element
 >test1 : any
->x : "ok"
+>x : string
 >obj5 : { x: number; y: number; }
 
 // Ok
@@ -118,7 +118,7 @@ var obj7 = { x: 'foo' };
 <test1 x={32} {...obj7} />
 ><test1 x={32} {...obj7} /> : JSX.Element
 >test1 : any
->x : 32
+>x : number
 >32 : 32
 >obj7 : { x: string; }
 
diff --git a/tests/baselines/reference/tsxAttributeResolution6.types b/tests/baselines/reference/tsxAttributeResolution6.types
index fdbaa535cab87..c5aeafa81d639 100644
--- a/tests/baselines/reference/tsxAttributeResolution6.types
+++ b/tests/baselines/reference/tsxAttributeResolution6.types
@@ -28,7 +28,7 @@ declare module JSX {
 <test1 n='true' />;
 ><test1 n='true' /> : JSX.Element
 >test1 : any
->n : "true"
+>n : string
 
 <test2 />;
 ><test2 /> : JSX.Element
@@ -43,7 +43,7 @@ declare module JSX {
 <test1 n={false} />;
 ><test1 n={false} /> : JSX.Element
 >test1 : any
->n : false
+>n : boolean
 >false : false
 
 <test2 n />;
diff --git a/tests/baselines/reference/tsxAttributeResolution7.types b/tests/baselines/reference/tsxAttributeResolution7.types
index c421327afc846..257d423a41eb8 100644
--- a/tests/baselines/reference/tsxAttributeResolution7.types
+++ b/tests/baselines/reference/tsxAttributeResolution7.types
@@ -17,25 +17,25 @@ declare module JSX {
 <test1 data-foo={32} />;
 ><test1 data-foo={32} /> : JSX.Element
 >test1 : any
->data-foo : 32
+>data-foo : number
 >32 : 32
 
 // OK
 <test1 data-foo={'32'} />;
 ><test1 data-foo={'32'} /> : JSX.Element
 >test1 : any
->data-foo : "32"
+>data-foo : string
 >'32' : "32"
 
 <test1 data-bar={'32'} />;
 ><test1 data-bar={'32'} /> : JSX.Element
 >test1 : any
->data-bar : "32"
+>data-bar : string
 >'32' : "32"
 
 <test1 data-bar={32} />;
 ><test1 data-bar={32} /> : JSX.Element
 >test1 : any
->data-bar : 32
+>data-bar : number
 >32 : 32
 
diff --git a/tests/baselines/reference/tsxAttributeResolution9.types b/tests/baselines/reference/tsxAttributeResolution9.types
index 1952f5606950a..8e7b5f2fe6155 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.types
+++ b/tests/baselines/reference/tsxAttributeResolution9.types
@@ -39,11 +39,11 @@ export class MyComponent {
 <MyComponent foo="bar" />; // ok  
 ><MyComponent foo="bar" /> : JSX.Element
 >MyComponent : typeof MyComponent
->foo : "bar"
+>foo : string
 
 <MyComponent foo={0} />; // should be an error
 ><MyComponent foo={0} /> : JSX.Element
 >MyComponent : typeof MyComponent
->foo : 0
+>foo : number
 >0 : 0
 
diff --git a/tests/baselines/reference/tsxElementResolution.types b/tests/baselines/reference/tsxElementResolution.types
index ba70fb21d39ec..df429d1c54dcf 100644
--- a/tests/baselines/reference/tsxElementResolution.types
+++ b/tests/baselines/reference/tsxElementResolution.types
@@ -32,7 +32,7 @@ var a = <foundFirst  x="hello" />;
 >a : any
 ><foundFirst  x="hello" /> : any
 >foundFirst : typeof foundFirst
->x : "hello"
+>x : string
 
 var b = <string_named />;
 >b : any
diff --git a/tests/baselines/reference/tsxElementResolution10.types b/tests/baselines/reference/tsxElementResolution10.types
index bdc45b9399401..a8209774dcfd1 100644
--- a/tests/baselines/reference/tsxElementResolution10.types
+++ b/tests/baselines/reference/tsxElementResolution10.types
@@ -29,7 +29,7 @@ var Obj1: Obj1type;
 <Obj1 x={10} />; // Error, no render member
 ><Obj1 x={10} /> : JSX.Element
 >Obj1 : Obj1type
->x : 10
+>x : number
 >10 : 10
 
 interface Obj2type {
@@ -47,8 +47,8 @@ var Obj2: Obj2type;
 <Obj2 x={32} render={100} />; // OK
 ><Obj2 x={32} render={100} /> : JSX.Element
 >Obj2 : Obj2type
->x : 32
+>x : number
 >32 : 32
->render : 100
+>render : number
 >100 : 100
 
diff --git a/tests/baselines/reference/tsxElementResolution11.types b/tests/baselines/reference/tsxElementResolution11.types
index f2b07ddd8e3f7..81f41aff7b636 100644
--- a/tests/baselines/reference/tsxElementResolution11.types
+++ b/tests/baselines/reference/tsxElementResolution11.types
@@ -25,7 +25,7 @@ var Obj1: Obj1type;
 <Obj1 x={10} />; // OK
 ><Obj1 x={10} /> : JSX.Element
 >Obj1 : Obj1type
->x : 10
+>x : number
 >10 : 10
 
 interface Obj2type {
@@ -42,7 +42,7 @@ var Obj2: Obj2type;
 <Obj2 x={10} />; // Error
 ><Obj2 x={10} /> : JSX.Element
 >Obj2 : Obj2type
->x : 10
+>x : number
 >10 : 10
 
 interface Obj3type {
@@ -59,6 +59,6 @@ var Obj3: Obj3type;
 <Obj3 x={10} />; // OK
 ><Obj3 x={10} /> : JSX.Element
 >Obj3 : Obj3type
->x : 10
+>x : number
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution12.types b/tests/baselines/reference/tsxElementResolution12.types
index a310d993cb493..855130cf8cc50 100644
--- a/tests/baselines/reference/tsxElementResolution12.types
+++ b/tests/baselines/reference/tsxElementResolution12.types
@@ -26,7 +26,7 @@ var Obj1: Obj1type;
 <Obj1 x={10} />; // OK
 ><Obj1 x={10} /> : JSX.Element
 >Obj1 : Obj1type
->x : 10
+>x : number
 >10 : 10
 
 interface Obj2type {
@@ -44,7 +44,7 @@ var Obj2: Obj2type;
 <Obj2 x={10} />; // OK
 ><Obj2 x={10} /> : JSX.Element
 >Obj2 : Obj2type
->x : 10
+>x : number
 >10 : 10
 
 interface Obj3type {
@@ -61,7 +61,7 @@ var Obj3: Obj3type;
 <Obj3 x={10} />; // Error
 ><Obj3 x={10} /> : JSX.Element
 >Obj3 : Obj3type
->x : 10
+>x : number
 >10 : 10
 
 var attributes: any;
@@ -93,12 +93,12 @@ var Obj4: Obj4type;
 <Obj4 x={10} />; // OK
 ><Obj4 x={10} /> : JSX.Element
 >Obj4 : Obj4type
->x : 10
+>x : number
 >10 : 10
 
 <Obj4 x={'10'} />; // Error
 ><Obj4 x={'10'} /> : JSX.Element
 >Obj4 : Obj4type
->x : "10"
+>x : string
 >'10' : "10"
 
diff --git a/tests/baselines/reference/tsxElementResolution13.types b/tests/baselines/reference/tsxElementResolution13.types
index 4bae4b06586c8..b2a6e54633ab4 100644
--- a/tests/baselines/reference/tsxElementResolution13.types
+++ b/tests/baselines/reference/tsxElementResolution13.types
@@ -24,6 +24,6 @@ var obj1: Obj1;
 <obj1 x={10} />; // Error
 ><obj1 x={10} /> : JSX.Element
 >obj1 : Obj1
->x : 10
+>x : number
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution14.types b/tests/baselines/reference/tsxElementResolution14.types
index 7d06fa2b3018d..a6e8cc5283475 100644
--- a/tests/baselines/reference/tsxElementResolution14.types
+++ b/tests/baselines/reference/tsxElementResolution14.types
@@ -19,6 +19,6 @@ var obj1: Obj1;
 <obj1 x={10} />; // OK
 ><obj1 x={10} /> : JSX.Element
 >obj1 : Obj1
->x : 10
+>x : number
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution15.types b/tests/baselines/reference/tsxElementResolution15.types
index b7ba416e8e1c8..43fc60a38765b 100644
--- a/tests/baselines/reference/tsxElementResolution15.types
+++ b/tests/baselines/reference/tsxElementResolution15.types
@@ -27,6 +27,6 @@ var Obj1: Obj1type;
 <Obj1 x={10} />; // Error
 ><Obj1 x={10} /> : JSX.Element
 >Obj1 : Obj1type
->x : 10
+>x : number
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution16.types b/tests/baselines/reference/tsxElementResolution16.types
index 0c8323184ef8f..cb2d483ad43ed 100644
--- a/tests/baselines/reference/tsxElementResolution16.types
+++ b/tests/baselines/reference/tsxElementResolution16.types
@@ -16,6 +16,6 @@ var obj1: Obj1;
 <obj1 x={10} />; // Error (JSX.Element is implicit any)
 ><obj1 x={10} /> : any
 >obj1 : Obj1
->x : 10
+>x : number
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxElementResolution18.types b/tests/baselines/reference/tsxElementResolution18.types
index 1b787ad3e1f51..e236bbbb10885 100644
--- a/tests/baselines/reference/tsxElementResolution18.types
+++ b/tests/baselines/reference/tsxElementResolution18.types
@@ -10,5 +10,5 @@ declare module JSX {
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : "x"
+>n : string
 
diff --git a/tests/baselines/reference/tsxElementResolution3.types b/tests/baselines/reference/tsxElementResolution3.types
index 8a45cd00a79ef..84db9327ae56d 100644
--- a/tests/baselines/reference/tsxElementResolution3.types
+++ b/tests/baselines/reference/tsxElementResolution3.types
@@ -18,11 +18,11 @@ declare module JSX {
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : "x"
+>n : string
 
 // Error
 <span w='err' />;
 ><span w='err' /> : JSX.Element
 >span : any
->w : "err"
+>w : string
 
diff --git a/tests/baselines/reference/tsxElementResolution4.types b/tests/baselines/reference/tsxElementResolution4.types
index 6ddff265b662d..f8f4faf308824 100644
--- a/tests/baselines/reference/tsxElementResolution4.types
+++ b/tests/baselines/reference/tsxElementResolution4.types
@@ -22,17 +22,17 @@ declare module JSX {
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : "x"
+>n : string
 
 // OK
 <span m='ok' />;
 ><span m='ok' /> : JSX.Element
 >span : any
->m : "ok"
+>m : string
 
 // Error
 <span q='' />;
 ><span q='' /> : JSX.Element
 >span : any
->q : ""
+>q : string
 
diff --git a/tests/baselines/reference/tsxElementResolution5.types b/tests/baselines/reference/tsxElementResolution5.types
index b9f4c2ba76793..cd2f3d2633784 100644
--- a/tests/baselines/reference/tsxElementResolution5.types
+++ b/tests/baselines/reference/tsxElementResolution5.types
@@ -10,5 +10,5 @@ declare module JSX {
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : "x"
+>n : string
 
diff --git a/tests/baselines/reference/tsxElementResolution6.types b/tests/baselines/reference/tsxElementResolution6.types
index 192eadfbd312e..db99201381ca8 100644
--- a/tests/baselines/reference/tsxElementResolution6.types
+++ b/tests/baselines/reference/tsxElementResolution6.types
@@ -16,5 +16,5 @@ var div: any;
 <div n='x' />;
 ><div n='x' /> : JSX.Element
 >div : any
->n : "x"
+>n : string
 
diff --git a/tests/baselines/reference/tsxElementResolution7.types b/tests/baselines/reference/tsxElementResolution7.types
index 1c93677c63e4c..208e65361d879 100644
--- a/tests/baselines/reference/tsxElementResolution7.types
+++ b/tests/baselines/reference/tsxElementResolution7.types
@@ -21,7 +21,7 @@ module my {
 >my.div : any
 >my : typeof my
 >div : any
->n : "x"
+>n : string
 
 // Error
 <my.other />;
@@ -43,7 +43,7 @@ module q {
 >mine.div : any
 >mine : typeof mine
 >div : any
->n : "x"
+>n : string
 
     // Error
     <mine.non />;
diff --git a/tests/baselines/reference/tsxElementResolution9.types b/tests/baselines/reference/tsxElementResolution9.types
index 6a5e29f6f393d..4d9fb4e73e9fa 100644
--- a/tests/baselines/reference/tsxElementResolution9.types
+++ b/tests/baselines/reference/tsxElementResolution9.types
@@ -67,6 +67,6 @@ var Obj3: Obj3;
 <Obj3 x={42} />; // OK
 ><Obj3 x={42} /> : JSX.Element
 >Obj3 : Obj3
->x : 42
+>x : number
 >42 : 42
 
diff --git a/tests/baselines/reference/tsxEmit1.types b/tests/baselines/reference/tsxEmit1.types
index 9309e03feac87..e56ab8dfa0442 100644
--- a/tests/baselines/reference/tsxEmit1.types
+++ b/tests/baselines/reference/tsxEmit1.types
@@ -25,36 +25,36 @@ var selfClosed2 = <div x="1" />;
 >selfClosed2 : JSX.Element
 ><div x="1" /> : JSX.Element
 >div : any
->x : "1"
+>x : string
 
 var selfClosed3 = <div x='1' />;
 >selfClosed3 : JSX.Element
 ><div x='1' /> : JSX.Element
 >div : any
->x : "1"
+>x : string
 
 var selfClosed4 = <div x="1" y='0' />;
 >selfClosed4 : JSX.Element
 ><div x="1" y='0' /> : JSX.Element
 >div : any
->x : "1"
->y : "0"
+>x : string
+>y : string
 
 var selfClosed5 = <div x={0} y='0' />;
 >selfClosed5 : JSX.Element
 ><div x={0} y='0' /> : JSX.Element
 >div : any
->x : 0
+>x : number
 >0 : 0
->y : "0"
+>y : string
 
 var selfClosed6 = <div x={"1"} y='0' />;
 >selfClosed6 : JSX.Element
 ><div x={"1"} y='0' /> : JSX.Element
 >div : any
->x : "1"
+>x : string
 >"1" : "1"
->y : "0"
+>y : string
 
 var selfClosed7 = <div x={p} y='p' />;
 >selfClosed7 : JSX.Element
@@ -62,7 +62,7 @@ var selfClosed7 = <div x={p} y='p' />;
 >div : any
 >x : any
 >p : any
->y : "p"
+>y : string
 
 var openClosed1 = <div></div>;
 >openClosed1 : JSX.Element
@@ -74,14 +74,14 @@ var openClosed2 = <div n='m'>foo</div>;
 >openClosed2 : JSX.Element
 ><div n='m'>foo</div> : JSX.Element
 >div : any
->n : "m"
+>n : string
 >div : any
 
 var openClosed3 = <div n='m'>{p}</div>;
 >openClosed3 : JSX.Element
 ><div n='m'>{p}</div> : JSX.Element
 >div : any
->n : "m"
+>n : string
 >p : any
 >div : any
 
@@ -89,7 +89,7 @@ var openClosed4 = <div n='m'>{p < p}</div>;
 >openClosed4 : JSX.Element
 ><div n='m'>{p < p}</div> : JSX.Element
 >div : any
->n : "m"
+>n : string
 >p < p : boolean
 >p : any
 >p : any
@@ -99,7 +99,7 @@ var openClosed5 = <div n='m'>{p > p}</div>;
 >openClosed5 : JSX.Element
 ><div n='m'>{p > p}</div> : JSX.Element
 >div : any
->n : "m"
+>n : string
 >p > p : boolean
 >p : any
 >p : any
diff --git a/tests/baselines/reference/tsxGenericArrowFunctionParsing.types b/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
index ddc05a809e9f2..0e601daecafa9 100644
--- a/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
+++ b/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
@@ -50,7 +50,7 @@ var x4 = <T extends={true}>() => {}</T>;
 >x4 : JSX.Element
 ><T extends={true}>() => {}</T> : JSX.Element
 >T : any
->extends : true
+>extends : boolean
 >true : true
 >T : any
 
diff --git a/tests/baselines/reference/tsxGenericAttributesType1.types b/tests/baselines/reference/tsxGenericAttributesType1.types
index 281e20b29949c..50be358302ea6 100644
--- a/tests/baselines/reference/tsxGenericAttributesType1.types
+++ b/tests/baselines/reference/tsxGenericAttributesType1.types
@@ -43,7 +43,7 @@ const decorator2 = function <T extends { x: number }>(Component: React.Stateless
 ><Component {...props} x={2} ></Component> : JSX.Element
 >Component : React.StatelessComponent<T>
 >props : T & { children?: React.ReactNode; }
->x : 2
+>x : number
 >2 : 2
 >Component : React.StatelessComponent<T>
 
@@ -69,7 +69,7 @@ const decorator3 = function <T extends { x: number }, U extends { x: number } >(
 >props : T & { children?: React.ReactNode; }
 ><Component x={2} {...props} ></Component> : JSX.Element
 >Component : React.StatelessComponent<T>
->x : 2
+>x : number
 >2 : 2
 >props : T & { children?: React.ReactNode; }
 >Component : React.StatelessComponent<T>
diff --git a/tests/baselines/reference/tsxGenericAttributesType2.types b/tests/baselines/reference/tsxGenericAttributesType2.types
index d20a4a44cd5e5..19c2e2ce03304 100644
--- a/tests/baselines/reference/tsxGenericAttributesType2.types
+++ b/tests/baselines/reference/tsxGenericAttributesType2.types
@@ -21,7 +21,7 @@ const decorator4 = function <T extends { x: number }>(Component: React.Stateless
 ><Component {...props} y={"blah"} ></Component> : JSX.Element
 >Component : React.StatelessComponent<T>
 >props : T & { children?: React.ReactNode; }
->y : "blah"
+>y : string
 >"blah" : "blah"
 >Component : React.StatelessComponent<T>
 
diff --git a/tests/baselines/reference/tsxGenericAttributesType3.types b/tests/baselines/reference/tsxGenericAttributesType3.types
index d0a942f8f1d6b..72674ac5bf763 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.types
+++ b/tests/baselines/reference/tsxGenericAttributesType3.types
@@ -38,6 +38,6 @@ class B<U> extends React.Component<U, {}> {
 >this.props : U & { children?: React.ReactNode; }
 >this : this
 >props : U & { children?: React.ReactNode; }
->x : "hi"
+>x : string
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType4.types b/tests/baselines/reference/tsxGenericAttributesType4.types
index 5de36a2762c05..ede5a874a42db 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.types
+++ b/tests/baselines/reference/tsxGenericAttributesType4.types
@@ -38,6 +38,6 @@ class B<U> extends React.Component<U, {}> {
 >this.props : U & { children?: React.ReactNode; }
 >this : this
 >props : U & { children?: React.ReactNode; }
->x : "hi"
+>x : string
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType5.types b/tests/baselines/reference/tsxGenericAttributesType5.types
index ec4f2f7cde8c0..c5320a5a8c4aa 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.types
+++ b/tests/baselines/reference/tsxGenericAttributesType5.types
@@ -42,6 +42,6 @@ class B<U> extends React.Component<U, {}> {
 >this.props : U
 >this : this
 >props : U
->x : "hi"
+>x : string
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType6.types b/tests/baselines/reference/tsxGenericAttributesType6.types
index ca8154d075a0a..662b6299dad85 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.types
+++ b/tests/baselines/reference/tsxGenericAttributesType6.types
@@ -42,6 +42,6 @@ class B<U> extends React.Component<U, {}> {
 >this.props : U
 >this : this
 >props : U
->x : "hi"
+>x : string
     }
 }
diff --git a/tests/baselines/reference/tsxGenericAttributesType7.types b/tests/baselines/reference/tsxGenericAttributesType7.types
index bf227f6291a28..58d853e4881f1 100644
--- a/tests/baselines/reference/tsxGenericAttributesType7.types
+++ b/tests/baselines/reference/tsxGenericAttributesType7.types
@@ -35,5 +35,5 @@ const decorator1 = function <U extends {x: string}>(props: U) {
 ><Component {...props} x="hi"/> : JSX.Element
 >Component : <T>(props: T) => JSX.Element
 >props : U
->x : "hi"
+>x : string
 }
diff --git a/tests/baselines/reference/tsxInArrowFunction.types b/tests/baselines/reference/tsxInArrowFunction.types
index f702fa4da3a33..5134ec0e6992b 100644
--- a/tests/baselines/reference/tsxInArrowFunction.types
+++ b/tests/baselines/reference/tsxInArrowFunction.types
@@ -25,7 +25,7 @@ declare namespace JSX {
 >() => <div text="wat" /> : () => JSX.Element
 ><div text="wat" /> : JSX.Element
 >div : any
->text : "wat"
+>text : string
 >div : any
 
 // didn't work
@@ -36,7 +36,7 @@ declare namespace JSX {
 >x : any
 ><div text="wat" /> : JSX.Element
 >div : any
->text : "wat"
+>text : string
 >div : any
 
 // worked
@@ -47,7 +47,7 @@ declare namespace JSX {
 >(<div text="wat" />) : JSX.Element
 ><div text="wat" /> : JSX.Element
 >div : any
->text : "wat"
+>text : string
 >div : any
 
 // worked (!)
@@ -57,7 +57,7 @@ declare namespace JSX {
 >() => <div text="wat"></div> : () => JSX.Element
 ><div text="wat"></div> : JSX.Element
 >div : any
->text : "wat"
+>text : string
 >div : any
 >div : any
 
diff --git a/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types b/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
index fa32c7e143bf8..41a0ed74a3f1f 100644
--- a/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
+++ b/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
@@ -87,14 +87,14 @@ const f1 = <ShouldInferFromData data={"1"} />;
 >f1 : JSX.Element
 ><ShouldInferFromData data={"1"} /> : JSX.Element
 >ShouldInferFromData : <T>(props: Props<T>) => JSX.Element
->data : "1"
+>data : string
 >"1" : "1"
 
 const f2 = <ShouldInferFromData data={"1"} convert={n => "" + n} />;
 >f2 : JSX.Element
 ><ShouldInferFromData data={"1"} convert={n => "" + n} /> : JSX.Element
 >ShouldInferFromData : <T>(props: Props<T>) => JSX.Element
->data : "1"
+>data : string
 >"1" : "1"
 >convert : (n: string) => string
 >n => "" + n : (n: string) => string
@@ -107,7 +107,7 @@ const f3 = <ShouldInferFromData data={2} convert={n => "" + n} />;
 >f3 : JSX.Element
 ><ShouldInferFromData data={2} convert={n => "" + n} /> : JSX.Element
 >ShouldInferFromData : <T>(props: Props<T>) => JSX.Element
->data : 2
+>data : number
 >2 : 2
 >convert : (n: number) => string
 >n => "" + n : (n: number) => string
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
index 949a0032ed02a..07eb311f7ec9f 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
@@ -30,7 +30,7 @@ let x = <MyComp a={10} b="hi" />
 >x : JSX.Element
 ><MyComp a={10} b="hi" /> : JSX.Element
 >MyComp : typeof MyComp
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
index 9fcf43172e9b8..0dc264c272094 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
@@ -36,5 +36,5 @@ let x1 = <MyComp a="hi"/>
 >x1 : JSX.Element
 ><MyComp a="hi"/> : JSX.Element
 >MyComp : typeof MyComp
->a : "hi"
+>a : string
 
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
index 79c62355d75ae..5463e2fe4b0d2 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
@@ -37,13 +37,13 @@ let x = <MyComp a={10} b="hi" />
 >x : JSX.Element
 ><MyComp a={10} b="hi" /> : JSX.Element
 >MyComp : typeof MyComp
->a : 10
+>a : number
 >10 : 10
->b : "hi"
+>b : string
 
 let x2 = <MyComp a="hi"/>
 >x2 : JSX.Element
 ><MyComp a="hi"/> : JSX.Element
 >MyComp : typeof MyComp
->a : "hi"
+>a : string
 
diff --git a/tests/baselines/reference/tsxReactEmit1.types b/tests/baselines/reference/tsxReactEmit1.types
index 488bb2bebd55a..49dbc0c9fd9b7 100644
--- a/tests/baselines/reference/tsxReactEmit1.types
+++ b/tests/baselines/reference/tsxReactEmit1.types
@@ -27,36 +27,36 @@ var selfClosed2 = <div x="1" />;
 >selfClosed2 : JSX.Element
 ><div x="1" /> : JSX.Element
 >div : any
->x : "1"
+>x : string
 
 var selfClosed3 = <div x='1' />;
 >selfClosed3 : JSX.Element
 ><div x='1' /> : JSX.Element
 >div : any
->x : "1"
+>x : string
 
 var selfClosed4 = <div x="1" y='0' />;
 >selfClosed4 : JSX.Element
 ><div x="1" y='0' /> : JSX.Element
 >div : any
->x : "1"
->y : "0"
+>x : string
+>y : string
 
 var selfClosed5 = <div x={0} y='0' />;
 >selfClosed5 : JSX.Element
 ><div x={0} y='0' /> : JSX.Element
 >div : any
->x : 0
+>x : number
 >0 : 0
->y : "0"
+>y : string
 
 var selfClosed6 = <div x={"1"} y='0' />;
 >selfClosed6 : JSX.Element
 ><div x={"1"} y='0' /> : JSX.Element
 >div : any
->x : "1"
+>x : string
 >"1" : "1"
->y : "0"
+>y : string
 
 var selfClosed7 = <div x={p} y='p' b />;
 >selfClosed7 : JSX.Element
@@ -64,7 +64,7 @@ var selfClosed7 = <div x={p} y='p' b />;
 >div : any
 >x : any
 >p : any
->y : "p"
+>y : string
 >b : true
 
 var openClosed1 = <div></div>;
@@ -77,14 +77,14 @@ var openClosed2 = <div n='m'>foo</div>;
 >openClosed2 : JSX.Element
 ><div n='m'>foo</div> : JSX.Element
 >div : any
->n : "m"
+>n : string
 >div : any
 
 var openClosed3 = <div n='m'>{p}</div>;
 >openClosed3 : JSX.Element
 ><div n='m'>{p}</div> : JSX.Element
 >div : any
->n : "m"
+>n : string
 >p : any
 >div : any
 
@@ -92,7 +92,7 @@ var openClosed4 = <div n='m'>{p < p}</div>;
 >openClosed4 : JSX.Element
 ><div n='m'>{p < p}</div> : JSX.Element
 >div : any
->n : "m"
+>n : string
 >p < p : boolean
 >p : any
 >p : any
@@ -102,7 +102,7 @@ var openClosed5 = <div n='m' b>{p > p}</div>;
 >openClosed5 : JSX.Element
 ><div n='m' b>{p > p}</div> : JSX.Element
 >div : any
->n : "m"
+>n : string
 >b : true
 >p > p : boolean
 >p : any
diff --git a/tests/baselines/reference/tsxReactEmit4.types b/tests/baselines/reference/tsxReactEmit4.types
index 8401262648ade..33090c35263ca 100644
--- a/tests/baselines/reference/tsxReactEmit4.types
+++ b/tests/baselines/reference/tsxReactEmit4.types
@@ -35,6 +35,6 @@ var spread1 = <div {...p} x={0} />;
 ><div {...p} x={0} /> : JSX.Element
 >div : any
 >p : any
->x : 0
+>x : number
 >0 : 0
 
diff --git a/tests/baselines/reference/tsxReactEmit5.types b/tests/baselines/reference/tsxReactEmit5.types
index bf937b4d141b1..f6def92af5b45 100644
--- a/tests/baselines/reference/tsxReactEmit5.types
+++ b/tests/baselines/reference/tsxReactEmit5.types
@@ -30,7 +30,7 @@ var spread1 = <div x='' {...foo} y='' />;
 >spread1 : JSX.Element
 ><div x='' {...foo} y='' /> : JSX.Element
 >div : any
->x : ""
+>x : string
 >foo : any
->y : ""
+>y : string
 
diff --git a/tests/baselines/reference/tsxReactEmit6.types b/tests/baselines/reference/tsxReactEmit6.types
index fd3666b5944bf..c92ad2493a60e 100644
--- a/tests/baselines/reference/tsxReactEmit6.types
+++ b/tests/baselines/reference/tsxReactEmit6.types
@@ -33,9 +33,9 @@ namespace M {
 >spread1 : JSX.Element
 ><div x='' {...foo} y='' /> : JSX.Element
 >div : any
->x : ""
+>x : string
 >foo : any
->y : ""
+>y : string
 
 	// Quotes
 	var x = <div>This "quote" thing</div>;
diff --git a/tests/baselines/reference/tsxReactEmit7.types b/tests/baselines/reference/tsxReactEmit7.types
index 859d83d06d362..d282439e953ab 100644
--- a/tests/baselines/reference/tsxReactEmit7.types
+++ b/tests/baselines/reference/tsxReactEmit7.types
@@ -17,28 +17,28 @@ var m = <div x-y="val"></div>;
 >m : JSX.Element
 ><div x-y="val"></div> : JSX.Element
 >div : any
->x-y : "val"
+>x-y : string
 >div : any
 
 var n = <div xx-y="val"></div>;
 >n : JSX.Element
 ><div xx-y="val"></div> : JSX.Element
 >div : any
->xx-y : "val"
+>xx-y : string
 >div : any
 
 var o = <div x-yy="val"></div>;
 >o : JSX.Element
 ><div x-yy="val"></div> : JSX.Element
 >div : any
->x-yy : "val"
+>x-yy : string
 >div : any
 
 var p = <div xx-yy="val"></div>;
 >p : JSX.Element
 ><div xx-yy="val"></div> : JSX.Element
 >div : any
->xx-yy : "val"
+>xx-yy : string
 >div : any
 
 // Investigation
@@ -46,34 +46,34 @@ var a = <div x="val"></div>;
 >a : JSX.Element
 ><div x="val"></div> : JSX.Element
 >div : any
->x : "val"
+>x : string
 >div : any
 
 var b = <div xx="val"></div>;
 >b : JSX.Element
 ><div xx="val"></div> : JSX.Element
 >div : any
->xx : "val"
+>xx : string
 >div : any
 
 var c = <div xxx="val"></div>;
 >c : JSX.Element
 ><div xxx="val"></div> : JSX.Element
 >div : any
->xxx : "val"
+>xxx : string
 >div : any
 
 var d = <div xxxx="val"></div>;
 >d : JSX.Element
 ><div xxxx="val"></div> : JSX.Element
 >div : any
->xxxx : "val"
+>xxxx : string
 >div : any
 
 var e = <div xxxxx="val"></div>;
 >e : JSX.Element
 ><div xxxxx="val"></div> : JSX.Element
 >div : any
->xxxxx : "val"
+>xxxxx : string
 >div : any
 
diff --git a/tests/baselines/reference/tsxReactEmitEntities.types b/tests/baselines/reference/tsxReactEmitEntities.types
index 518efa2289339..92d2b729dd552 100644
--- a/tests/baselines/reference/tsxReactEmitEntities.types
+++ b/tests/baselines/reference/tsxReactEmitEntities.types
@@ -40,14 +40,14 @@ declare var React: any;
 <div attr="&#0123;&hellip;&#x7D;\"></div>;
 ><div attr="&#0123;&hellip;&#x7D;\"></div> : JSX.Element
 >div : any
->attr : "&#0123;&hellip;&#x7D;\\"
+>attr : string
 >div : any
 
 // Does not happen for a string literal that happens to be inside an attribute (and escapes then work)
 <div attr={"&#0123;&hellip;&#x7D;\""}></div>;
 ><div attr={"&#0123;&hellip;&#x7D;\""}></div> : JSX.Element
 >div : any
->attr : "&#0123;&hellip;&#x7D;\""
+>attr : string
 >"&#0123;&hellip;&#x7D;\"" : "&#0123;&hellip;&#x7D;\""
 >div : any
 
@@ -55,6 +55,6 @@ declare var React: any;
 <div attr='"'></div>
 ><div attr='"'></div> : JSX.Element
 >div : any
->attr : "\""
+>attr : string
 >div : any
 
diff --git a/tests/baselines/reference/tsxReactEmitNesting.types b/tests/baselines/reference/tsxReactEmitNesting.types
index 0cfed5ae1f08d..46c55667e4afd 100644
--- a/tests/baselines/reference/tsxReactEmitNesting.types
+++ b/tests/baselines/reference/tsxReactEmitNesting.types
@@ -18,12 +18,12 @@ let render = (ctrl, model) =>
     <section class="todoapp">
 ><section class="todoapp">        <header class="header">            <h1>todos &lt;x&gt;</h1>            <input class="new-todo" autofocus autocomplete="off" placeholder="What needs to be done?" value={model.newTodo} onKeyup={ctrl.addTodo.bind(ctrl, model)} />        </header>        <section class="main" style={{display:(model.todos && model.todos.length) ? "block" : "none"}}>            <input class="toggle-all" type="checkbox" onChange={ctrl.toggleAll.bind(ctrl)}/>            <ul class="todo-list">                {model.filteredTodos.map((todo) =>                    <li class={{todo: true, completed: todo.completed, editing: todo == model.editedTodo}}>                        <div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div>                    </li>                )}            </ul>        </section>    </section> : any
 >section : any
->class : "todoapp"
+>class : string
 
         <header class="header">
 ><header class="header">            <h1>todos &lt;x&gt;</h1>            <input class="new-todo" autofocus autocomplete="off" placeholder="What needs to be done?" value={model.newTodo} onKeyup={ctrl.addTodo.bind(ctrl, model)} />        </header> : any
 >header : any
->class : "header"
+>class : string
 
             <h1>todos &lt;x&gt;</h1>
 ><h1>todos &lt;x&gt;</h1> : any
@@ -33,10 +33,10 @@ let render = (ctrl, model) =>
             <input class="new-todo" autofocus autocomplete="off" placeholder="What needs to be done?" value={model.newTodo} onKeyup={ctrl.addTodo.bind(ctrl, model)} />
 ><input class="new-todo" autofocus autocomplete="off" placeholder="What needs to be done?" value={model.newTodo} onKeyup={ctrl.addTodo.bind(ctrl, model)} /> : any
 >input : any
->class : "new-todo"
+>class : string
 >autofocus : true
->autocomplete : "off"
->placeholder : "What needs to be done?"
+>autocomplete : string
+>placeholder : string
 >value : any
 >model.newTodo : any
 >model : any
@@ -57,7 +57,7 @@ let render = (ctrl, model) =>
         <section class="main" style={{display:(model.todos && model.todos.length) ? "block" : "none"}}>
 ><section class="main" style={{display:(model.todos && model.todos.length) ? "block" : "none"}}>            <input class="toggle-all" type="checkbox" onChange={ctrl.toggleAll.bind(ctrl)}/>            <ul class="todo-list">                {model.filteredTodos.map((todo) =>                    <li class={{todo: true, completed: todo.completed, editing: todo == model.editedTodo}}>                        <div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div>                    </li>                )}            </ul>        </section> : any
 >section : any
->class : "main"
+>class : string
 >style : { display: string; }
 >{display:(model.todos && model.todos.length) ? "block" : "none"} : { display: string; }
 >display : string
@@ -78,8 +78,8 @@ let render = (ctrl, model) =>
             <input class="toggle-all" type="checkbox" onChange={ctrl.toggleAll.bind(ctrl)}/>
 ><input class="toggle-all" type="checkbox" onChange={ctrl.toggleAll.bind(ctrl)}/> : any
 >input : any
->class : "toggle-all"
->type : "checkbox"
+>class : string
+>type : string
 >onChange : any
 >ctrl.toggleAll.bind(ctrl) : any
 >ctrl.toggleAll.bind : any
@@ -92,7 +92,7 @@ let render = (ctrl, model) =>
             <ul class="todo-list">
 ><ul class="todo-list">                {model.filteredTodos.map((todo) =>                    <li class={{todo: true, completed: todo.completed, editing: todo == model.editedTodo}}>                        <div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div>                    </li>                )}            </ul> : any
 >ul : any
->class : "todo-list"
+>class : string
 
                 {model.filteredTodos.map((todo) =>
 >model.filteredTodos.map((todo) =>                    <li class={{todo: true, completed: todo.completed, editing: todo == model.editedTodo}}>                        <div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div>                    </li>                ) : any
@@ -125,7 +125,7 @@ let render = (ctrl, model) =>
                         <div class="view">
 ><div class="view">                            {(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null                            }                            <label onDoubleClick={()=>{ctrl.editTodo(todo)}}>{todo.title}</label>                            <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>                            <div class="iconBorder">                                <div class="icon"/>                            </div>                        </div> : any
 >div : any
->class : "view"
+>class : string
 
                             {(!todo.editable) ?
 >(!todo.editable) ?                                <input class="toggle" type="checkbox"></input>                                : null : any
@@ -138,8 +138,8 @@ let render = (ctrl, model) =>
                                 <input class="toggle" type="checkbox"></input>
 ><input class="toggle" type="checkbox"></input> : any
 >input : any
->class : "toggle"
->type : "checkbox"
+>class : string
+>type : string
 >input : any
 
                                 : null
@@ -163,7 +163,7 @@ let render = (ctrl, model) =>
                             <button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button>
 ><button class="destroy" onClick={ctrl.removeTodo.bind(ctrl,todo)}></button> : any
 >button : any
->class : "destroy"
+>class : string
 >onClick : any
 >ctrl.removeTodo.bind(ctrl,todo) : any
 >ctrl.removeTodo.bind : any
@@ -178,12 +178,12 @@ let render = (ctrl, model) =>
                             <div class="iconBorder">
 ><div class="iconBorder">                                <div class="icon"/>                            </div> : any
 >div : any
->class : "iconBorder"
+>class : string
 
                                 <div class="icon"/>
 ><div class="icon"/> : any
 >div : any
->class : "icon"
+>class : string
 
                             </div>
 >div : any
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution10.types b/tests/baselines/reference/tsxSpreadAttributesResolution10.types
index e3a5a4a25067e..09e6188a30a4e 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.types
@@ -55,7 +55,7 @@ let y1 = <Opt {...obj1} x="Hi"/>;
 ><Opt {...obj1} x="Hi"/> : JSX.Element
 >Opt : typeof Opt
 >obj1 : OptionProp
->x : "Hi"
+>x : string
 
 let y2 = <Opt {...obj1} x={3}/>;
 >y2 : JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution11.types b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
index 9c974edcbb123..aa1fec2a88523 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
@@ -72,7 +72,7 @@ let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
 >OverWriteAttr : typeof OverWriteAttr
 >obj : {}
 >y : true
->overwrite : "hi"
+>overwrite : string
 >obj1 : { x: 2; }
 
 let x1 = <OverWriteAttr {...obj1} {...obj3} />
@@ -88,7 +88,7 @@ let x2 = <OverWriteAttr x={3} overwrite="hi" {...obj1} {...{y: true}} />
 >OverWriteAttr : typeof OverWriteAttr
 >x : 3
 >3 : 3
->overwrite : "hi"
+>overwrite : string
 >obj1 : { x: 2; }
 >{y: true} : { y: true; }
 >y : true
@@ -98,7 +98,7 @@ let x3 = <OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true, x: 2, overw
 >x3 : JSX.Element
 ><OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true, x: 2, overwrite:"world"}} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
->overwrite : "hi"
+>overwrite : string
 >obj1 : { x: 2; }
 >x : 3
 >3 : 3
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.types b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
index 244a66e5d06bc..ff6f7140d7507 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
@@ -72,14 +72,14 @@ let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
 >OverWriteAttr : typeof OverWriteAttr
 >obj : {}
 >y : true
->overwrite : "hi"
+>overwrite : string
 >obj1 : { x: 2; }
 
 let x1 = <OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true}} />
 >x1 : JSX.Element
 ><OverWriteAttr overwrite="hi" {...obj1} x={3} {...{y: true}} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
->overwrite : "hi"
+>overwrite : string
 >obj1 : { x: 2; }
 >x : 3
 >3 : 3
@@ -99,7 +99,7 @@ let x3 = <OverWriteAttr overwrite="hi" {...obj1} {...{y: true}} />
 >x3 : JSX.Element
 ><OverWriteAttr overwrite="hi" {...obj1} {...{y: true}} /> : JSX.Element
 >OverWriteAttr : typeof OverWriteAttr
->overwrite : "hi"
+>overwrite : string
 >obj1 : { x: 2; }
 >{y: true} : { y: true; }
 >y : true
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution13.types b/tests/baselines/reference/tsxSpreadAttributesResolution13.types
index 74f9788ca805a..0ad324c25b18f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution13.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution13.types
@@ -39,7 +39,7 @@ export default function Component(props: ComponentProps) {
 ><ChildComponent {...props} property1="NewString" /> : JSX.Element
 >ChildComponent : ({ property1 }: AnotherComponentProps) => JSX.Element
 >props : ComponentProps
->property1 : "NewString"
+>property1 : string
     }
 }
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution15.types b/tests/baselines/reference/tsxSpreadAttributesResolution15.types
index 0a7183b8f0d51..152ad3f696eac 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution15.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution15.types
@@ -25,7 +25,7 @@ export default function Component(props: ComponentProps) {
 >AnotherComponent : ({ property1 }: AnotherComponentProps) => JSX.Element
 >props : ComponentProps
 >property2 : true
->AnotherProperty1 : "hi"
+>AnotherProperty1 : string
 
     );
 }
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.types b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
index 80c94ada9ffc2..21710567b0879 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
@@ -71,5 +71,5 @@ let w1 = <Poisoned {...{x: 5, y: "2"}} X="hi" />;
 >5 : 5
 >y : "2"
 >"2" : "2"
->X : "hi"
+>X : string
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution3.types b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
index 2363ef7b7ccc4..13ea6343298f1 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
@@ -54,7 +54,7 @@ let y = <Poisoned x="hi" y={2} />;
 >y : JSX.Element
 ><Poisoned x="hi" y={2} /> : JSX.Element
 >Poisoned : typeof Poisoned
->x : "hi"
->y : 2
+>x : string
+>y : number
 >2 : 2
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.types b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
index d5e40bdf278d8..b45fd73f2665f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
@@ -35,7 +35,7 @@ let x = <TextComponent editable={true} />
 >x : JSX.Element
 ><TextComponent editable={true} /> : JSX.Element
 >TextComponent : typeof TextComponent
->editable : true
+>editable : boolean
 >true : true
 
 const textProps: TextProps = {
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution8.types b/tests/baselines/reference/tsxSpreadAttributesResolution8.types
index 7f07213aeaba7..ad6caef41cb48 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.types
@@ -64,7 +64,7 @@ let x = <OverWriteAttr {...obj} y overwrite="hi" {...obj1} />
 >OverWriteAttr : typeof OverWriteAttr
 >obj : {}
 >y : true
->overwrite : "hi"
+>overwrite : string
 >obj1 : { x: number; }
 
 let x1 = <OverWriteAttr {...obj1} {...obj3}  />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
index bfec805860bdb..cb1908845ddfd 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
@@ -46,35 +46,35 @@ const c1 = <OneThing yxx='ok' />
 >c1 : JSX.Element
 ><OneThing yxx='ok' /> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->yxx : "ok"
+>yxx : string
 
 const c2 = <OneThing yy={100}  yy1="hello"/>
 >c2 : JSX.Element
 ><OneThing yy={100}  yy1="hello"/> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->yy : 100
+>yy : number
 >100 : 100
->yy1 : "hello"
+>yy1 : string
 
 const c3 = <OneThing yxx="hello" ignore-prop />
 >c3 : JSX.Element
 ><OneThing yxx="hello" ignore-prop /> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->yxx : "hello"
+>yxx : string
 >ignore-prop : true
 
 const c4 = <OneThing data="hello" data-prop />
 >c4 : JSX.Element
 ><OneThing data="hello" data-prop /> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->data : "hello"
+>data : string
 >data-prop : true
 
 const c5 = <OneThing yxx1='ok'>Hello</OneThing>
 >c5 : JSX.Element
 ><OneThing yxx1='ok'>Hello</OneThing> : JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
->yxx1 : "ok"
+>yxx1 : string
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
 
 
@@ -120,32 +120,32 @@ const d2 = <TestingOneThing extra-data="hello" />;
 >d2 : JSX.Element
 ><TestingOneThing extra-data="hello" /> : JSX.Element
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
->extra-data : "hello"
+>extra-data : string
 
 const d3 = <TestingOneThing extra-data="hello" yy="hihi" />;
 >d3 : JSX.Element
 ><TestingOneThing extra-data="hello" yy="hihi" /> : JSX.Element
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
->extra-data : "hello"
->yy : "hihi"
+>extra-data : string
+>yy : string
 
 const d4 = <TestingOneThing extra-data="hello" yy={9} direction={10} />;
 >d4 : JSX.Element
 ><TestingOneThing extra-data="hello" yy={9} direction={10} /> : JSX.Element
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
->extra-data : "hello"
->yy : 9
+>extra-data : string
+>yy : number
 >9 : 9
->direction : 10
+>direction : number
 >10 : 10
 
 const d5 = <TestingOneThing extra-data="hello" yy="hello" name="Bob" />;
 >d5 : JSX.Element
 ><TestingOneThing extra-data="hello" yy="hello" name="Bob" /> : JSX.Element
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
->extra-data : "hello"
->yy : "hello"
->name : "Bob"
+>extra-data : string
+>yy : string
+>name : string
 
 
 declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
@@ -175,14 +175,14 @@ const e3 = <TestingOptional y1="hello"/>
 >e3 : JSX.Element
 ><TestingOptional y1="hello"/> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : "hello"
+>y1 : string
 
 const e4 = <TestingOptional y1="hello" y2={1000} />
 >e4 : JSX.Element
 ><TestingOptional y1="hello" y2={1000} /> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : "hello"
->y2 : 1000
+>y1 : string
+>y2 : number
 >1000 : 1000
 
 const e5 = <TestingOptional y1 y3/>
@@ -198,7 +198,7 @@ const e6 = <TestingOptional y1 y3 y2={10} />
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
 >y1 : true
 >y3 : true
->y2 : 10
+>y2 : number
 >10 : 10
 
 const e2 = <TestingOptional y1 y3 extra-prop/>
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
index fbf06619cf2ec..d1cc5774447df 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
@@ -82,7 +82,7 @@ const c5 = <OneThing {...obj1} yy={42} {...{yy1: "hi"}}/>
 ><OneThing {...obj1} yy={42} {...{yy1: "hi"}}/> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >obj1 : { yy: boolean; }
->yy : 42
+>yy : number
 >42 : 42
 >{yy1: "hi"} : { yy1: string; }
 >yy1 : string
@@ -111,7 +111,7 @@ const c8 = <OneThing ignore-prop={100} />
 >c8 : JSX.Element
 ><OneThing ignore-prop={100} /> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
->ignore-prop : 100
+>ignore-prop : number
 >100 : 100
 
 const c9 = <OneThing {...{ "ignore-prop":200 }} />;
@@ -126,5 +126,5 @@ const c10 = <OneThing {...obj2} yy1="boo" />;
 ><OneThing {...obj2} yy1="boo" /> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >obj2 : { yy: number; "ignore-prop": string; }
->yy1 : "boo"
+>yy1 : string
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
index c1f08044d3c1f..6574f46f483ec 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
@@ -33,9 +33,9 @@ const two2 = <ZeroThingOrTwoThing yy={100}  yy1="hello"/>;
 >two2 : JSX.Element
 ><ZeroThingOrTwoThing yy={100}  yy1="hello"/> : JSX.Element
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
->yy : 100
+>yy : number
 >100 : 100
->yy1 : "hello"
+>yy1 : string
 
 const two3 = <ZeroThingOrTwoThing {...obj2} />;  // it is just any so we allow it to pass through
 >two3 : JSX.Element
@@ -47,7 +47,7 @@ const two4 = <ZeroThingOrTwoThing  yy={1000} {...obj2} />;  // it is just any so
 >two4 : JSX.Element
 ><ZeroThingOrTwoThing  yy={1000} {...obj2} /> : JSX.Element
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
->yy : 1000
+>yy : number
 >1000 : 1000
 >obj2 : any
 
@@ -56,7 +56,7 @@ const two5 = <ZeroThingOrTwoThing  {...obj2} yy={1000} />;  // it is just any so
 ><ZeroThingOrTwoThing  {...obj2} yy={1000} /> : JSX.Element
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
 >obj2 : any
->yy : 1000
+>yy : number
 >1000 : 1000
 
 declare function ThreeThing(l: {y1: string}): JSX.Element;
@@ -89,21 +89,21 @@ const three1 = <ThreeThing yy={99} yy1="hello world" />;
 >three1 : JSX.Element
 ><ThreeThing yy={99} yy1="hello world" /> : JSX.Element
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
->yy : 99
+>yy : number
 >99 : 99
->yy1 : "hello world"
+>yy1 : string
 
 const three2 = <ThreeThing y2="Bye" />;
 >three2 : JSX.Element
 ><ThreeThing y2="Bye" /> : JSX.Element
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
->y2 : "Bye"
+>y2 : string
 
 const three3 = <ThreeThing {...obj2} y2={10} />;  // it is just any so we allow it to pass through
 >three3 : JSX.Element
 ><ThreeThing {...obj2} y2={10} /> : JSX.Element
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
 >obj2 : any
->y2 : 10
+>y2 : number
 >10 : 10
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
index fb4cc66bd9cd0..fe265c5c4d063 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
@@ -41,7 +41,7 @@ const c1 = <OneThing yy={10}/>;  // missing property;
 >c1 : JSX.Element
 ><OneThing yy={10}/> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
->yy : 10
+>yy : number
 >10 : 10
 
 const c2 = <OneThing {...obj} yy1 />; // type incompatible;
@@ -65,7 +65,7 @@ const c4 = <OneThing {...obj} y1={10000} />;  // extra property;
 ><OneThing {...obj} y1={10000} /> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >obj : { yy: number; yy1: string; }
->y1 : 10000
+>y1 : number
 >10000 : 10000
 
 const c5 = <OneThing {...obj} {...{yy: true}} />;  // type incompatible;
@@ -118,8 +118,8 @@ const d2 = <TestingOneThing yy="hello" direction="left" />
 >d2 : JSX.Element
 ><TestingOneThing yy="hello" direction="left" /> : JSX.Element
 >TestingOneThing : { (j: { "extra-data": string; }): JSX.Element; (n: { yy: string; direction?: number; }): JSX.Element; }
->yy : "hello"
->direction : "left"
+>yy : string
+>direction : string
 
 declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
@@ -155,14 +155,14 @@ const e1 = <TestingOptional y1 y3="hello"/>
 ><TestingOptional y1 y3="hello"/> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
 >y1 : true
->y3 : "hello"
+>y3 : string
 
 const e2 = <TestingOptional y1="hello" y2={1000} y3 />
 >e2 : JSX.Element
 ><TestingOptional y1="hello" y2={1000} y3 /> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : "hello"
->y2 : 1000
+>y1 : string
+>y2 : number
 >1000 : 1000
 >y3 : true
 
@@ -170,17 +170,17 @@ const e3 = <TestingOptional y1="hello" y2={1000} children="hi" />
 >e3 : JSX.Element
 ><TestingOptional y1="hello" y2={1000} children="hi" /> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : "hello"
->y2 : 1000
+>y1 : string
+>y2 : number
 >1000 : 1000
->children : "hi"
+>children : string
 
 const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
 >e4 : JSX.Element
 ><TestingOptional y1="hello" y2={1000}>Hi</TestingOptional> : JSX.Element
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
->y1 : "hello"
->y2 : 1000
+>y1 : string
+>y2 : number
 >1000 : 1000
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
index 2bd3281eb2e21..b60a5a2d3f03e 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
@@ -134,7 +134,7 @@ const b0 = <MainButton to='/some/path' onClick={(e)=>{}}>GO</MainButton>;  // ex
 >b0 : JSX.Element
 ><MainButton to='/some/path' onClick={(e)=>{}}>GO</MainButton> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->to : "/some/path"
+>to : string
 >onClick : (e: React.MouseEvent<any>) => void
 >(e)=>{} : (e: React.MouseEvent<any>) => void
 >e : React.MouseEvent<any>
@@ -194,7 +194,7 @@ const b6 = <MainButton {...{ onClick(e: any){} }} children={10} />;  // incorrec
 >{ onClick(e: any){} } : { onClick(e: any): void; }
 >onClick : (e: any) => void
 >e : any
->children : 10
+>children : number
 >10 : 10
 
 const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;  // incorrect type for optional attribute
@@ -204,7 +204,7 @@ const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;
 >{ onClick(e: any){} } : { onClick(e: any): void; }
 >onClick : (e: any) => void
 >e : any
->children : "hello"
+>children : string
 >className : true
 
 const b8 = <MainButton data-format />;  // incorrect type for specified hyphanated name
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
index 6272288c035e9..6f7f04e3cf3b3 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
@@ -123,7 +123,7 @@ const b0 = <MainButton to='/some/path'>GO</MainButton>;
 >b0 : JSX.Element
 ><MainButton to='/some/path'>GO</MainButton> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->to : "/some/path"
+>to : string
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 
 const b1 = <MainButton onClick={(e) => {}}>Hello world</MainButton>;
@@ -161,7 +161,7 @@ const b5 = <MainButton {...obj1} to="/to/somewhere" />;  // should pick the seco
 ><MainButton {...obj1} to="/to/somewhere" /> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >obj1 : any
->to : "/to/somewhere"
+>to : string
 
 const b6 = <MainButton {...obj2} />;
 >b6 : JSX.Element
@@ -193,7 +193,7 @@ const b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
 >b9 : JSX.Element
 ><MainButton to='/some/path' extra-prop>GO</MainButton> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->to : "/some/path"
+>to : string
 >extra-prop : true
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 
@@ -201,8 +201,8 @@ const b10 = <MainButton to='/some/path' children="hi" ></MainButton>;
 >b10 : JSX.Element
 ><MainButton to='/some/path' children="hi" ></MainButton> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->to : "/some/path"
->children : "hi"
+>to : string
+>children : string
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 
 const b11 = <MainButton onClick={(e) => {}} className="hello" data-format>Hello world</MainButton>;
@@ -212,7 +212,7 @@ const b11 = <MainButton onClick={(e) => {}} className="hello" data-format>Hello
 >onClick : (e: React.MouseEvent<any>) => void
 >(e) => {} : (e: React.MouseEvent<any>) => void
 >e : React.MouseEvent<any>
->className : "hello"
+>className : string
 >data-format : true
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 
@@ -220,7 +220,7 @@ const b12 = <MainButton data-format="Hello world" />
 >b12 : JSX.Element
 ><MainButton data-format="Hello world" /> : JSX.Element
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
->data-format : "Hello world"
+>data-format : string
 
 
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
index 8c545b19e089f..ddbeb8deca017 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
@@ -33,5 +33,5 @@ let i1 = <MyComponent values="Hello"/>;
 >i1 : JSX.Element
 ><MyComponent values="Hello"/> : JSX.Element
 >MyComponent : <T = MyComponentProp>(attr: T) => JSX.Element
->values : "Hello"
+>values : string
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
index d43e7419d3400..fe9439447f453 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
@@ -28,6 +28,6 @@ let i1 = <MyComponent1 values={5}/>;
 >i1 : JSX.Element
 ><MyComponent1 values={5}/> : JSX.Element
 >MyComponent1 : <T extends MyComponentProp>(attr: T) => JSX.Element
->values : 5
+>values : number
 >5 : 5
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.types b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
index ffea243867519..ffd52cb497815 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
@@ -45,13 +45,13 @@ let a = <Greet name='world' />;
 >a : JSX.Element
 ><Greet name='world' /> : JSX.Element
 >Greet : (x: { name: string; }) => JSX.Element
->name : "world"
+>name : string
 
 let a1 = <Greet name='world' extra-prop />;
 >a1 : JSX.Element
 ><Greet name='world' extra-prop /> : JSX.Element
 >Greet : (x: { name: string; }) => JSX.Element
->name : "world"
+>name : string
 >extra-prop : true
 
 // Error
@@ -59,7 +59,7 @@ let b = <Greet naaame='world' />;
 >b : JSX.Element
 ><Greet naaame='world' /> : JSX.Element
 >Greet : (x: { name: string; }) => JSX.Element
->naaame : "world"
+>naaame : string
 
 // OK
 let c = <Meet />;
@@ -78,14 +78,14 @@ let d = <Meet name='me' />;
 >d : JSX.Element
 ><Meet name='me' /> : JSX.Element
 >Meet : ({ name }: { name?: string; }) => JSX.Element
->name : "me"
+>name : string
 
 // Error
 let e = <Meet name={42} />;
 >e : JSX.Element
 ><Meet name={42} /> : JSX.Element
 >Meet : ({ name }: { name?: string; }) => JSX.Element
->name : 42
+>name : number
 >42 : 42
 
 // Error
@@ -93,21 +93,21 @@ let f = <Meet naaaaaaame='no' />;
 >f : JSX.Element
 ><Meet naaaaaaame='no' /> : JSX.Element
 >Meet : ({ name }: { name?: string; }) => JSX.Element
->naaaaaaame : "no"
+>naaaaaaame : string
 
 // OK
 let g = <MeetAndGreet prop-name="Bob" />;
 >g : JSX.Element
 ><MeetAndGreet prop-name="Bob" /> : JSX.Element
 >MeetAndGreet : (k: { "prop-name": string; }) => JSX.Element
->prop-name : "Bob"
+>prop-name : string
 
 // Error
 let h = <MeetAndGreet extra-prop-name="World" />;
 >h : JSX.Element
 ><MeetAndGreet extra-prop-name="World" /> : JSX.Element
 >MeetAndGreet : (k: { "prop-name": string; }) => JSX.Element
->extra-prop-name : "World"
+>extra-prop-name : string
 
 // Error
 let i = <EmptyPropSFC prop1 />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.types b/tests/baselines/reference/tsxStatelessFunctionComponents2.types
index f033d50fd721b..05fe1a8897bc4 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.types
@@ -44,14 +44,14 @@ let b = <Greet key="k" />;
 >b : JSX.Element
 ><Greet key="k" /> : JSX.Element
 >Greet : (x: { name?: string; }) => JSX.Element
->key : "k"
+>key : string
 
 // Error - not allowed to specify 'ref' on SFCs
 let c = <Greet ref="myRef" />;
 >c : JSX.Element
 ><Greet ref="myRef" /> : JSX.Element
 >Greet : (x: { name?: string; }) => JSX.Element
->ref : "myRef"
+>ref : string
 
 
 // OK - ref is valid for classes
@@ -103,7 +103,7 @@ let g = <BigGreeter key={100} />;
 >g : JSX.Element
 ><BigGreeter key={100} /> : JSX.Element
 >BigGreeter : typeof BigGreeter
->key : 100
+>key : number
 >100 : 100
 
 // OK - contextually typed intrinsic ref callback parameter
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
index 2fbb2d333ef6c..2758ca7e0df1a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
@@ -41,7 +41,7 @@ function Baz<T,U>(key1: T, value: U) {
 >key1 : T
 >value : U
 >value : U
->key : "Component"
+>key : string
 }
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
index 808fe38ee09d5..851839ea921b6 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
@@ -33,7 +33,7 @@ function Bar<T extends {prop: number}>(arg: T) {
 ><ComponentSpecific1 {...arg} ignore-prop={10} /> : JSX.Element
 >ComponentSpecific1 : <U>(l: { prop: U; "ignore-prop": string; }) => JSX.Element
 >arg : T
->ignore-prop : 10
+>ignore-prop : number
 >10 : 10
  }
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
index 8bc938a48618a..aa38d2ccf8ac5 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
@@ -48,7 +48,7 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 ><OverloadComponent {...arg1} a="hello" ignore-prop /> : JSX.Element
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
 >arg1 : T
->a : "hello"
+>a : string
 >ignore-prop : true
 
     let a1 = <OverloadComponent {...arg2} ignore-pro="hello world" />;
@@ -56,7 +56,7 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 ><OverloadComponent {...arg2} ignore-pro="hello world" /> : JSX.Element
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
 >arg2 : U
->ignore-pro : "hello world"
+>ignore-pro : string
 
     let a2 = <OverloadComponent {...arg2} />;
 >a2 : JSX.Element
@@ -81,7 +81,7 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 ><OverloadComponent {...arg2} ignore-prop="hello" {...arg1} /> : JSX.Element
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
 >arg2 : U
->ignore-prop : "hello"
+>ignore-prop : string
 >arg1 : T
 
     let a6 = <OverloadComponent {...arg2} ignore-prop {...arg1} />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
index 627ac387449a1..98a9c62179732 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
@@ -61,14 +61,14 @@ function Bar<T extends { prop: number }>(arg: T) {
 ><ComponentSpecific {...arg} ignore-prop="hi" /> : JSX.Element
 >ComponentSpecific : <U>(l: { prop: U; }) => JSX.Element
 >arg : T
->ignore-prop : "hi"
+>ignore-prop : string
 
     let a2 = <ComponentSpecific1 {...arg} ignore-prop={10} />;  // U is number
 >a2 : JSX.Element
 ><ComponentSpecific1 {...arg} ignore-prop={10} /> : JSX.Element
 >ComponentSpecific1 : <U>(l: { prop: U; "ignore-prop": number; }) => JSX.Element
 >arg : T
->ignore-prop : 10
+>ignore-prop : number
 >10 : 10
 
     let a3 = <ComponentSpecific {...arg} prop="hello" />;   // U is "hello"
@@ -76,13 +76,13 @@ function Bar<T extends { prop: number }>(arg: T) {
 ><ComponentSpecific {...arg} prop="hello" /> : JSX.Element
 >ComponentSpecific : <U>(l: { prop: U; }) => JSX.Element
 >arg : T
->prop : "hello"
+>prop : string
 
     let a4 = <ComponentSpecific {...arg} prop1="hello" />;   // U is "hello"
 >a4 : JSX.Element
 ><ComponentSpecific {...arg} prop1="hello" /> : JSX.Element
 >ComponentSpecific : <U>(l: { prop: U; }) => JSX.Element
 >arg : T
->prop1 : "hello"
+>prop1 : string
 }
 
diff --git a/tests/baselines/reference/tsxTypeErrors.types b/tests/baselines/reference/tsxTypeErrors.types
index 1203bb4f0257a..91740cf88dea1 100644
--- a/tests/baselines/reference/tsxTypeErrors.types
+++ b/tests/baselines/reference/tsxTypeErrors.types
@@ -4,14 +4,14 @@ var a1 = <div id="foo" />;
 >a1 : any
 ><div id="foo" /> : any
 >div : any
->id : "foo"
+>id : string
 
 // A built-in element with a mistyped property (error)
 var a2 = <img srce="foo.jpg" />
 >a2 : any
 ><img srce="foo.jpg" /> : any
 >img : any
->srce : "foo.jpg"
+>srce : string
 
 // A built-in element with a badly-typed attribute value (error)
 var thing = { oops: 100 };
@@ -32,7 +32,7 @@ var e1 = <imag src="bar.jpg" />
 >e1 : any
 ><imag src="bar.jpg" /> : any
 >imag : any
->src : "bar.jpg"
+>src : string
 
 // A custom type
 class MyClass {
@@ -60,7 +60,7 @@ var b1 = <MyClass reqd={true} />;
 >b1 : any
 ><MyClass reqd={true} /> : any
 >MyClass : typeof MyClass
->reqd : true
+>reqd : boolean
 >true : true
 
 // Mistyped attribute member
diff --git a/tests/baselines/reference/tsxUnionElementType2.types b/tests/baselines/reference/tsxUnionElementType2.types
index 822ba7f0028ee..3b2df619596a8 100644
--- a/tests/baselines/reference/tsxUnionElementType2.types
+++ b/tests/baselines/reference/tsxUnionElementType2.types
@@ -34,6 +34,6 @@ var SFCComp = SFC1 || SFC2;
 <SFCComp x={"hi"}/>
 ><SFCComp x={"hi"}/> : JSX.Element
 >SFCComp : ((prop: { x: number; }) => JSX.Element) | ((prop: { x: boolean; }) => JSX.Element)
->x : "hi"
+>x : string
 >"hi" : "hi"
 
diff --git a/tests/baselines/reference/tsxUnionElementType3.types b/tests/baselines/reference/tsxUnionElementType3.types
index 8f3ad7056bd26..5a797ea483b59 100644
--- a/tests/baselines/reference/tsxUnionElementType3.types
+++ b/tests/baselines/reference/tsxUnionElementType3.types
@@ -85,7 +85,7 @@ let a = <RCComp x="Hi" />;
 >a : JSX.Element
 ><RCComp x="Hi" /> : JSX.Element
 >RCComp : typeof RC1 | typeof RC2
->x : "Hi"
+>x : string
 
 let a1 = <EmptyRCComp />;
 >a1 : JSX.Element
@@ -96,7 +96,7 @@ let a2 = <EmptyRCComp data-prop="hello" />;
 >a2 : JSX.Element
 ><EmptyRCComp data-prop="hello" /> : JSX.Element
 >EmptyRCComp : typeof RC3
->data-prop : "hello"
+>data-prop : string
 
 let b = <PartRCComp />
 >b : JSX.Element
@@ -107,5 +107,5 @@ let c = <PartRCComp data-extra="hello" />
 >c : JSX.Element
 ><PartRCComp data-extra="hello" /> : JSX.Element
 >PartRCComp : typeof RC4
->data-extra : "hello"
+>data-extra : string
 
diff --git a/tests/baselines/reference/tsxUnionElementType4.types b/tests/baselines/reference/tsxUnionElementType4.types
index 9d60f0462fd42..c0961eb6d1644 100644
--- a/tests/baselines/reference/tsxUnionElementType4.types
+++ b/tests/baselines/reference/tsxUnionElementType4.types
@@ -91,7 +91,7 @@ let b = <PartRCComp x={10} />
 >b : JSX.Element
 ><PartRCComp x={10} /> : JSX.Element
 >PartRCComp : typeof RC4
->x : 10
+>x : number
 >10 : 10
 
 let c = <EmptyRCComp prop />;
diff --git a/tests/baselines/reference/tsxUnionElementType6.types b/tests/baselines/reference/tsxUnionElementType6.types
index 5b7a1c0a5031f..db36bad01f063 100644
--- a/tests/baselines/reference/tsxUnionElementType6.types
+++ b/tests/baselines/reference/tsxUnionElementType6.types
@@ -54,7 +54,7 @@ let b = <SFC2AndEmptyComp x="hi" />;
 >b : JSX.Element
 ><SFC2AndEmptyComp x="hi" /> : JSX.Element
 >SFC2AndEmptyComp : (prop: { x: boolean; }) => JSX.Element
->x : "hi"
+>x : string
 
 let c = <SFC2AndEmptyComp />;
 >c : JSX.Element

From be498533f5ba3b235602dd794a97a8745280efe3 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 15 Dec 2017 10:33:22 -0800
Subject: [PATCH 5/7] Restore jsdoc tag interpretation

---
 src/compiler/checker.ts                       | 32 +++++++++----------
 src/compiler/utilities.ts                     |  2 +-
 .../checkJsdocTypeTagOnObjectProperty1.types  |  6 ++--
 .../checkJsdocTypeTagOnObjectProperty2.types  |  8 ++---
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b7f242b1c5919..0bfd35ff9de89 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4634,6 +4634,13 @@ namespace ts {
             return isPrivateWithinAmbient(memberDeclaration);
         }
 
+        function tryGetTypeFromEffectiveTypeNode(declaration: Declaration) {
+            const typeNode = getEffectiveTypeAnnotationNode(declaration);
+            if (typeNode) {
+                return getTypeFromTypeNode(typeNode);
+            }
+        }
+
         function getTypeOfVariableOrParameterOrProperty(symbol: Symbol): Type {
             const links = getSymbolLinks(symbol);
             if (!links.type) {
@@ -4668,30 +4675,23 @@ namespace ts {
                     declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
                     type = getWidenedTypeFromJSSpecialPropertyDeclarations(symbol);
                 }
-                else if (isJSDocPropertyTag(declaration)) {
-                    type = anyType; // TODO: Mimics old behavior from incorrect usage of getWidenedTypeForVariableLikeDeclaration, but seems incorrect
-                }
-                else if (isPropertyAccessExpression(declaration) || isMethodDeclaration(declaration) && !isObjectLiteralMethod(declaration)) {
-                    // TODO: Mimics old behavior from incorrect usage of getWidenedTypeForVariableLikeDeclaration, but seems lacking
-                    const typeNode = getEffectiveTypeAnnotationNode(declaration);
-                    if (typeNode) {
-                        type = getTypeFromTypeNode(typeNode);
-                    }
-                    else {
-                        type = anyType;
-                    }
+                else if (isJSDocPropertyTag(declaration)
+                    || isPropertyAccessExpression(declaration)
+                    || isMethodDeclaration(declaration) && !isObjectLiteralMethod(declaration)) {
+                    // TODO: Mimics old behavior from incorrect usage of getWidenedTypeForVariableLikeDeclaration, but seems incorrect
+                    type = tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
                 }
                 else if (isPropertyAssignment(declaration)) {
-                    type = checkPropertyAssignment(declaration);
+                    type = tryGetTypeFromEffectiveTypeNode(declaration) || checkPropertyAssignment(declaration);
                 }
                 else if (isJsxAttribute(declaration)) {
-                    type = checkJsxAttribute(declaration);
+                    type = tryGetTypeFromEffectiveTypeNode(declaration) || checkJsxAttribute(declaration);
                 }
                 else if (isShorthandPropertyAssignment(declaration)) {
-                    type = checkExpressionForMutableLocation(declaration.name, CheckMode.Normal);
+                    type = tryGetTypeFromEffectiveTypeNode(declaration) || checkExpressionForMutableLocation(declaration.name, CheckMode.Normal);
                 }
                 else if (isObjectLiteralMethod(declaration)) {
-                    type = checkObjectLiteralMethod(declaration, CheckMode.Normal);
+                    type = tryGetTypeFromEffectiveTypeNode(declaration) || checkObjectLiteralMethod(declaration, CheckMode.Normal);
                 }
                 else if (isParameter(declaration)
                     || isPropertyDeclaration(declaration)
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 91e63019f30a6..87526f5988216 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2816,7 +2816,7 @@ namespace ts {
      * Gets the effective type annotation of a variable, parameter, or property. If the node was
      * parsed in a JavaScript file, gets the type annotation from JSDoc.
      */
-    export function getEffectiveTypeAnnotationNode(node: VariableLikeDeclaration | Expression, checkJSDoc?: boolean): TypeNode | undefined {
+    export function getEffectiveTypeAnnotationNode(node: Node, checkJSDoc?: boolean): TypeNode | undefined {
         if (hasType(node)) {
             return node.type;
         }
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
index 60aa4bc0a8000..72c5c55228e0d 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.types
@@ -10,12 +10,12 @@ const obj = {
 
   /** @type {string|undefined} */
   foo: undefined,
->foo : undefined
+>foo : string | undefined
 >undefined : undefined
 
   /** @type {string|undefined} */
   bar: "42",
->bar : string
+>bar : string | undefined
 >"42" : "42"
 
   /** @type {function(number): number} */
@@ -42,7 +42,7 @@ const obj = {
 
   /** @type {function(number): number} */
   arrowFunc: (num) => num + 42
->arrowFunc : (num: any) => any
+>arrowFunc : (arg0: number) => number
 >(num) => num + 42 : (num: any) => any
 >num : any
 >num + 42 : any
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
index 8f16ebfae5d3f..443826c7aeb58 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
+++ b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty2.types
@@ -9,7 +9,7 @@ const obj = {
 
   /** @type {string|undefined} */
   bar: 42,
->bar : number
+>bar : string | undefined
 >42 : 42
 
   /** @type {function(number): number} */
@@ -23,14 +23,14 @@ const obj = {
   },
   /** @type {function(number): number} */
   method2: (n1) => "lol",
->method2 : (n1: any) => string
+>method2 : (arg0: number) => number
 >(n1) => "lol" : (n1: any) => string
 >n1 : any
 >"lol" : "lol"
 
   /** @type {function(number): number} */
   arrowFunc: (num="0") => num + 42,
->arrowFunc : (num?: string) => string
+>arrowFunc : (arg0: number) => number
 >(num="0") => num + 42 : (num?: string) => string
 >num : string
 >"0" : "0"
@@ -40,7 +40,7 @@ const obj = {
 
   /** @type {string} */
   lol
->lol : undefined
+>lol : string
 }
 lol = "string"
 >lol = "string" : "string"

From f947fbfbbd073a03c8ce24bd1210e4840ef99e54 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 15 Dec 2017 10:40:26 -0800
Subject: [PATCH 6/7] Clean up some code, revert fourslash tests

---
 src/compiler/checker.ts                | 5 ++---
 tests/cases/fourslash/tsxQuickInfo3.ts | 2 +-
 tests/cases/fourslash/tsxQuickInfo4.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0bfd35ff9de89..1eae08ae99175 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4394,9 +4394,8 @@ namespace ts {
 
             const isOptional = !isBindingElement(declaration) && !isVariableDeclaration(declaration) && !!declaration.questionToken && includeOptionality;
             // Use type from type annotation if one is present
-            const typeNode = getEffectiveTypeAnnotationNode(declaration);
-            if (typeNode) {
-                const declaredType = getTypeFromTypeNode(typeNode);
+            const declaredType = tryGetTypeFromEffectiveTypeNode(declaration);
+            if (declaredType) {
                 return addOptionality(declaredType, isOptional);
             }
 
diff --git a/tests/cases/fourslash/tsxQuickInfo3.ts b/tests/cases/fourslash/tsxQuickInfo3.ts
index 5130627097302..614ffa878ef09 100644
--- a/tests/cases/fourslash/tsxQuickInfo3.ts
+++ b/tests/cases/fourslash/tsxQuickInfo3.ts
@@ -24,7 +24,7 @@
 
 verify.quickInfos({
     1: "class Opt",
-    2: "(JSX attribute) propx: 2",
+    2: "(JSX attribute) propx: number",
     3: "const obj1: OptionProp",
     4: "(JSX attribute) propx: true"
 });
diff --git a/tests/cases/fourslash/tsxQuickInfo4.ts b/tests/cases/fourslash/tsxQuickInfo4.ts
index bc322d2f89287..d9f566571aafd 100644
--- a/tests/cases/fourslash/tsxQuickInfo4.ts
+++ b/tests/cases/fourslash/tsxQuickInfo4.ts
@@ -48,7 +48,7 @@
 
 verify.quickInfos({
     1: "function MainButton(linkProps: LinkProps): any (+1 overload)",
-    2: "(JSX attribute) to: \"/some/path\"",
+    2: "(JSX attribute) to: string",
     3: "function MainButton(buttonProps: ButtonProps): any (+1 overload)",
     4: "(JSX attribute) onClick: () => void",
     5: "(JSX attribute) extra-prop: true"

From 07c7c6d2e9b2459a7cf7e0a3ee12e12a4a34c339 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 15 Dec 2017 14:17:01 -0800
Subject: [PATCH 7/7] Cleanup types used by PR feedback

---
 src/compiler/checker.ts   |  2 +-
 src/compiler/types.ts     | 13 +++----------
 src/compiler/utilities.ts |  8 ++++----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1eae08ae99175..baa6cb0a4eef1 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4216,7 +4216,7 @@ namespace ts {
 
         // Return the type of a binding element parent. We check SymbolLinks first to see if a type has been
         // assigned by contextual typing.
-        function getTypeForBindingElementParent(node: BindingElement["parent"]["parent"]) {
+        function getTypeForBindingElementParent(node: BindingElementGrandparent) {
             const symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 5283dc974967d..51465a6baf569 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -584,11 +584,6 @@ namespace ts {
         | JSDocFunctionType
         | EndOfFileToken;
 
-    /* @internal */
-    export interface TypeContainer {
-        type?: TypeNode;
-    }
-
     export type HasType =
         | SignatureDeclaration
         | VariableDeclaration
@@ -607,11 +602,6 @@ namespace ts {
         | JSDocOptionalType
         | JSDocVariadicType;
 
-    /* @internal */
-    export interface InitializerContainer {
-        initializer?: Expression;
-    }
-
     export type HasInitializer =
         | HasExpressionInitializer
         | ForStatement
@@ -837,6 +827,9 @@ namespace ts {
         initializer?: Expression;           // Optional initializer
     }
 
+    /*@internal*/
+    export type BindingElementGrandparent = BindingElement["parent"]["parent"];
+
     export interface PropertySignature extends TypeElement, JSDocContainer {
         kind: SyntaxKind.PropertySignature;
         name: PropertyName;                 // Declared property name
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 87526f5988216..2a2561907f780 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -784,7 +784,7 @@ namespace ts {
                     case SyntaxKind.PropertySignature:
                     case SyntaxKind.Parameter:
                     case SyntaxKind.VariableDeclaration:
-                        return node === (parent as Node & { type: Node }).type;
+                        return node === (parent as HasType).type;
                     case SyntaxKind.FunctionDeclaration:
                     case SyntaxKind.FunctionExpression:
                     case SyntaxKind.ArrowFunction:
@@ -1340,7 +1340,7 @@ namespace ts {
             case SyntaxKind.EnumMember:
             case SyntaxKind.PropertyAssignment:
             case SyntaxKind.BindingElement:
-                return (parent as Node & { initializer: Node }).initializer === node;
+                return (parent as HasInitializer).initializer === node;
             case SyntaxKind.ExpressionStatement:
             case SyntaxKind.IfStatement:
             case SyntaxKind.DoStatement:
@@ -5816,13 +5816,13 @@ namespace ts {
     /** True if has type node attached to it. */
     /* @internal */
     export function hasType(node: Node): node is HasType {
-        return !!(node as TypeContainer).type;
+        return !!(node as HasType).type;
     }
 
     /** True if has initializer node attached to it. */
     /* @internal */
     export function hasInitializer(node: Node): node is HasInitializer {
-        return !!(node as InitializerContainer).initializer;
+        return !!(node as HasInitializer).initializer;
     }
 
     /** True if has initializer node attached to it. */