Merge pull request microsoft#18392 from Microsoft/fix-contextually-typing-arguments-object

sandersn · web-flow · commit 2fbc2259a120 · 2017-09-11T16:22:17.000-07:00
Fix contextually typing arguments object
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -16703,8 +16703,9 @@ namespace ts {
                 }
             }
             if (signature.hasRestParameter && isRestParameterIndex(context, signature.parameters.length - 1)) {
+                // parameter might be a transient symbol generated by use of `arguments` in the function body.
                 const parameter = lastOrUndefined(signature.parameters);
-                if (!getEffectiveTypeAnnotationNode(<ParameterDeclaration>parameter.valueDeclaration)) {
+                if (isTransientSymbol(parameter) || !getEffectiveTypeAnnotationNode(<ParameterDeclaration>parameter.valueDeclaration)) {
                     const contextualParameterType = getTypeOfSymbol(lastOrUndefined(context.parameters));
                     assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType);
                 }
diff --git a/tests/baselines/reference/contextuallyTypeArgumentsKeyword.symbols b/tests/baselines/reference/contextuallyTypeArgumentsKeyword.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/foo.js ===
+// Repro for #16585
+const x = {
+>x : Symbol(x, Decl(foo.js, 1, 5))
+
+    bar() {
+>bar : Symbol(bar, Decl(foo.js, 1, 11))
+
+        setTimeout(function() { arguments }, 0);
+>setTimeout : Symbol(setTimeout, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>arguments : Symbol(arguments)
+    }
+}
+
diff --git a/tests/baselines/reference/contextuallyTypeArgumentsKeyword.types b/tests/baselines/reference/contextuallyTypeArgumentsKeyword.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/foo.js ===
+// Repro for #16585
+const x = {
+>x : { [x: string]: any; bar(): void; }
+>{    bar() {        setTimeout(function() { arguments }, 0);    }} : { [x: string]: any; bar(): void; }
+
+    bar() {
+>bar : () => void
+
+        setTimeout(function() { arguments }, 0);
+>setTimeout(function() { arguments }, 0) : number
+>setTimeout : { (handler: (...args: any[]) => void, timeout: number): number; (handler: any, timeout?: any, ...args: any[]): number; }
+>function() { arguments } : (...args: any[]) => void
+>arguments : IArguments
+>0 : 0
+    }
+}
+
diff --git a/tests/cases/compiler/contextuallyTypeArgumentsKeyword.ts b/tests/cases/compiler/contextuallyTypeArgumentsKeyword.ts
@@ -0,0 +1,11 @@
+// @noEmit: true
+// @allowJs: true
+// @checkJs: true
+// @lib: es2017, dom
+// @Filename: foo.js
+// Repro for #16585
+const x = {
+    bar() {
+        setTimeout(function() { arguments }, 0);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -16703,8 +16703,9 @@ namespace ts {`
`16703`	`16703`	`}`
`16704`	`16704`	`}`
`16705`	`16705`	`if (signature.hasRestParameter && isRestParameterIndex(context, signature.parameters.length - 1)) {`
	`16706`	+ // parameter might be a transient symbol generated by use of `arguments` in the function body.
`16706`	`16707`	`const parameter = lastOrUndefined(signature.parameters);`
`16707`		`- if (!getEffectiveTypeAnnotationNode(<ParameterDeclaration>parameter.valueDeclaration)) {`
	`16708`	`+ if (isTransientSymbol(parameter) \|\| !getEffectiveTypeAnnotationNode(<ParameterDeclaration>parameter.valueDeclaration)) {`
`16708`	`16709`	`const contextualParameterType = getTypeOfSymbol(lastOrUndefined(context.parameters));`
`16709`	`16710`	`assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType);`
`16710`	`16711`	`}`