chore: Adjust tests to include disabled

scalameta · Aug 19, 2024 · ead4e2e · ead4e2e
1 parent 38f87ee
commit ead4e2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/OrganizeImports.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/OrganizeImports.scala
@@ -43,7 +43,7 @@ sealed abstract class OrganizeImports(
               title = this.title,
               kind = this.kind,
               disabledReason =
-                Some("Can not organize imports if file has error"),
+                Some("Cannot organize imports if the file has an error"),
             )
           )
         )

diff --git a/tests/unit/src/main/scala/tests/TestingServer.scala b/tests/unit/src/main/scala/tests/TestingServer.scala
@@ -1410,8 +1410,13 @@ final case class TestingServer(
         .asScala
         .map(_.asScala.filter(filterAction))
     } yield (
-      codeActions.toList,
-      codeActions.map(_.getTitle()).mkString("\n"),
+      codeActions.toList.filter(_.getDisabled() == null),
+      codeActions
+        .map(a =>
+          a.getTitle() +
+            Option(a.getDisabled()).fold("")(_ => " (disabled)")
+        )
+        .mkString("\n"),
     )
 
   def assertSemanticHighlight(

diff --git a/tests/unit/src/test/scala/tests/codeactions/OrganizeImportsLspSuite.scala b/tests/unit/src/test/scala/tests/codeactions/OrganizeImportsLspSuite.scala
@@ -286,7 +286,7 @@ class OrganizeImportsLspSuite
        |  val a: Int = "no one wants unused imports"
        |}
        |""".stripMargin,
-    "", // This should give back no code action
+    s"${SourceOrganizeImports.title} (disabled)",
     """|package a
        |
        |import java.time.Instant