Update calling to getSpreadType and using set function when adding value to map

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit a39f9ef1a7ef · 2017-01-19T09:46:15.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -11903,13 +11903,13 @@ namespace ts {
                     }
                     attributeSymbol.type = exprType;
                     attributeSymbol.target = member;
-                    attributesTable[attributeSymbol.name] = attributeSymbol;
+                    attributesTable.set(attributeSymbol.name, attributeSymbol);
                     attributesArray.push(attributeSymbol);
                 }
                 else {
                     Debug.assert(attributeDecl.kind === SyntaxKind.JsxSpreadAttribute);
                     if (attributesArray.length > 0) {
-                        spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable), /*isFromObjectLiteral*/ true);
+                        spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable));
                         attributesArray = [];
                         attributesTable = createMap<Symbol>();
                     }
@@ -11922,13 +11922,13 @@ namespace ts {
                     if (isTypeAny(widenExprType)) {
                         return undefined;
                     }
-                    spread = getSpreadType(spread, exprType, /*isFromObjectLiteral*/ false);
+                    spread = getSpreadType(spread, exprType);
                 }
             }
 
             if (spread !== emptyObjectType) {
                 if (attributesArray.length > 0) {
-                    spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable), /*isFromObjectLiteral*/ true);
+                    spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable));
                     attributesArray = [];
                     attributesTable = createMap<Symbol>();
                 }
@@ -11962,7 +11962,7 @@ namespace ts {
             if (symbolArray) {
                 const symbolTable = createMap<Symbol>();
                 forEach(symbolArray, (attr) => {
-                    symbolTable[attr.name] = attr;
+                    symbolTable.set(attr.name, attr);
                 });
                 argAttributesType = createJsxAttributesType(node.symbol, symbolTable);
             }
@@ -11986,7 +11986,7 @@ namespace ts {
             }
 
             const symbolArray = getJsxAttributesSymbolArrayFromAttributesProperty(openingLikeElement);
-            // sourceAttributesType is a type of an attributes properties.
+            // sourceAttributesType is a type of attributes properties.
             // i.e <div attr1={10} attr2="string" />
             //     attr1 and attr2 are treated as JSXAttributes attached in the JsxOpeningLikeElement as "attributes". They resolved to be sourceAttributesType.
             let sourceAttributesType = anyType as Type;
@@ -11996,7 +11996,7 @@ namespace ts {
                 const symbolTable = createMap<Symbol>();
                 forEach(symbolArray, (attr) => {
                     if (isUnhyphenatedJsxName(attr.name) || getPropertyOfType(targetAttributesType, attr.name)) {
-                        symbolTable[attr.name] = attr;
+                        symbolTable.set(attr.name, attr);
                         isSourceAttributesTypeEmpty = false;
                     }
                 });
@@ -12450,7 +12450,7 @@ namespace ts {
                 }
             }
 
-            checkJSXAttributesAssignableToTagnameAttributes(openingLikeElement);
+            checkJSXAttributesAssignableToTagnameAttributes(node);
         }
 
         function checkJsxExpression(node: JsxExpression) {
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -1011,13 +1011,13 @@ namespace Harness {
                     const libFileName = "tests/lib/" + fileName;
 
                     if (scriptTarget <= ts.ScriptTarget.ES5) {
-                        if (!testLibFileNameSourceFileMap[libFileName]) {
-                            testLibFileNameSourceFileMap[libFileName] = createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget);
+                        if (!testLibFileNameSourceFileMap.get(libFileName)) {
+                            testLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget));
                         }
                     }
                     else {
-                        if (!es6TestLibFileNameSourceFileMap[libFileName]) {
-                            es6TestLibFileNameSourceFileMap[libFileName] = createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget);
+                        if (!es6TestLibFileNameSourceFileMap.get(libFileName)) {
+                            es6TestLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget))
                         }
                     }
                 }
