scala

Author: AndreasArvidsson

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

@@ -3,7 +3,6 @@ import type { NodeMatcherAlternative } from "../typings/Types";
 import { patternFinder } from "../util/nodeFinders";
 import {
   argumentMatcher,
-  conditionMatcher,
   createPatternMatchers,
   leadingMatcher,
   matcher,
@@ -53,7 +52,6 @@ const nodeMatchers: Partial<
     ["*[value]", "*[default_value]", "type_definition[type]"],
     ["="],
   ),
-  condition: conditionMatcher("*[condition]"),
 
   // Scala features unsupported in Cursorless terminology
   //  - Pattern matching

queries/scala.scm

@@ -7,7 +7,10 @@
   (interpolated_string_expression)
 ] @string @textFragment
 
-(comment) @comment @textFragment
+[
+  (comment)
+  (block_comment)
+] @comment @textFragment
 
 ;; treating classes = classlike
 [
@@ -42,6 +45,15 @@
   pattern: (_) @name
 ) @_.domain
 
+(_
+  condition: (_
+    .
+    "(" @condition.start.endOf
+    ")" @condition.end.startOf
+    .
+  )
+) @_.domain
+
 operator: (operator_identifier) @disqualifyDelimiter
 (enumerator
   "<-" @disqualifyDelimiter