Skip to content

go scope migration #2340

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
Jun 14, 2024
Merged

go scope migration #2340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8f8f34
go scope migration
AndreasArvidsson May 17, 2024
14e932e
clean up
AndreasArvidsson May 17, 2024
2cfc687
Multiline support
AndreasArvidsson May 19, 2024
48a390e
tweak
pokey Jun 14, 2024
5da71c5
Merge branch 'main' into go_migration
AndreasArvidsson Jun 14, 2024
dc96589
revert change
pokey Jun 14, 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
1 change: 0 additions & 1 deletion packages/cursorless-engine/src/languages/LegacyLanguageId.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export const legacyLanguageIds = [
"clojure",
"csharp",
"css",
"go",
"latex",
"markdown",
"php",
Expand Down
2 changes: 0 additions & 2 deletions packages/cursorless-engine/src/languages/getNodeMatcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { selectionWithEditorFromRange } from "../util/selectionUtils";
import clojure from "./clojure";
import { LegacyLanguageId } from "./LegacyLanguageId";
import csharp from "./csharp";
import go from "./go";
import latex from "./latex";
import markdown from "./markdown";
import php from "./php";
Expand Down Expand Up @@ -52,7 +51,6 @@ export const languageMatchers: Record<
clojure,
csharp,
css: scss,
go,
latex,
markdown,
php,
Expand Down
37 changes: 0 additions & 37 deletions packages/cursorless-engine/src/languages/go.ts
View file
Open in desktop

This file was deleted.

91 changes: 91 additions & 0 deletions queries/go.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,3 +277,94 @@
(if_statement) @branch.iteration
(#not-parent-type? @branch.iteration if_statement)
)

(if_statement) @ifStatement

[
(call_expression)
(composite_literal)
] @functionCall

(call_expression
function: (_) @functionCallee
) @_.domain
(composite_literal
type: (_) @functionCallee
) @_.domain

(keyed_element
.
(_) @collectionKey
.
(_) @value
) @_.domain

(return_statement
(expression_list) @value
) @_.domain

(literal_value) @collectionKey.iteration @value.iteration

[
(pointer_type)
(qualified_type)
(type_identifier)
] @type

(function_declaration
result: (_) @type
) @_.domain
(method_declaration
result: (_) @type
) @_.domain

;;!! if true {}
(
(_
condition: (_) @condition
) @_.domain
(#not-type? @condition parenthesized_expression)
)

;;!! if (true) {}
(
(_
condition: (parenthesized_expression) @condition
) @_.domain
(#child-range! @condition 0 -1 true true)
)

;;!! func add(x int, y int) int {}
(
(parameter_list
(_)? @_.leading.endOf
.
(_) @argumentOrParameter
.
(_)? @_.trailing.startOf
) @_dummy
(#not-type? @argumentOrParameter "comment")
(#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
)

;;!! add(1, 2)
(
(argument_list
(_)? @_.leading.endOf
.
(_) @argumentOrParameter
.
(_)? @_.trailing.startOf
) @_dummy
(#not-type? @argumentOrParameter "comment")
(#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
)

(parameter_list
"(" @argumentOrParameter.iteration.start.endOf
")" @argumentOrParameter.iteration.end.startOf
) @argumentOrParameter.iteration.domain
(argument_list
"(" @argumentOrParameter.iteration.start.endOf
")" @argumentOrParameter.iteration.end.startOf
) @argumentOrParameter.iteration.domain