Use resolveCodeAction instead of codeAction; unignore test case for nightly

Author: KacperFKorban

metals/src/main/scala/scala/meta/internal/metals/ServerCommands.scala

@@ -661,20 +661,6 @@ object ServerCommands {
          |""".stripMargin,
     )
 
-  final case class ConvertToNamedLambdaParametersRequest(
-      position: TextDocumentPositionParams
-  )
-  val ConvertToNamedLambdaParameters =
-    new ParametrizedCommand[ConvertToNamedLambdaParametersRequest](
-      "convert-to-named-lambda-parameters",
-      "Convert wildcard lambda parameters to named parameters",
-      """|Whenever a user chooses code action to convert to named lambda parameters, this command is later run to 
-         |rewrite the lambda to use named parameters.
-         |""".stripMargin,
-      """|Object with [TextDocumentPositionParams](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentPositionParams) of the target lambda
-         |""".stripMargin,
-    )
-
   val GotoLog = new Command(
     "goto-log",
     "Check logs",

metals/src/main/scala/scala/meta/internal/metals/codeactions/CodeActionProvider.scala

@@ -49,7 +49,7 @@ final class CodeActionProvider(
     new ConvertCommentCodeAction(buffers),
     new RemoveInvalidImportQuickFix(trees, buildTargets),
     new SourceRemoveInvalidImports(trees, buildTargets, diagnostics),
-    new ConvertToNamedLambdaParameters(trees, compilers, languageClient),
+    new ConvertToNamedLambdaParameters(trees, compilers),
   )
 
   def actionsForParams(params: l.CodeActionParams): List[CodeAction] = {

metals/src/main/scala/scala/meta/internal/metals/codeactions/ConvertToNamedLambdaParameters.scala

@@ -5,9 +5,9 @@ import scala.concurrent.Future
 
 import scala.meta.Term
 import scala.meta.internal.metals.Compilers
+import scala.meta.internal.metals.JsonParser
+import scala.meta.internal.metals.JsonParser.XtensionSerializableToJson
 import scala.meta.internal.metals.MetalsEnrichments._
-import scala.meta.internal.metals.ServerCommands
-import scala.meta.internal.metals.clients.language.MetalsLanguageClient
 import scala.meta.internal.metals.codeactions.CodeAction
 import scala.meta.internal.metals.codeactions.CodeActionBuilder
 import scala.meta.internal.metals.logging
@@ -26,39 +26,42 @@ import org.eclipse.{lsp4j => l}
 class ConvertToNamedLambdaParameters(
     trees: Trees,
     compilers: Compilers,
-    languageClient: MetalsLanguageClient,
 ) extends CodeAction {
 
   override val kind: String = l.CodeActionKind.RefactorRewrite
 
-  override type CommandData =
-    ServerCommands.ConvertToNamedLambdaParametersRequest
+  private val parser = new JsonParser.Of[ConvertToNamedLambdaParametersParams]
 
-  override def command: Option[ActionCommand] = Some(
-    ServerCommands.ConvertToNamedLambdaParameters
+  private case class ConvertToNamedLambdaParametersParams(
+      position: l.TextDocumentPositionParams
   )
 
-  override def handleCommand(
-      data: ServerCommands.ConvertToNamedLambdaParametersRequest,
+  override def resolveCodeAction(
+      codeAction: l.CodeAction,
       token: CancelToken,
-  )(implicit ec: ExecutionContext): Future[Unit] = {
-    val uri = data.position.getTextDocument().getUri()
-    for {
-      edits <- compilers.codeAction(
-        data.position,
-        token,
-        CodeActionId.ConvertToNamedLambdaParameters,
-        None,
-      )
-      _ = logging.logErrorWhen(
-        edits.isEmpty(),
-        s"Could not convert lambda at position ${data.position} to named lambda",
-      )
-      workspaceEdit = new l.WorkspaceEdit(Map(uri -> edits).asJava)
-      _ <- languageClient
-        .applyEdit(new l.ApplyWorkspaceEditParams(workspaceEdit))
-        .asScala
-    } yield ()
+  )(implicit ec: ExecutionContext): Option[Future[l.CodeAction]] = {
+    val data = codeAction.getData()
+    data match {
+      case parser.Jsonized(data) =>
+        Some {
+          val uri = data.position.getTextDocument().getUri()
+          for {
+            edits <- compilers.codeAction(
+              data.position,
+              token,
+              CodeActionId.ConvertToNamedLambdaParameters,
+              None,
+            )
+            _ = logging.logErrorWhen(
+              edits.isEmpty(),
+              s"Could not convert lambda at position ${data.position} to named lambda",
+            )
+            workspaceEdit = new l.WorkspaceEdit(Map(uri -> edits).asJava)
+            _ = codeAction.setEdit(workspaceEdit)
+          } yield codeAction
+        }
+      case _ => None
+    }
   }
 
   override def contribute(
@@ -75,14 +78,14 @@ class ConvertToNamedLambdaParameters(
           params.getTextDocument(),
           new l.Position(lambda.pos.startLine, lambda.pos.startColumn),
         )
-        val command =
-          ServerCommands.ConvertToNamedLambdaParameters.toLsp(
-            ServerCommands.ConvertToNamedLambdaParametersRequest(position)
+        val data =
+          ConvertToNamedLambdaParametersParams(
+            position = position
           )
         val codeAction = CodeActionBuilder.build(
           title = ConvertToNamedLambdaParameters.title,
           kind = kind,
-          command = Some(command),
+          data = Some(data.toJsonObject),
         )
         Future.successful(Seq(codeAction))
       }

tests/slow/src/test/scala/tests/feature/Scala3CodeActionLspSuite.scala

@@ -773,15 +773,15 @@ class Scala3CodeActionLspSuite
   )
 
   check(
-    "wildcard lambda".ignore,
+    "wildcard lambda",
     """|package a
        |
        |object A {
        |  val l = List(1, 2, 3)
        |  l.map(_ + <<1>>)
        |}
        |""".stripMargin,
-    s"""|${ConvertToNamedArguments.title("l.map(...)")}
+    s"""|${ConvertToNamedArguments.title("map(...)")}
         |${ConvertToNamedLambdaParameters.title}
         |""".stripMargin,
     """|package a
@@ -792,6 +792,7 @@ class Scala3CodeActionLspSuite
        |}
        |""".stripMargin,
     selectedActionIndex = 1,
+    scalaVersion = "3.7.1-RC1-bin-20250501-83ffe00-NIGHTLY",
   )
 
   private def getPath(name: String) = s"a/src/main/scala/a/$name"