Skip to content

Drop unnecessary type arguments in the isolated declarations quick fix #59665

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
jakebailey merged 13 commits into from
Sep 16, 2024
Merged

Drop unnecessary type arguments in the isolated declarations quick fix #59665

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dd29423
Create a few (failing) test cases of https://github.com/microsoft/Typ…
blickly Jul 25, 2024
6f8e37d
Add functionality to convert a ReferenceType into a "minimal" TypeNode
blickly Aug 8, 2024
b0bc68f
Add a few more test cases of the "negative" cases
blickly Aug 8, 2024
de61d6d
First fixes based on code review feedback
blickly Aug 19, 2024
b0b1e02
Update src/compiler/types.ts
blickly Aug 19, 2024
943761b
Fix unused import
blickly Aug 19, 2024
d53552f
Run dprint to fix formatting
blickly Aug 19, 2024
77ac42f
Use factory methods to create new AST node instead of mutating
blickly Aug 19, 2024
71c092a
Avoid updating nodes when unnecessary
blickly Aug 20, 2024
14deb8e
Add example case with a inferred generator return
blickly Aug 20, 2024
a603aa2
Update tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports52-…
blickly Aug 29, 2024
4e21657
Update src/services/codefixes/helpers.ts
blickly Aug 29, 2024
cd0cd4e
Fix typo in filename
blickly Aug 29, 2024
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
Prev Previous commit
Next Next commit
First fixes based on code review feedback
  • Loading branch information
@blickly
blickly committed Aug 19, 2024
commit de61d6dadc71effd20bec0e99df8b598e198e339
3 changes: 1 addition & 2 deletions src/compiler/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5032,8 +5032,6 @@ export interface TypeCheckerHost extends ModuleSpecifierResolutionHost {

export interface TypeChecker {

Comment thread
blickly marked this conversation as resolved.
Outdated
/** @internal */
fillMissingTypeArguments(typeArguments: readonly Type[], typeParameters: readonly TypeParameter[] | undefined, minTypeArgumentCount: number, isJavaScriptImplicitAny: boolean): Type[];
getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
getTypeOfSymbol(symbol: Symbol): Type;
getDeclaredTypeOfSymbol(symbol: Symbol): Type;
Expand Down Expand Up @@ -5397,6 +5395,7 @@ export interface TypeChecker {
/** @internal */ isTypeParameterPossiblyReferenced(tp: TypeParameter, node: Node): boolean;
/** @internal */ typeHasCallOrConstructSignatures(type: Type): boolean;
/** @internal */ getSymbolFlags(symbol: Symbol): SymbolFlags;
/** @internal */ fillMissingTypeArguments(typeArguments: readonly Type[], typeParameters: readonly TypeParameter[] | undefined, minTypeArgumentCount: number, isJavaScriptImplicitAny: boolean): Type[];
}

/** @internal */
Expand Down
13 changes: 6 additions & 7 deletions src/services/codefixes/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,10 +619,9 @@ export function typeNodeToAutoImportableTypeNode(typeNode: TypeNode, importAdder
return getSynthesizedDeepClone(typeNode);
}

function endOfRequiredTypeParameters(checker: TypeChecker, type: GenericType, fullTypeArguments: readonly Type[]) : number {
if (fullTypeArguments !== type.typeArguments!) {
throw new Error('fullTypeArguments should be set')
}
function endOfRequiredTypeParameters(checker: TypeChecker, type: GenericType): number {
Debug.assert(type.typeArguments);
const fullTypeArguments = type.typeArguments;
const target = type.target;
next_cutoff: for (let cutoff = 0; cutoff < fullTypeArguments.length; cutoff++) {
const typeArguments = fullTypeArguments.slice(0, cutoff);
Expand All @@ -635,7 +634,7 @@ function endOfRequiredTypeParameters(checker: TypeChecker, type: GenericType, fu
}
// If we make it all the way here, all the type arguments are required.
return fullTypeArguments.length;
}
}

export function typeToMinimizedReferenceType(checker: TypeChecker, type: Type, contextNode: Node | undefined, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker): TypeNode | undefined {
const typeNode = checker.typeToTypeNode(type, contextNode, flags, internalFlags, tracker);
Expand All @@ -645,9 +644,9 @@ export function typeToMinimizedReferenceType(checker: TypeChecker, type: Type, c
if (isTypeReferenceNode(typeNode)) {
const genericType = type as GenericType;
if (genericType.typeArguments) {
const cutoff = endOfRequiredTypeParameters(checker, genericType, genericType.typeArguments);
const cutoff = endOfRequiredTypeParameters(checker, genericType);
if (cutoff !== undefined && typeNode.typeArguments) {
Copy link
Copy Markdown
Member

@jakebailey jakebailey Aug 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cutoff can't be undefined; should this instead be a check that skips this block if the length is different than the existing node?

Copy link
Copy Markdown
Contributor Author

@blickly blickly Aug 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Done.

// Looks like the wrong way to do this. What APIs should I use here?
// Cast to any to mutate the newly created TypeNode
(typeNode as any).typeArguments = typeNode.typeArguments.slice(0, cutoff);
Comment thread
jakebailey marked this conversation as resolved.
Outdated
}
}
Expand Down