Refactor

Author: rochala

presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala

@@ -24,10 +24,7 @@ import org.eclipse.lsp4j.SelectionRange
  * @param compiler Metals Global presentation compiler wrapper.
  * @param params offset params converted from the selectionRange params.
  */
-class SelectionRangeProvider(
-    driver: InteractiveDriver,
-    params: ju.List[OffsetParams]
-):
+class SelectionRangeProvider(driver: InteractiveDriver, params: ju.List[OffsetParams]):
 
   /**
    * Get the seletion ranges for the provider params
@@ -88,33 +85,25 @@ class SelectionRangeProvider(
       selectionRange.setRange(srcPos.toLsp)
       selectionRange
 
-    val treeSelectionRange = toSelectionRange(tree.sourcePos)
+    val treeSelectionRange = Seq(toSelectionRange(tree.sourcePos))
 
-    def getArgsSpan(args: List[Tree]): Option[SourcePosition] =
+    def allArgsSelectionRange(args: List[Tree]): Option[SelectionRange] =
       args match
-        case Seq(param) => Some(param.sourcePos)
-        case params @ Seq(head, tail*) =>
-          val srcPos = head.sourcePos
-          val lastSpan = tail.last.span
-          Some(SourcePosition(srcPos.source, srcPos.span union lastSpan, srcPos.outer))
-        case Seq() => None
+        case Nil => None
+        case list =>
+          val srcPos = list.head.sourcePos
+          val lastSpan = list.last.span
+          val allArgsSrcPos = SourcePosition(srcPos.source, srcPos.span union lastSpan, srcPos.outer)
+          if allArgsSrcPos.contains(pos) then Some(toSelectionRange(allArgsSrcPos))
+          else None
 
     tree match
-      case DefDef(_, paramss, _, _) =>
-        // If source position is within a parameter list, add a selection range covering that whole list.
-        val selectedParams = paramss
-          .flatMap(getArgsSpan) // parameter list to a sourcePosition covering the whole list
-          .find(_.contains(pos))
-          .map(toSelectionRange)
-        selectedParams ++ Seq(treeSelectionRange)
-
-      case Function(args, body) =>
-        val allArgs = getArgsSpan(args)
-          .find(_.contains(pos))
-          .map(toSelectionRange)
-
-        allArgs ++ Seq(treeSelectionRange)
-      case _ => Seq(treeSelectionRange)
+      case DefDef(_, paramss, _, _) => paramss.flatMap(allArgsSelectionRange) ++ treeSelectionRange
+      case Apply(_, args) => allArgsSelectionRange(args) ++ treeSelectionRange
+      case TypeApply(_, args) => allArgsSelectionRange(args) ++ treeSelectionRange
+      case UnApply(_, _, pattern) => allArgsSelectionRange(pattern) ++ treeSelectionRange
+      case Function(args, body) => allArgsSelectionRange(args) ++ treeSelectionRange
+      case _ => treeSelectionRange
 
   private def setParent(
       child: SelectionRange,

presentation-compiler/test/dotty/tools/pc/tests/SelectionRangeSuite.scala

@@ -172,7 +172,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
       """|object Main extends App {
          |  def x = 12 * (34 + 5@@6)
          |}""".stripMargin,
-      List[String](
+      List(
         """|object Main extends App {
            |  def x = 12 * (34 + >>region>>56<<region<<)
            |}""".stripMargin,
@@ -187,3 +187,68 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
            |}""".stripMargin
       )
     )
+
+  @Test def `function` =
+    check(
+      "val hello = (aaa: Int, bb@@b: Int, ccc: Int) => ???",
+      List(
+        "val hello = (aaa: Int, >>region>>bbb: Int<<region<<, ccc: Int) => ???",
+        "val hello = (>>region>>aaa: Int, bbb: Int, ccc: Int<<region<<) => ???",
+        "val hello = >>region>>(aaa: Int, bbb: Int, ccc: Int) => ???<<region<<",
+        ">>region>>val hello = (aaa: Int, bbb: Int, ccc: Int) => ???<<region<<",
+      )
+    )
+
+  @Test def `defdef` =
+    check(
+      "def hello(aaa: Int, bb@@b: Int, ccc: Int) = ???",
+      List(
+        "def hello(aaa: Int, >>region>>bbb: Int<<region<<, ccc: Int) = ???",
+        "def hello(>>region>>aaa: Int, bbb: Int, ccc: Int<<region<<) = ???",
+        ">>region>>def hello(aaa: Int, bbb: Int, ccc: Int) = ???<<region<<",
+      )
+    )
+
+  @Test def `apply` =
+    check(
+      "def hello = List(111, 2@@22, 333)",
+      List(
+        "def hello = List(111, >>region>>222<<region<<, 333)",
+        "def hello = List(>>region>>111, 222, 333<<region<<)",
+        "def hello = >>region>>List(111, 222, 333)<<region<<",
+        ">>region>>def hello = List(111, 222, 333)<<region<<",
+      )
+    )
+
+  @Test def `type-apply` =
+    check(
+      "def hello = Map[String, I@@nt]()",
+      List(
+        "def hello = Map[String, >>region>>Int<<region<<]()",
+        "def hello = Map[>>region>>String, Int<<region<<]()",
+        "def hello = >>region>>Map[String, Int]<<region<<()",
+        "def hello = >>region>>Map[String, Int]()<<region<<",
+        ">>region>>def hello = Map[String, Int]()<<region<<",
+      )
+    )
+
+  @Test def `unapply` =
+    check(
+      "val List(aaa, b@@bb, ccc) = List(111, 222, 333)",
+      List(
+        "val List(aaa, >>region>>bbb<<region<<, ccc) = List(111, 222, 333)",
+        "val List(>>region>>aaa, bbb, ccc<<region<<) = List(111, 222, 333)",
+        "val >>region>>List(aaa, bbb, ccc)<<region<< = List(111, 222, 333)",
+        ">>region>>val List(aaa, bbb, ccc) = List(111, 222, 333)<<region<<",
+      )
+    )
+
+  @Test def `single` =
+    check(
+      "def hello = List(2@@22)",
+      List(
+        "def hello = List(>>region>>222<<region<<)",
+        "def hello = >>region>>List(222)<<region<<",
+        ">>region>>def hello = List(222)<<region<<",
+      )
+    )