Skip to content

Fix unused code lints #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2024
Merged

Fix unused code lints #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/compiler/expressionToTypeNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
serializeReturnTypeForSignature,
serializeTypeOfExpression,
};
function serializeExistingTypeAnnotation(type: TypeNode | undefined, context: SyntacticTypeNodeBuilderContext) {
function serializeExistingTypeAnnotation(type: TypeNode | undefined) {
return type === undefined ? undefined : !type.parent || !isParameter(type.parent) || !resolver.requiresAddingImplicitUndefined(type.parent) || canAddUndefined(type);
}
function serializeTypeOfExpression(expr: Expression, context: SyntacticTypeNodeBuilderContext, addUndefined?: boolean, preserveLiterals?: boolean) {
Expand All @@ -85,7 +85,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
function serializeTypeOfDeclaration(node: HasInferredType, context: SyntacticTypeNodeBuilderContext) {
switch (node.kind) {
case SyntaxKind.PropertySignature:
return serializeExistingTypeAnnotation(getEffectiveTypeAnnotationNode(node), context);
return serializeExistingTypeAnnotation(getEffectiveTypeAnnotationNode(node));
case SyntaxKind.Parameter:
return typeFromParameter(node, context);
case SyntaxKind.VariableDeclaration:
Expand All @@ -99,7 +99,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
case SyntaxKind.PropertyAccessExpression:
case SyntaxKind.ElementAccessExpression:
case SyntaxKind.BinaryExpression:
return serializeExistingTypeAnnotation(getEffectiveTypeAnnotationNode(node), context) || inferTypeOfDeclaration(node, context);
return serializeExistingTypeAnnotation(getEffectiveTypeAnnotationNode(node)) || inferTypeOfDeclaration(node, context);
case SyntaxKind.PropertyAssignment:
return typeFromExpression(node.initializer, context) || inferTypeOfDeclaration(node, context);
default:
Expand Down Expand Up @@ -153,7 +153,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
const accessorDeclarations = resolver.getAllAccessorDeclarations(node);
const accessorType = getTypeAnnotationFromAllAccessorDeclarations(node, accessorDeclarations);
if (accessorType) {
return serializeExistingTypeAnnotation(accessorType, context);
return serializeExistingTypeAnnotation(accessorType);
}
if (accessorDeclarations.getAccessor) {
return createReturnFromSignature(accessorDeclarations.getAccessor, context);
Expand All @@ -163,7 +163,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
function typeFromVariable(node: VariableDeclaration, context: SyntacticTypeNodeBuilderContext) {
const declaredType = getEffectiveTypeAnnotationNode(node);
if (declaredType) {
return serializeExistingTypeAnnotation(declaredType, context);
return serializeExistingTypeAnnotation(declaredType);
}
let resultType;
if (node.initializer) {
Expand All @@ -183,7 +183,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
let resultType;
if (!addUndefined) {
if (declaredType) {
return serializeExistingTypeAnnotation(declaredType, context);
return serializeExistingTypeAnnotation(declaredType);
}
if (node.initializer && isIdentifier(node.name)) {
resultType = typeFromExpression(node.initializer, context);
Expand All @@ -194,7 +194,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
function typeFromProperty(node: PropertyDeclaration, context: SyntacticTypeNodeBuilderContext) {
const declaredType = getEffectiveTypeAnnotationNode(node);
if (declaredType) {
return serializeExistingTypeAnnotation(declaredType, context);
return serializeExistingTypeAnnotation(declaredType);
}
let resultType;
if (node.initializer) {
Expand Down Expand Up @@ -239,7 +239,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
if (requiresAddingUndefined && !canAddUndefined(type)) {
context.tracker.reportInferenceFallback(type);
}
return serializeExistingTypeAnnotation(type, context);
return serializeExistingTypeAnnotation(type);
}
function typeFromExpression(node: Expression, context: SyntacticTypeNodeBuilderContext, isConstContext = false, requiresAddingUndefined = false, preserveLiterals = false): boolean | undefined {
switch (node.kind) {
Expand Down Expand Up @@ -298,8 +298,8 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
return undefined;
}
function typeFromFunctionLikeExpression(fnNode: FunctionExpression | ArrowFunction, context: SyntacticTypeNodeBuilderContext) {
const returnType = serializeExistingTypeAnnotation(fnNode.type, context) ?? createReturnFromSignature(fnNode, context);
const typeParameters = reuseTypeParameters(fnNode.typeParameters, context);
const returnType = serializeExistingTypeAnnotation(fnNode.type) ?? createReturnFromSignature(fnNode, context);
const typeParameters = reuseTypeParameters(fnNode.typeParameters);
const parameters = fnNode.parameters.every(p => ensureParameter(p, context));
return returnType && typeParameters && parameters;
}
Expand Down Expand Up @@ -402,17 +402,17 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
function ensureParameter(p: ParameterDeclaration, context: SyntacticTypeNodeBuilderContext) {
return typeFromParameter(p, context);
}
function reuseTypeParameters(typeParameters: NodeArray<TypeParameterDeclaration> | undefined, context: SyntacticTypeNodeBuilderContext) {
function reuseTypeParameters(typeParameters: NodeArray<TypeParameterDeclaration> | undefined) {
// TODO: We will probably need to add a fake scopes for the signature (to hold the type parameters and the parameter)
// For now this is good enough since the new serialization is used for Nodes in the same context.
return typeParameters?.every(tp =>
serializeExistingTypeAnnotation(tp.constraint, context) &&
serializeExistingTypeAnnotation(tp.default, context)
serializeExistingTypeAnnotation(tp.constraint) &&
serializeExistingTypeAnnotation(tp.default)
) ?? true;
}
function typeFromObjectLiteralMethod(method: MethodDeclaration, name: PropertyName, context: SyntacticTypeNodeBuilderContext): boolean {
const returnType = createReturnFromSignature(method, context);
const typeParameters = reuseTypeParameters(method.typeParameters, context);
const typeParameters = reuseTypeParameters(method.typeParameters);
const parameters = method.parameters.every(p => ensureParameter(p, context));
return returnType && typeParameters && parameters;
}
Expand All @@ -425,15 +425,15 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
const parameters = accessor.parameters.every(p => ensureParameter(p, context));

if (isGetAccessor(accessor)) {
return parameters && serializeExistingTypeAnnotation(getAccessorType, context);
return parameters && serializeExistingTypeAnnotation(getAccessorType);
}
else {
return parameters;
}
}
else if (allAccessors.firstAccessor === accessor) {
const foundType = getAccessorType ?? setAccessorType;
const propertyType = foundType ? serializeExistingTypeAnnotation(foundType, context) : inferAccessorType(accessor, allAccessors, context);
const propertyType = foundType ? serializeExistingTypeAnnotation(foundType) : inferAccessorType(accessor, allAccessors, context);

return propertyType;
}
Expand Down Expand Up @@ -471,7 +471,7 @@ export function createSyntacticTypeNodeBuilder(options: CompilerOptions, resolve
let returnType;
const returnTypeNode = getEffectiveReturnTypeNode(fn);
if (returnTypeNode) {
returnType = serializeExistingTypeAnnotation(returnTypeNode, context);
returnType = serializeExistingTypeAnnotation(returnTypeNode);
}
if (!returnType && isValueSignatureDeclaration(fn)) {
returnType = typeFromSingleReturnExpression(fn, context);
Expand Down