@@ -1035,7 +1035,7 @@ namespace Harness {
                     return fourslashSourceFile;
                 }
                 else if (ts.startsWith(fileName, "tests/lib/")) {
-                    return scriptTarget <= ts.ScriptTarget.ES5 ? testLibFileNameSourceFileMap[fileName] : es6TestLibFileNameSourceFileMap[fileName];
+                    return scriptTarget <= ts.ScriptTarget.ES5 ? testLibFileNameSourceFileMap.get(fileName) : es6TestLibFileNameSourceFileMap.get(fileName);
                 }
                 else {
                     // Don't throw here -- the compiler might be looking for a test that actually doesn't exist as part of the TC
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -2007,7 +2007,7 @@ namespace ts {
         if (node.name.kind === SyntaxKind.ComputedPropertyName) {
             const nameExpression = (<ComputedPropertyName>node.name).expression;
             // treat computed property names where expression is string/numeric literal as just string/numeric literal
-            if (isStringOrNumericLiteral(nameExpression.kind)) {
+            if (isStringOrNumericLiteral(nameExpression)) {
                 return (<LiteralExpression>nameExpression).text;
             }
             return undefined;

Original file line number	Diff line number	Diff line change
`@@ -11903,13 +11903,13 @@ namespace ts {`
`11903`	`11903`	`}`
`11904`	`11904`	`attributeSymbol.type = exprType;`
`11905`	`11905`	`attributeSymbol.target = member;`
`11906`		`- attributesTable[attributeSymbol.name] = attributeSymbol;`
	`11906`	`+ attributesTable.set(attributeSymbol.name, attributeSymbol);`
`11907`	`11907`	`attributesArray.push(attributeSymbol);`
`11908`	`11908`	`}`
`11909`	`11909`	`else {`
`11910`	`11910`	`Debug.assert(attributeDecl.kind === SyntaxKind.JsxSpreadAttribute);`
`11911`	`11911`	`if (attributesArray.length > 0) {`
`11912`		`- spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable), /isFromObjectLiteral/ true);`
	`11912`	`+ spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable));`
`11913`	`11913`	`attributesArray = [];`
`11914`	`11914`	`attributesTable = createMap<Symbol>();`
`11915`	`11915`	`}`
`@@ -11922,13 +11922,13 @@ namespace ts {`
`11922`	`11922`	`if (isTypeAny(widenExprType)) {`
`11923`	`11923`	`return undefined;`
`11924`	`11924`	`}`
`11925`		`- spread = getSpreadType(spread, exprType, /isFromObjectLiteral/ false);`
	`11925`	`+ spread = getSpreadType(spread, exprType);`
`11926`	`11926`	`}`
`11927`	`11927`	`}`
`11928`	`11928`
`11929`	`11929`	`if (spread !== emptyObjectType) {`
`11930`	`11930`	`if (attributesArray.length > 0) {`
`11931`		`- spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable), /isFromObjectLiteral/ true);`
	`11931`	`+ spread = getSpreadType(spread, createJsxAttributesType(attributes.symbol, attributesTable));`
`11932`	`11932`	`attributesArray = [];`
`11933`	`11933`	`attributesTable = createMap<Symbol>();`
`11934`	`11934`	`}`
`@@ -11962,7 +11962,7 @@ namespace ts {`
`11962`	`11962`	`if (symbolArray) {`
`11963`	`11963`	`const symbolTable = createMap<Symbol>();`
`11964`	`11964`	`forEach(symbolArray, (attr) => {`
`11965`		`- symbolTable[attr.name] = attr;`
	`11965`	`+ symbolTable.set(attr.name, attr);`
`11966`	`11966`	`});`
`11967`	`11967`	`argAttributesType = createJsxAttributesType(node.symbol, symbolTable);`
`11968`	`11968`	`}`
`@@ -11986,7 +11986,7 @@ namespace ts {`
`11986`	`11986`	`}`
`11987`	`11987`
`11988`	`11988`	`const symbolArray = getJsxAttributesSymbolArrayFromAttributesProperty(openingLikeElement);`
`11989`		`- // sourceAttributesType is a type of an attributes properties.`
	`11989`	`+ // sourceAttributesType is a type of attributes properties.`
`11990`	`11990`	`// i.e <div attr1={10} attr2="string" />`
`11991`	`11991`	`// attr1 and attr2 are treated as JSXAttributes attached in the JsxOpeningLikeElement as "attributes". They resolved to be sourceAttributesType.`
`11992`	`11992`	`let sourceAttributesType = anyType as Type;`
`@@ -11996,7 +11996,7 @@ namespace ts {`
`11996`	`11996`	`const symbolTable = createMap<Symbol>();`
`11997`	`11997`	`forEach(symbolArray, (attr) => {`
`11998`	`11998`	`if (isUnhyphenatedJsxName(attr.name) \|\| getPropertyOfType(targetAttributesType, attr.name)) {`
`11999`		`- symbolTable[attr.name] = attr;`
	`11999`	`+ symbolTable.set(attr.name, attr);`
`12000`	`12000`	`isSourceAttributesTypeEmpty = false;`
`12001`	`12001`	`}`
`12002`	`12002`	`});`
`@@ -12450,7 +12450,7 @@ namespace ts {`
`12450`	`12450`	`}`
`12451`	`12451`	`}`
`12452`	`12452`
`12453`		`- checkJSXAttributesAssignableToTagnameAttributes(openingLikeElement);`
	`12453`	`+ checkJSXAttributesAssignableToTagnameAttributes(node);`
`12454`	`12454`	`}`
`12455`	`12455`
`12456`	`12456`	`function checkJsxExpression(node: JsxExpression) {`
Original file line number	Diff line number	Diff line change
`@@ -1011,13 +1011,13 @@ namespace Harness {`
`1011`	`1011`	`const libFileName = "tests/lib/" + fileName;`
`1012`	`1012`
`1013`	`1013`	`if (scriptTarget <= ts.ScriptTarget.ES5) {`
`1014`		`- if (!testLibFileNameSourceFileMap[libFileName]) {`
`1015`		`- testLibFileNameSourceFileMap[libFileName] = createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget);`
	`1014`	`+ if (!testLibFileNameSourceFileMap.get(libFileName)) {`
	`1015`	`+ testLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget));`
`1016`	`1016`	`}`
`1017`	`1017`	`}`
`1018`	`1018`	`else {`
`1019`		`- if (!es6TestLibFileNameSourceFileMap[libFileName]) {`
`1020`		`- es6TestLibFileNameSourceFileMap[libFileName] = createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget);`
	`1019`	`+ if (!es6TestLibFileNameSourceFileMap.get(libFileName)) {`
	`1020`	`+ es6TestLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget))`
`1021`	`1021`	`}`
`1022`	`1022`	`}`
`1023`	`1023`	`}`
`@@ -1035,7 +1035,7 @@ namespace Harness {`
`1035`	`1035`	`return fourslashSourceFile;`
`1036`	`1036`	`}`
`1037`	`1037`	`else if (ts.startsWith(fileName, "tests/lib/")) {`
`1038`		`- return scriptTarget <= ts.ScriptTarget.ES5 ? testLibFileNameSourceFileMap[fileName] : es6TestLibFileNameSourceFileMap[fileName];`
	`1038`	`+ return scriptTarget <= ts.ScriptTarget.ES5 ? testLibFileNameSourceFileMap.get(fileName) : es6TestLibFileNameSourceFileMap.get(fileName);`
`1039`	`1039`	`}`
`1040`	`1040`	`else {`
`1041`	`1041`	`// Don't throw here -- the compiler might be looking for a test that actually doesn't exist as part of the TC`
Original file line number	Diff line number	Diff line change
`@@ -2007,7 +2007,7 @@ namespace ts {`
`2007`	`2007`	`if (node.name.kind === SyntaxKind.ComputedPropertyName) {`
`2008`	`2008`	`const nameExpression = (<ComputedPropertyName>node.name).expression;`
`2009`	`2009`	`// treat computed property names where expression is string/numeric literal as just string/numeric literal`
`2010`		`- if (isStringOrNumericLiteral(nameExpression.kind)) {`
	`2010`	`+ if (isStringOrNumericLiteral(nameExpression)) {`
`2011`	`2011`	`return (<LiteralExpression>nameExpression).text;`
`2012`	`2012`	`}`
`2013`	`2013`	`return undefined;`