Skip to content

Migrated scala scope implementations #2948

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 4 commits into from
Jun 1, 2025
Merged

Migrated scala scope implementations #2948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83a72af
Migrated value
AndreasArvidsson Jun 1, 2025
254f630
Migrate type
AndreasArvidsson Jun 1, 2025
03f17b8
Migrate branch
AndreasArvidsson Jun 1, 2025
ec953e9
Clean up
AndreasArvidsson Jun 1, 2025
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
8 changes: 1 addition & 7 deletions packages/cursorless-engine/src/languages/LegacyLanguageId.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
* The language IDs that we have full tree-sitter support for using our legacy
* modifiers.
*/
export const legacyLanguageIds = [
"clojure",
"latex",
"ruby",
"rust",
"scala",
] as const;
export const legacyLanguageIds = ["clojure", "latex", "ruby", "rust"] as const;

export type LegacyLanguageId = (typeof legacyLanguageIds)[number];
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 @@ -13,7 +13,6 @@ import type { LegacyLanguageId } from "./LegacyLanguageId";
import latex from "./latex";
import { patternMatchers as ruby } from "./ruby";
import rust from "./rust";
import scala from "./scala";

export function getNodeMatcher(
languageId: string,
Expand Down Expand Up @@ -47,7 +46,6 @@ export const languageMatchers: Record<
latex,
ruby,
rust,
scala,
};

function matcherIncludeSiblings(matcher: NodeMatcher): NodeMatcher {
Expand Down
86 changes: 0 additions & 86 deletions packages/cursorless-engine/src/languages/scala.ts
View file
Open in desktop

This file was deleted.

117 changes: 117 additions & 0 deletions queries/scala.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,123 @@
)
) @_.domain

;;!! type Vector = (Int, Int)
;;! ^^^^^^^^^^
(type_definition
name: (_) @_.leading.endOf
type: (_) @value
) @_.domain

;;!! class Example(foo: String = "foo") {}
;;! ^^^^^
(_
(_) @_.leading.endOf
.
default_value: (_) @value
) @_.domain

;;!! val bar = "bar"
;;! ^^^^^
(_
(_) @_.leading.endOf
.
value: (_) @value
) @_.domain

;;!! type Vector = (Int, Int)
;;! ^^^^^^^^^^^^^^^^^^^^^^^^
(type_definition) @type

;;!! def str(bar: String)
;;! ^^^^^^
;;!! val foo: String = "foo"
;;! ^^^^^^
(
(_
(_) @_.leading.endOf
.
type: (_) @type
) @_.domain
(#not-type? @_.domain type_definition)
)

;;!! def str(): String = "bar"
;;! ^^^^^^
(function_definition
(parameters) @_.leading.endOf
return_type: (_) @type
) @_.domain

;;!! case 0 => "zero"
;;! ^^^^^^^^^^^^^^^^
(
(case_clause) @branch
(#trim-end! @branch)
)

;;!! class Foo(aaa: Int, bbb: Int) {}
;;! ^^^^^^^^ ^^^^^^^^
(
(class_parameters
(_)? @_.leading.endOf
.
(_) @argumentOrParameter
.
(_)? @_.trailing.startOf
) @_dummy
(#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
)

;;!! def foo(aaa: Int, bbb: Int) = x
;;! ^^^^^^^^ ^^^^^^^^
(
(parameters
(_)? @_.leading.endOf
.
(_) @argumentOrParameter
.
(_)? @_.trailing.startOf
) @_dummy
(#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
)

;;!! foo(aaa, bbb)
;;! ^^^ ^^^
(
(arguments
(_)? @_.leading.endOf
.
(_) @argumentOrParameter
.
(_)? @_.trailing.startOf
) @_dummy
(#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
)

(_
(class_parameters
"(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
) @_dummy
(#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
) @argumentList.domain @argumentOrParameter.iteration.domain

(_
(parameters
"(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
) @_dummy
(#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
) @argumentList.domain @argumentOrParameter.iteration.domain

(_
(arguments
"(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
) @_dummy
(#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
) @argumentList.domain @argumentOrParameter.iteration.domain

operator: (operator_identifier) @disqualifyDelimiter
(enumerator
"<-" @disqualifyDelimiter
Expand Down
Loading