microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-06 20:14:01 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

All method signatures now have this:this

Browse Source 
Except I've done it wrong, so it doesn't work yet.
This commit is contained in:
Nathan Shively-Sanders 2021-11-02 15:52:30 -07:00
parent 7cbcfeea99
commit 22fa978438
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/compiler/checker.ts
View File

@ -10375,12 +10375,6 @@ namespace ts {
return false;
}
/** A type parameter is thisless if its constraint is thisless, or if it has no constraint. */
function isThislessTypeParameter(node: TypeParameterDeclaration) {
const constraint = getEffectiveConstraintOfTypeParameter(node);
return !constraint || isThislessType(constraint);
}
/**
* A variable-like declaration is free of this references if it has a type annotation
* that is thisless, or if it has no type annotation and no initializer (and is thus of type any).
@ -10390,19 +10384,6 @@ namespace ts {
return typeNode ? isThislessType(typeNode) : !hasInitializer(node);
}
/**
* A function-like declaration is considered free of `this` references if it has a return type
* annotation that is free of this references and if each parameter is thisless and if
* each type parameter (if present) is thisless.
*/
function isThislessFunctionLikeDeclaration(node: FunctionLikeDeclaration): boolean {
const returnType = getEffectiveReturnTypeNode(node);
const typeParameters = getEffectiveTypeParameterDeclarations(node);
return (node.kind === SyntaxKind.Constructor || (!!returnType && isThislessType(returnType))) &&
node.parameters.every(isThislessVariableLikeDeclaration) &&
typeParameters.every(isThislessTypeParameter);
}
/**
* Returns true if the class or interface member given by the symbol is free of "this" references. The
* function may return false for symbols that are actually free of "this" references because it is not
@ -10420,10 +10401,10 @@ namespace ts {
return isThislessVariableLikeDeclaration(declaration as VariableLikeDeclaration);
case SyntaxKind.MethodDeclaration:
case SyntaxKind.MethodSignature:
case SyntaxKind.Constructor:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
return isThislessFunctionLikeDeclaration(declaration as FunctionLikeDeclaration | AccessorDeclaration);
case SyntaxKind.Constructor:
return false;
}
}
}
@ -12724,6 +12705,16 @@ namespace ts {
if (signature.thisParameter) {
return getTypeOfSymbol(signature.thisParameter);
}
if (signature.declaration && isClassLike(signature.declaration.parent)) {
const symbol = getSymbolOfNode(signature.declaration.parent);
if (isStatic(signature.declaration)) {
return getTypeOfSymbol(symbol)
}
else {
// TODO: should provide this=the 'this' argument of the call (if it's a call)
return (getDeclaredTypeOfSymbol(symbol) as InterfaceType).thisType;
}
}
}
function getTypePredicateOfSignature(signature: Signature): TypePredicate | undefined {