bugfix: Fix extract function not showing up

I must have missed the add Template Body
scalameta · Nov 8, 2024 · b6a45d5 · b6a45d5
1 parent ec0b8ed
commit b6a45d5
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 2 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/ExtractMethodCodeAction.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/ExtractMethodCodeAction.scala
@@ -79,7 +79,7 @@ class ExtractMethodCodeAction(
         enclosing.map(_ match {
           case Term.Block(stats) =>
             stats.filter((s: Tree) => range.encloses(s.pos.toLsp))
-          case Template(_, _, _, stats) =>
+          case Template.Body(_, stats) =>
             stats.filter((s: Tree) => range.encloses(s.pos.toLsp))
           case ap if returnsValue(ap) => List(ap)
           case _ => Nil

diff --git a/mtags/src/main/scala/scala/meta/internal/metals/TextEdits.scala b/mtags/src/main/scala/scala/meta/internal/metals/TextEdits.scala
@@ -21,7 +21,11 @@ object TextEdits {
         .collect { case (edit, Some(pos)) =>
           edit -> pos
         }
-        .sortBy(_._2.start)
+        .sortWith { case ((_, pos1), (_, pos2)) =>
+          if (pos1.start == pos2.start) pos1.end < pos2.end
+          else pos1.start < pos2.start
+
+        }
       var curr = 0
       val out = new java.lang.StringBuilder()
       positions.foreach { case (edit, pos) =>

diff --git a/tests/cross/src/test/scala/tests/pc/ExtractMethodSuite.scala b/tests/cross/src/test/scala/tests/pc/ExtractMethodSuite.scala
@@ -57,6 +57,49 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
                          |}""".stripMargin)
   )
 
+  checkEdit(
+    "val-trait",
+    """|
+       |trait Simple{
+       |  def well(str: String) = ""
+       |}
+       |
+       |object A{
+       |  @@
+       |  <<val s: Simple = ???
+       |  s.well("")>>
+       |}""".stripMargin,
+    """|trait Simple{
+       |  def well(str: String) = ""
+       |}
+       |
+       |object A{
+       |  
+       |  def newMethod(): String = {
+       |    val s: Simple = ???
+       |    s.well("")
+       |  }
+       |  newMethod()
+       |}
+       |""".stripMargin,
+    Map(
+      "3" ->
+        """|trait Simple{
+           |  def well(str: String) = ""
+           |}
+           |
+           |object A{
+           |  
+           |  def newMethod(): String =
+           |    val s: Simple = ???
+           |    s.well("")
+           |
+           |  newMethod()
+           |}
+           |""".stripMargin
+    )
+  )
+
   checkEdit(
     "single-param",
     s"""|object A{

diff --git a/tests/unit/src/test/scala/tests/codeactions/ExtractMethodLspSuite.scala b/tests/unit/src/test/scala/tests/codeactions/ExtractMethodLspSuite.scala
@@ -54,6 +54,35 @@ class ExtractMethodLspSuite
     selectedActionIndex = 1,
   )
 
+  check(
+    "val-trait",
+    """|
+       |trait Simple{
+       |  def well(str: String) = ""
+       |}
+       |
+       |object A{
+       | 
+       |  <<val s: Simple = ???
+       |  s.well("")>>
+       |}""".stripMargin,
+    s"""|${ExtractMethodCodeAction.title("object `A`")}
+        |""".stripMargin,
+    """|trait Simple{
+       |  def well(str: String) = ""
+       |}
+       |
+       |object A{
+       | 
+       |  def newMethod(): String = {
+       |    val s: Simple = ???
+       |    s.well("")
+       |  }
+       |  newMethod()
+       |}
+       |""".stripMargin,
+  )
+
   check(
     "single-param",
     s"""|object A{