Skip to content

Updated type arguments implementation #2925

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
AndreasArvidsson merged 1 commit into from
May 25, 2025
Merged

Updated type arguments implementation #2925

Show file tree
Hide file tree
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
21 changes: 14 additions & 7 deletions data/fixtures/scopes/java/type.field.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,32 @@ class MyClass {


[#3 Content] =
[#3 Removal] =
[#3 Domain] = 1:8-1:11
>---<
1| Map<int, int> foo;

[#3 Insertion delimiter] = " "
[#3 Removal] = 1:8-1:13
>-----<
1| Map<int, int> foo;

[#3 Trailing delimiter] = 1:11-1:13
>--<
1| Map<int, int> foo;

[#3 Insertion delimiter] = ", "


[#4 Content] =
[#4 Domain] = 1:13-1:16
>---<
1| Map<int, int> foo;

[#4 Removal] = 1:12-1:16
>----<
[#4 Removal] = 1:11-1:16
>-----<
1| Map<int, int> foo;

[#4 Leading delimiter] = 1:12-1:13
>-<
[#4 Leading delimiter] = 1:11-1:13
>--<
1| Map<int, int> foo;

[#4 Insertion delimiter] = " "
[#4 Insertion delimiter] = ", "
21 changes: 5 additions & 16 deletions data/fixtures/scopes/java/type.typeArgument.iteration.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
class MyClass {
Map<int, int> foo;
}
Map<int, int> foo;
---

[#1 Range] =
[#1 Domain] = 0:15-2:0
>
0| class MyClass {
1| Map<int, int> foo;
2| }
<


[#2 Range] =
[#2 Domain] = 1:8-1:16
>--------<
1| Map<int, int> foo;
[Range] =
[Domain] = 0:4-0:12
>--------<
0| Map<int, int> foo;
83 changes: 36 additions & 47 deletions data/fixtures/scopes/java/type.typeArgument.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,52 @@
class MyClass {
Map<int, int> foo;
}
Map<int, int> foo;
---

[#1 Content] =
[#1 Removal] =
[#1 Domain] = 0:0-2:1
>---------------
0| class MyClass {
1| Map<int, int> foo;
2| }
-<
[#1 Content] = 0:0-0:13
>-------------<
0| Map<int, int> foo;

[#1 Insertion delimiter] = " "


[#2 Content] = 1:4-1:17
>-------------<
1| Map<int, int> foo;
[#1 Removal] = 0:0-0:14
>--------------<
0| Map<int, int> foo;

[#2 Removal] = 1:4-1:18
>--------------<
1| Map<int, int> foo;
[#1 Trailing delimiter] = 0:13-0:14
>-<
0| Map<int, int> foo;

[#2 Leading delimiter] = 1:0-1:4
>----<
1| Map<int, int> foo;
[#1 Domain] = 0:0-0:18
>------------------<
0| Map<int, int> foo;

[#2 Trailing delimiter] = 1:17-1:18
>-<
1| Map<int, int> foo;
[#1 Insertion delimiter] = " "

[#2 Domain] = 1:4-1:22
>------------------<
1| Map<int, int> foo;

[#2 Insertion delimiter] = " "
[#2 Content] =
[#2 Domain] = 0:4-0:7
>---<
0| Map<int, int> foo;

[#2 Removal] = 0:4-0:9
>-----<
0| Map<int, int> foo;

[#3 Content] =
[#3 Removal] =
[#3 Domain] = 1:8-1:11
>---<
1| Map<int, int> foo;
[#2 Trailing delimiter] = 0:7-0:9
>--<
0| Map<int, int> foo;

[#3 Insertion delimiter] = " "
[#2 Insertion delimiter] = ", "


[#4 Content] =
[#4 Domain] = 1:13-1:16
>---<
1| Map<int, int> foo;
[#3 Content] =
[#3 Domain] = 0:9-0:12
>---<
0| Map<int, int> foo;

[#4 Removal] = 1:12-1:16
>----<
1| Map<int, int> foo;
[#3 Removal] = 0:7-0:12
>-----<
0| Map<int, int> foo;

[#4 Leading delimiter] = 1:12-1:13
>-<
1| Map<int, int> foo;
[#3 Leading delimiter] = 0:7-0:9
>--<
0| Map<int, int> foo;

[#4 Insertion delimiter] = " "
[#3 Insertion delimiter] = ", "
21 changes: 14 additions & 7 deletions data/fixtures/scopes/typescript.core/type.typeArgument.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,32 @@ let value: Map<string, number>;


[#2 Content] =
[#2 Removal] =
[#2 Domain] = 0:15-0:21
>------<
0| let value: Map<string, number>;

[#2 Insertion delimiter] = " "
[#2 Removal] = 0:15-0:23
>--------<
0| let value: Map<string, number>;

[#2 Trailing delimiter] = 0:21-0:23
>--<
0| let value: Map<string, number>;

[#2 Insertion delimiter] = ", "


[#3 Content] =
[#3 Domain] = 0:23-0:29
>------<
0| let value: Map<string, number>;

[#3 Removal] = 0:22-0:29
>-------<
[#3 Removal] = 0:21-0:29
>--------<
0| let value: Map<string, number>;

[#3 Leading delimiter] = 0:22-0:23
>-<
[#3 Leading delimiter] = 0:21-0:23
>--<
0| let value: Map<string, number>;

[#3 Insertion delimiter] = " "
[#3 Insertion delimiter] = ", "
10 changes: 10 additions & 0 deletions data/fixtures/scopes/typescript.core/type.typeArgument2.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
useState<string>()
---

[Content] =
[Removal] =
[Domain] = 0:9-0:15
>------<
0| useState<string>()

[Insertion delimiter] = ", "
25 changes: 12 additions & 13 deletions queries/java.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,6 @@
.
) @type.iteration.domain @name.iteration.domain

;;!! Map<String, String>
;;! ^^^^^^^ ^^^^^^
(type_arguments
(type_identifier) @type
)

;;!! List<String> list = value;
;;! ^^^^^^^^^^^^
;;! --------------------------
Expand Down Expand Up @@ -480,21 +474,26 @@
(#not-type? @value block)
) @_.domain

;;!! public Map<int, int> foo;
;;! ^^^^^^^^^^^^^
;;! -------------------------
;;!! Map<int, int> foo;
;;! ^^^^^^^^^^^^^
;;! ------------------
(field_declaration
type: (_) @type
) @_.domain

;;!! public Map<int, int> foo;
;;! ^^^ ^^^
;;!! Map<int, int> foo;
;;! ^^^ ^^^
(type_arguments
(_)? @_.leading.endOf
.
(_) @type
.
(_)? @_.trailing.startOf
(#insertion-delimiter! @type ", ")
)

;;!! public Map<int, int> foo;
;;! ^^^^^^^^
;;!! Map<int, int> foo;
;;! ^^^^^^^^
(type_arguments
.
"<" @type.iteration.start.endOf
Expand Down
51 changes: 24 additions & 27 deletions queries/typescript.core.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,33 @@
type_arguments: (_)? @type.end
)

;;!! Map<string, number>
;;! ^^^^^^ ^^^^^^
;;!! useState<string>()
;;! ^^^^^^
;;!! useState<Record<string, string>>()
;;! ^^^^^^^^^^^^^^^^^^^^^^
;;! ^^^^^^ ^^^^^^
(type_arguments
(_) @type
(
(type_arguments
(_)? @_.leading.endOf
.
(_) @type
.
(_)? @_.trailing.startOf
) @_dummy
(#not-parent-type? @_dummy type_assertion)
(#insertion-delimiter! @type ", ")
)

;;!! Map<string, number>
;;! ^^^^^^^^^^^^^^
(
(type_arguments
.
"<" @type.iteration.start.endOf
">" @type.iteration.end.startOf
.
) @_dummy
(#not-parent-type? @_dummy type_assertion)
) @_dummy
)

;;!! function foo<A>() {}
;;! ^
Expand Down Expand Up @@ -414,24 +432,3 @@
"}" @type.iteration.end.startOf
.
)

;;!! Map<string, number>
;;! ^^^^^^ ^^^^^^
(
(type_arguments
(_) @type
) @_dummy
(#not-parent-type? @_dummy type_assertion)
)

;;!! Map<string, number>
;;! ^^^^^^^^^^^^^^
(
(type_arguments
.
"<" @type.iteration.start.endOf
">" @type.iteration.end.startOf
.
) @_dummy
(#not-parent-type? @_dummy type_assertion)
)
Loading