Clean up

Author: AndreasArvidsson

packages/cursorless-engine/src/languages/LegacyLanguageId.ts

@@ -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];

packages/cursorless-engine/src/languages/getNodeMatcher.ts

@@ -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,
@@ -47,7 +46,6 @@ export const languageMatchers: Record<
   latex,
   ruby,
   rust,
-  scala,
 };
 
 function matcherIncludeSiblings(matcher: NodeMatcher): NodeMatcher {

packages/cursorless-engine/src/languages/scala.ts

@@ -108,6 +108,69 @@
   (#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