Skip to content

Fix type annotations range #31

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

Closed
wants to merge 2 commits into from
+67 −0
Closed

Fix type annotations range #31

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1821c6d
Fix type annotations range
michalsnik Aug 11, 2018
ca85b03
Add test case
michalsnik Aug 11, 2018
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
9 changes: 9 additions & 0 deletions src/ast/nodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface HasParent {
*/
export type Node =
| ESLintNode
| TypeAnnotation
| VNode
| VForExpression
| VOnExpression
Expand Down Expand Up @@ -348,6 +349,7 @@ export type ESLintExpression =
export interface ESLintIdentifier extends HasLocation, HasParent {
type: "Identifier"
name: string
typeAnnotation?: TypeAnnotation | null
}

export interface ESLintLiteral extends HasLocation, HasParent {
Expand Down Expand Up @@ -614,6 +616,13 @@ export interface ESLintLegacySpreadProperty extends HasLocation, HasParent {
argument: ESLintExpression
}

/**
* Top-level type annotation from `typescript-eslint-parser` and `babel-eslint`
*/
export interface TypeAnnotation extends HasLocation, HasParent {
type: "TSTypeAnnotation" | "TypeAnnotation"
Copy link
Member Author

Choose a reason for hiding this comment

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

I know there are many more possible types, but they are rather children of these top level types. And what we need here at this moment is just the top level type annotation on Identifier. Unless there will be introduced another eslint rule that will respect further cases of typeAnnotation or returnType. What do you think?

}

//------------------------------------------------------------------------------
// Template
//------------------------------------------------------------------------------
Expand Down
9 changes: 9 additions & 0 deletions src/script/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,15 @@ function postprocess(
traversed.add(node.range)
locationCalculator.fixLocation(node)
}

if (
node.type === "Identifier" &&
node.typeAnnotation &&
!traversed.has(node.typeAnnotation)
) {
traversed.add(node.typeAnnotation)
locationCalculator.fixLocation(node.typeAnnotation)
}
}
},

Expand Down