Merge pull request microsoft#15609 from Microsoft/jsx-redundant-code

Andy · web-flow · commit 376df411fd78 · 2017-05-08T15:36:47.000-07:00
Remove some redundant code in createJsxAttributesTypeFromAttributesProperty
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13301,19 +13301,15 @@ namespace ts {
                 if (spread !== emptyObjectType) {
                     if (attributesArray.length > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable));
-                        attributesArray = [];
-                        attributesTable = createMap<Symbol>();
                     }
                     attributesArray = getPropertiesOfType(spread);
                 }
 
                 attributesTable = createMap<Symbol>();
-                if (attributesArray) {
-                    forEach(attributesArray, (attr) => {
-                        if (!filter || filter(attr)) {
-                            attributesTable.set(attr.name, attr);
-                        }
-                    });
+                for (const attr of attributesArray) {
+                    if (!filter || filter(attr)) {
+                        attributesTable.set(attr.name, attr);
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -13301,19 +13301,15 @@ namespace ts {`
`13301`	`13301`	`if (spread !== emptyObjectType) {`
`13302`	`13302`	`if (attributesArray.length > 0) {`
`13303`	`13303`	`spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable));`
`13304`		`- attributesArray = [];`
`13305`		`- attributesTable = createMap<Symbol>();`
`13306`	`13304`	`}`
`13307`	`13305`	`attributesArray = getPropertiesOfType(spread);`
`13308`	`13306`	`}`
`13309`	`13307`
`13310`	`13308`	`attributesTable = createMap<Symbol>();`
`13311`		`- if (attributesArray) {`
`13312`		`- forEach(attributesArray, (attr) => {`
`13313`		`- if (!filter \|\| filter(attr)) {`
`13314`		`- attributesTable.set(attr.name, attr);`
`13315`		`- }`
`13316`		`- });`
	`13309`	`+ for (const attr of attributesArray) {`
	`13310`	`+ if (!filter \|\| filter(attr)) {`
	`13311`	`+ attributesTable.set(attr.name, attr);`
	`13312`	`+ }`
`13317`	`13313`	`}`
`13318`	`13314`	`}`
`13319`	`13315`