Skip to content

add dart class support #2677

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 6 commits into from
Nov 12, 2024
+66 −2
Merged

add dart class support #2677

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48c4fdb
add class support
sonnyvesali Nov 9, 2024
8a965ff
refactor class queries and fixtures
sonnyvesali Nov 10, 2024
591fb87
format dart query file
sonnyvesali Nov 10, 2024
7e25ceb
remove brackets in dart class def
sonnyvesali Nov 11, 2024
11b8466
remove: outer paren in class def
sonnyvesali Nov 11, 2024
7fe3a1e
Update dart.scm
pokey Nov 12, 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
15 changes: 15 additions & 0 deletions data/fixtures/scopes/dart/class.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
class MyClass {

}
---

[Content] =
[Removal] =
[Domain] = 0:0-2:1
>---------------
0| class MyClass {
1|
2| }
-<

[Insertion delimiter] = "\n\n"
29 changes: 29 additions & 0 deletions data/fixtures/scopes/dart/className.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
class MyClass {

}
---

[Content] = 0:6-0:13
>-------<
0| class MyClass {

[Removal] = 0:6-0:14
>--------<
0| class MyClass {

[Leading delimiter] = 0:5-0:6
>-<
0| class MyClass {

[Trailing delimiter] = 0:13-0:14
>-<
0| class MyClass {

[Domain] = 0:0-2:1
>---------------
0| class MyClass {
1|
2| }
-<

[Insertion delimiter] = " "
15 changes: 14 additions & 1 deletion data/playground/dart.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
foo() {
if (true) {}
final hi = '';
if (hi.isNotEmpty) {

//
}


else if (true) {
//
}

final list = [1, 2, 3];

final map = {
'hi': 1,
};
}

class Something{

}
2 changes: 2 additions & 0 deletions packages/common/src/scopeSupportFacets/dart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ export const dartScopeSupport: LanguageScopeSupportFacetMap = {
ifStatement: supported,
list: supported,
map: supported,
class: supported,
className: supported,
};
11 changes: 10 additions & 1 deletion queries/dart.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

;;!! if () {}
;;! ^^^^^^^^
(if_statement) @ifStatement
Expand All @@ -16,3 +15,13 @@
(set_or_map_literal)
(map_pattern)
] @map

;;!! class Foo {}
;;! ^^^^^^^^^^^^
(
[
(class_definition
name: (_) @className
)
] @class @className.domain
)
Copy link
Member

@pokey pokey Nov 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

nitpicking here, but I believe you can remove both the square brackets and outer parens:

Suggested change
(
[
(class_definition
name: (_) @className
)
] @class @className.domain
)
(class_definition
name: (_) @className
) @class @className.domain

Loading