Merge pull request #437 from scala/backport-lts-3.3-23257

Backport "add selection ranges for more names" to 3.3 LTS

Author: tgodzik

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

@@ -85,6 +85,9 @@ class SelectionRangeProvider(driver: InteractiveDriver, params: ju.List[OffsetPa
       selectionRange.setRange(srcPos.toLsp)
       selectionRange
 
+    def maybeToSelectionRange(srcPos: SourcePosition): Option[SelectionRange] =
+      if srcPos.contains(pos) then Some(toSelectionRange(srcPos)) else None
+
     val treeSelectionRange = Seq(toSelectionRange(tree.sourcePos))
 
     def allArgsSelectionRange(args: List[Tree]): Option[SelectionRange] =
@@ -94,16 +97,25 @@ class SelectionRangeProvider(driver: InteractiveDriver, params: ju.List[OffsetPa
           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, _, _) => 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
+          maybeToSelectionRange(allArgsSrcPos)
+
+    val allSelectionRanges: Iterable[SelectionRange] = tree match
+      case vdef @ ValDef(_, _, _) =>
+        maybeToSelectionRange(vdef.namePos)
+      case tdef @ TypeDef(_, _) =>
+        maybeToSelectionRange(tdef.namePos)
+      case mdef @ ModuleDef(_, _) =>
+        maybeToSelectionRange(mdef.namePos)
+      case DefDef(_, paramss, _, _) =>
+        paramss.flatMap(allArgsSelectionRange)
+      case Apply(_, args) =>
+        allArgsSelectionRange(args)
+      case TypeApply(_, args) =>
+        allArgsSelectionRange(args)
+      case Function(args, _) =>
+        allArgsSelectionRange(args)
+      case _ => Seq.empty
+    allSelectionRanges ++ treeSelectionRange
 
   private def setParent(
       child: SelectionRange,

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

@@ -115,6 +115,10 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
          |    a + b
          |}""".stripMargin,
       List[String](
+        """|object Main extends App {
+           |  def func(>>region>>a<<region<<: Int, b: Int) =
+           |    a + b
+           |}""".stripMargin,
         """|object Main extends App {
            |  def func(>>region>>a: Int<<region<<, b: Int) =
            |    a + b
@@ -137,6 +141,10 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
          |    a + b
          |}""".stripMargin,
       List[String](
+        """|object Main extends App {
+           |  val func = (>>region>>a<<region<<: Int, b: Int) =>
+           |    a + b
+           |}""".stripMargin,
         """|object Main extends App {
            |  val func = (>>region>>a: Int<<region<<, b: Int) =>
            |    a + b
@@ -160,6 +168,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
     check(
       "object Main extends App { def foo[Type@@ <: T1, B](hi: Int, b: Int, c:Int) = ??? }",
       List(
+        "object Main extends App { def foo[>>region>>Type<<region<< <: T1, B](hi: Int, b: Int, c:Int) = ??? }",
         "object Main extends App { def foo[>>region>>Type <: T1<<region<<, B](hi: Int, b: Int, c:Int) = ??? }",
         "object Main extends App { def foo[>>region>>Type <: T1, B<<region<<](hi: Int, b: Int, c:Int) = ??? }",
         "object Main extends App { >>region>>def foo[Type <: T1, B](hi: Int, b: Int, c:Int) = ???<<region<< }"
@@ -192,6 +201,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
     check(
       "val hello = (aaa: Int, bb@@b: Int, ccc: Int) => ???",
       List(
+        "val hello = (aaa: Int, >>region>>bbb<<region<<: Int, ccc: Int) => ???",
         "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<<",
@@ -203,6 +213,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
     check(
       "def hello(aaa: Int, bb@@b: Int, ccc: Int) = ???",
       List(
+        "def hello(aaa: Int, >>region>>bbb<<region<<: Int, ccc: Int) = ???",
         "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<<",
@@ -252,3 +263,21 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite:
         ">>region>>def hello = List(222)<<region<<",
       )
     )
+
+  @Test def `constructor-argument` =
+    check(
+      "class Foo(val ar@@g: Int)",
+      List(
+        """class Foo(val >>region>>arg<<region<<: Int)""",
+        """class Foo(>>region>>val arg: Int<<region<<)""",
+      )
+    )
+
+  @Test def `object-backticked` =
+    check(
+      "object `Foo B@@ar Baz` extends SomeTrait",
+      List(
+        """object `>>region>>Foo Bar Baz<<region<<` extends SomeTrait""",
+        """>>region>>object `Foo Bar Baz` extends SomeTrait<<region<<""",
+      )
+    )