Inline getDestructuringParameterName (microsoft#16973)

Andy · web-flow · commit e6256d43c445 · 2017-07-07T10:34:50.000-07:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -1172,7 +1172,7 @@ namespace ts {
         }
 
         function pushActiveLabel(name: __String, breakTarget: FlowLabel, continueTarget: FlowLabel): ActiveLabel {
-            const activeLabel = {
+            const activeLabel: ActiveLabel = {
                 name,
                 breakTarget,
                 continueTarget,
@@ -1897,10 +1897,6 @@ namespace ts {
             file.bindDiagnostics.push(createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
         }
 
-        function getDestructuringParameterName(node: Declaration): __String {
-            return "__" + indexOf((<SignatureDeclaration>node.parent).parameters, node) as __String;
-        }
-
         function bind(node: Node): void {
             if (!node) {
                 return;
@@ -2514,7 +2510,7 @@ namespace ts {
             }
 
             if (isBindingPattern(node.name)) {
-                bindAnonymousDeclaration(node, SymbolFlags.FunctionScopedVariable, getDestructuringParameterName(node));
+                bindAnonymousDeclaration(node, SymbolFlags.FunctionScopedVariable, "__" + indexOf(node.parent.parameters, node) as __String);
             }
             else {
                 declareSymbolAndAddToSymbolTable(node, SymbolFlags.FunctionScopedVariable, SymbolFlags.ParameterExcludes);

Original file line number	Diff line number	Diff line change
`@@ -1172,7 +1172,7 @@ namespace ts {`
`1172`	`1172`	`}`
`1173`	`1173`
`1174`	`1174`	`function pushActiveLabel(name: __String, breakTarget: FlowLabel, continueTarget: FlowLabel): ActiveLabel {`
`1175`		`- const activeLabel = {`
	`1175`	`+ const activeLabel: ActiveLabel = {`
`1176`	`1176`	`name,`
`1177`	`1177`	`breakTarget,`
`1178`	`1178`	`continueTarget,`
`@@ -1897,10 +1897,6 @@ namespace ts {`
`1897`	`1897`	`file.bindDiagnostics.push(createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));`
`1898`	`1898`	`}`
`1899`	`1899`
`1900`		`- function getDestructuringParameterName(node: Declaration): __String {`
`1901`		`- return "__" + indexOf((<SignatureDeclaration>node.parent).parameters, node) as __String;`
`1902`		`- }`
`1903`		`-`
`1904`	`1900`	`function bind(node: Node): void {`
`1905`	`1901`	`if (!node) {`
`1906`	`1902`	`return;`
`@@ -2514,7 +2510,7 @@ namespace ts {`
`2514`	`2510`	`}`
`2515`	`2511`
`2516`	`2512`	`if (isBindingPattern(node.name)) {`
`2517`		`- bindAnonymousDeclaration(node, SymbolFlags.FunctionScopedVariable, getDestructuringParameterName(node));`
	`2513`	`+ bindAnonymousDeclaration(node, SymbolFlags.FunctionScopedVariable, "__" + indexOf(node.parent.parameters, node) as __String);`
`2518`	`2514`	`}`
`2519`	`2515`	`else {`
`2520`	`2516`	`declareSymbolAndAddToSymbolTable(node, SymbolFlags.FunctionScopedVariable, SymbolFlags.ParameterExcludes);`