Fix compilation after rebase with common code action interface

scalameta · Nov 5, 2024 · 746a923 · 746a923
1 parent 449b189
commit 746a923
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 27 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/Compilers.scala b/metals/src/main/scala/scala/meta/internal/metals/Compilers.scala
@@ -918,20 +918,6 @@ class Compilers(
     }
   }.getOrElse(Future.successful(Nil.asJava))
 
-  def convertToNamedLambdaParameters(
-      position: TextDocumentPositionParams,
-      token: CancelToken,
-  ): Future[ju.List[TextEdit]] = {
-    withPCAndAdjustLsp(position) { (pc, pos, adjust) =>
-      pc.convertToNamedLambdaParameters(
-        CompilerOffsetParamsUtils.fromPos(pos, token)
-      ).asScala
-        .map { edits =>
-          adjust.adjustTextEdits(edits)
-        }
-    }
-  }.getOrElse(Future.successful(Nil.asJava))
-
   def implementAbstractMembers(
       params: TextDocumentPositionParams,
       token: CancelToken,

diff --git a/...rc/main/scala/scala/meta/internal/metals/codeactions/ConvertToNamedLambdaParameters.scala b/...rc/main/scala/scala/meta/internal/metals/codeactions/ConvertToNamedLambdaParameters.scala
@@ -13,6 +13,7 @@ import scala.meta.internal.metals.codeactions.CodeActionBuilder
 import scala.meta.internal.metals.logging
 import scala.meta.internal.parsing.Trees
 import scala.meta.pc.CancelToken
+import scala.meta.pc.CodeActionId
 
 import org.eclipse.{lsp4j => l}
 
@@ -43,9 +44,11 @@ class ConvertToNamedLambdaParameters(
   )(implicit ec: ExecutionContext): Future[Unit] = {
     val uri = data.position.getTextDocument().getUri()
     for {
-      edits <- compilers.convertToNamedLambdaParameters(
+      edits <- compilers.codeAction(
         data.position,
         token,
+        CodeActionId.ConvertToNamedLambdaParameters,
+        null,
       )
       _ = logging.logErrorWhen(
         edits.isEmpty(),
@@ -83,6 +86,11 @@ class ConvertToNamedLambdaParameters(
         )
         Future.successful(Seq(codeAction))
       }
+      .filter(_ =>
+        compilers
+          .supportedCodeActions(path)
+          .contains(CodeActionId.ConvertToNamedLambdaParameters)
+      )
       .getOrElse(Future.successful(Nil))
   }
 

diff --git a/mtags-interfaces/src/main/java/scala/meta/pc/CodeActionId.java b/mtags-interfaces/src/main/java/scala/meta/pc/CodeActionId.java
@@ -11,4 +11,5 @@ public class CodeActionId {
   public static final String ImportMissingSymbol = "ImportMissingSymbol";
   public static final String InlineValue = "InlineValue";
   public static final String InsertInferredType = "InsertInferredType";
+  public static final String ConvertToNamedLambdaParameters = "ConvertToNamedLambdaParameters";
 }
diff --git a/mtags-interfaces/src/main/java/scala/meta/pc/PresentationCompiler.java b/mtags-interfaces/src/main/java/scala/meta/pc/PresentationCompiler.java
@@ -186,15 +186,6 @@ public CompletableFuture<List<TextEdit>> inlineValue(OffsetParams params) {
 	public abstract CompletableFuture<List<TextEdit>> convertToNamedArguments(OffsetParams params,
 			List<Integer> argIndices);
 
-	/**
-	 * Return the text edits for converting a wildcard lambda to a named lambda.
-	 */
-	public CompletableFuture<List<TextEdit>> convertToNamedLambdaParameters(OffsetParams params) {
-		return CompletableFuture.supplyAsync(() -> {
-			throw new DisplayableException("Convert to named lambda parameters is not available in this version of Scala");
-		});
-	};
-
 	/**
 	 * The text contents of the given file changed.
 	 */

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/ScalaPresentationCompiler.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/ScalaPresentationCompiler.scala
@@ -68,6 +68,10 @@ case class ScalaPresentationCompiler(
   ): PresentationCompiler =
     copy(completionItemPriority = priority)
 
+  override def supportedCodeActions(): ju.List[String] = List(
+    CodeActionId.ConvertToNamedLambdaParameters
+  ).asJava
+
   val compilerAccess: CompilerAccess[StoreReporter, MetalsDriver] =
     Scala3CompilerAccess(
       config,
@@ -153,8 +157,22 @@ case class ScalaPresentationCompiler(
         folderPath,
         completionItemPriority,
       ).completions()
+    }
 
+  override def codeAction[T](
+    params: OffsetParams,
+    codeActionId: String,
+    codeActionPayload: ju.Optional[T]
+  ): ju.concurrent.CompletableFuture[ju.List[l.TextEdit]] = {
+    (codeActionId, codeActionPayload) match {
+      case (CodeActionId.ConvertToNamedLambdaParameters, _) =>
+        convertToNamedLambdaParameters(params)
+      case (id, _) =>
+        CompletableFuture.failedFuture(
+          new IllegalArgumentException(s"Unsupported action id $id")
+        )
     }
+  }
 
   def definition(params: OffsetParams): CompletableFuture[DefinitionResult] =
     compilerAccess.withNonInterruptableCompiler(Some(params))(
@@ -364,7 +382,7 @@ case class ScalaPresentationCompiler(
       }
   end convertToNamedArguments
 
-  override def convertToNamedLambdaParameters(
+  def convertToNamedLambdaParameters(
     params: OffsetParams
   ): ju.concurrent.CompletableFuture[ju.List[l.TextEdit]] =
     val empty: Either[String, List[l.TextEdit]] = Right(List())

diff --git a/tests/cross/src/test/scala/tests/pc/ConvertToNamedLambdaParametersSuite.scala b/tests/cross/src/test/scala/tests/pc/ConvertToNamedLambdaParametersSuite.scala
@@ -5,6 +5,7 @@ import java.net.URI
 import scala.meta.internal.jdk.CollectionConverters._
 import scala.meta.internal.metals.CompilerOffsetParams
 import scala.meta.internal.metals.TextEdits
+import scala.meta.pc.CodeActionId
 
 import munit.Location
 import munit.TestOptions
@@ -166,8 +167,10 @@ class ConvertToNamedLambdaParametersSuite extends BaseCodeActionSuite {
   ): List[l.TextEdit] = {
     val (code, _, offset) = params(original)
     val result = presentationCompiler
-      .convertToNamedLambdaParameters(
-        CompilerOffsetParams(URI.create(filename), code, offset, cancelToken)
+      .codeAction(
+        CompilerOffsetParams(URI.create(filename), code, offset, cancelToken),
+        CodeActionId.ConvertToNamedLambdaParameters,
+        null
       )
       .get()
     result.asScala.toList