fixed a conflict

Arthur Ozga · Arthur Ozga · commit ded24410e6db · 2015-06-29T14:39:09.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -6843,7 +6843,7 @@ namespace ts {
             }
 
             if (correspondingPropType) {
-                checkTypeAssignableTo(exprType, correspondingPropType, node);
+                checkTypeAssignableTo(exprType, correspondingPropType, RelationComparisonFlags.None, node);
             }
 
             nameTable[node.name.text] = true;
@@ -6860,7 +6860,7 @@ namespace ts {
                     let targetPropSym = getPropertyOfType(elementAttributesType, prop.name);
                     if (targetPropSym) {
                         let msg = chainDiagnosticMessages(undefined, Diagnostics.Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property, prop.name);
-                        checkTypeAssignableTo(getTypeOfSymbol(prop), getTypeOfSymbol(targetPropSym), node, undefined, msg);
+                        checkTypeAssignableTo(getTypeOfSymbol(prop), getTypeOfSymbol(targetPropSym), RelationComparisonFlags.None, node, undefined, msg);
                     }
 
                     nameTable[prop.name] = true;
@@ -6988,7 +6988,7 @@ namespace ts {
             // Issue an error if this return type isn't assignable to JSX.ElementClass
             let elemClassType = getJsxGlobalElementClassType();
             if (elemClassType) {
-                checkTypeRelatedTo(returnType, elemClassType, assignableRelation, node, Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);
+                checkTypeRelatedTo(returnType, elemClassType, assignableRelation, RelationComparisonFlags.None, node, Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);
             }
 
             return returnType;

Original file line number	Diff line number	Diff line change
`@@ -6843,7 +6843,7 @@ namespace ts {`
`6843`	`6843`	`}`
`6844`	`6844`
`6845`	`6845`	`if (correspondingPropType) {`
`6846`		`- checkTypeAssignableTo(exprType, correspondingPropType, node);`
	`6846`	`+ checkTypeAssignableTo(exprType, correspondingPropType, RelationComparisonFlags.None, node);`
`6847`	`6847`	`}`
`6848`	`6848`
`6849`	`6849`	`nameTable[node.name.text] = true;`
`@@ -6860,7 +6860,7 @@ namespace ts {`
`6860`	`6860`	`let targetPropSym = getPropertyOfType(elementAttributesType, prop.name);`
`6861`	`6861`	`if (targetPropSym) {`
`6862`	`6862`	`let msg = chainDiagnosticMessages(undefined, Diagnostics.Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property, prop.name);`
`6863`		`- checkTypeAssignableTo(getTypeOfSymbol(prop), getTypeOfSymbol(targetPropSym), node, undefined, msg);`
	`6863`	`+ checkTypeAssignableTo(getTypeOfSymbol(prop), getTypeOfSymbol(targetPropSym), RelationComparisonFlags.None, node, undefined, msg);`
`6864`	`6864`	`}`
`6865`	`6865`
`6866`	`6866`	`nameTable[prop.name] = true;`
`@@ -6988,7 +6988,7 @@ namespace ts {`
`6988`	`6988`	`// Issue an error if this return type isn't assignable to JSX.ElementClass`
`6989`	`6989`	`let elemClassType = getJsxGlobalElementClassType();`
`6990`	`6990`	`if (elemClassType) {`
`6991`		`- checkTypeRelatedTo(returnType, elemClassType, assignableRelation, node, Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);`
	`6991`	`+ checkTypeRelatedTo(returnType, elemClassType, assignableRelation, RelationComparisonFlags.None, node, Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);`
`6992`	`6992`	`}`
`6993`	`6993`
`6994`	`6994`	`return returnType;`