Remove some redundant code in createJsxAttributesTypeFromAttributesProperty

Andy Hanson · Andy Hanson · commit d36175b1e874 · 2017-05-05T08:51:18.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13293,19 +13293,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
`@@ -13293,19 +13293,15 @@ namespace ts {`
`13293`	`13293`	`if (spread !== emptyObjectType) {`
`13294`	`13294`	`if (attributesArray.length > 0) {`
`13295`	`13295`	`spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable));`
`13296`		`- attributesArray = [];`
`13297`		`- attributesTable = createMap<Symbol>();`
`13298`	`13296`	`}`
`13299`	`13297`	`attributesArray = getPropertiesOfType(spread);`
`13300`	`13298`	`}`
`13301`	`13299`
`13302`	`13300`	`attributesTable = createMap<Symbol>();`
`13303`		`- if (attributesArray) {`
`13304`		`- forEach(attributesArray, (attr) => {`
`13305`		`- if (!filter \|\| filter(attr)) {`
`13306`		`- attributesTable.set(attr.name, attr);`
`13307`		`- }`
`13308`		`- });`
	`13301`	`+ for (const attr of attributesArray) {`
	`13302`	`+ if (!filter \|\| filter(attr)) {`
	`13303`	`+ attributesTable.set(attr.name, attr);`
	`13304`	`+ }`
`13309`	`13305`	`}`
`13310`	`13306`	`}`
`13311`	`13307`