maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

In getContextuallyTypedParameterType, skip a this parameter when counting parameter index (#19155)

Browse source
This commit is contained in:
Andy 2017-10-13 14:53:52 -07:00 committed by GitHub
parent 22769d95e1
commit 769d202d4c
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/compiler/checker.ts
View file

@ -13182,7 +13182,7 @@ namespace ts {
}
// Return contextual type of parameter or undefined if no contextual type is available
function getContextuallyTypedParameterType(parameter: ParameterDeclaration): Type {
function getContextuallyTypedParameterType(parameter: ParameterDeclaration): Type | undefined {
const func = parameter.parent;
if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
const iife = getImmediatelyInvokedFunctionExpression(func);
@ -13208,7 +13208,12 @@ namespace ts {
if (contextualSignature) {
const funcHasRestParameters = hasRestParameter(func);
const len = func.parameters.length - (funcHasRestParameters ? 1 : 0);
const indexOfParameter = indexOf(func.parameters, parameter);
let indexOfParameter = indexOf(func.parameters, parameter);
if (getThisParameter(func) !== undefined && !contextualSignature.thisParameter) {
Debug.assert(indexOfParameter !== 0); // Otherwise we should not have called `getContextuallyTypedParameterType`.
indexOfParameter -= 1;
}
if (indexOfParameter < len) {
return getTypeAtPosition(contextualSignature, indexOfParameter);
}

6
tests/cases/fourslash/quickInfoParameter_skipThisParameter.ts Normal file
View file

@ -0,0 +1,6 @@
/// <reference path='fourslash.ts'/>
////function f(cb: (x: number) => void) {}
////f(function(this: any, /**/x) {});
verify.quickInfoAt("", "(parameter) x: number");