Change the codeAction method signature

scalameta · Sep 17, 2024 · eb2cdb8 · eb2cdb8
1 parent f242b25
commit eb2cdb8
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 56 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
@@ -31,7 +31,6 @@ import scala.meta.internal.{semanticdb => s}
 import scala.meta.io.AbsolutePath
 import scala.meta.pc.AutoImportsResult
 import scala.meta.pc.CancelToken
-import scala.meta.pc.CodeActionId
 import scala.meta.pc.CompletionItemPriority
 import scala.meta.pc.HoverSignature
 import scala.meta.pc.OffsetParams
@@ -884,7 +883,7 @@ class Compilers(
   def codeAction(
       params: TextDocumentPositionParams,
       token: CancelToken,
-      codeActionId: CodeActionId,
+      codeActionId: String,
       codeActionPayload: Object,
   ): Future[ju.List[TextEdit]] = {
     withPCAndAdjustLsp(params) { (pc, pos, adjust) =>
@@ -903,7 +902,7 @@ class Compilers(
     }
   }.getOrElse(Future.successful(Nil.asJava))
 
-  def supportedCodeActions(path: AbsolutePath): ju.List[CodeActionId] = {
+  def supportedCodeActions(path: AbsolutePath): ju.List[String] = {
     loadCompiler(path).map { pc =>
       pc.supportedCodeActions()
     }

diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/CodeAction.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/CodeAction.scala
@@ -7,7 +7,6 @@ import scala.concurrent.Future
 import scala.meta.internal.metals.MetalsEnrichments._
 import scala.meta.internal.metals.ParametrizedCommand
 import scala.meta.pc.CancelToken
-import scala.meta.pc.CodeActionId
 
 import org.eclipse.{lsp4j => l}
 
@@ -23,7 +22,7 @@ trait CodeAction {
    * The CodeActionId for this code action, if applicable. CodeActionId is only
    * used for code actions that require the use of the presentation compiler.
    */
-  def maybeCodeActionId: Option[CodeActionId] = None
+  def maybeCodeActionId: Option[String] = None
 
   type CommandData
   type ActionCommand = ParametrizedCommand[CommandData]

diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/CodeActionProvider.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/CodeActionProvider.scala
@@ -33,27 +33,15 @@ final class CodeActionProvider(
     new ActionableDiagnostic(),
     new StringActions(buffers),
     extractMemberAction,
-    new SourceOrganizeImports(
-      scalafixProvider,
-      buildTargets,
-      diagnostics,
-    ),
-    new OrganizeImportsQuickFix(
-      scalafixProvider,
-      buildTargets,
-      diagnostics,
-    ),
+    new SourceOrganizeImports(scalafixProvider, buildTargets, diagnostics),
+    new OrganizeImportsQuickFix(scalafixProvider, buildTargets, diagnostics),
     new InsertInferredType(trees, compilers, languageClient),
     new PatternMatchRefactor(trees),
     new RewriteBracesParensCodeAction(trees),
     new ExtractValueCodeAction(trees, buffers),
     new CreateCompanionObjectCodeAction(trees, buffers),
     new ExtractMethodCodeAction(trees, compilers, languageClient),
-    new InlineValueCodeAction(
-      trees,
-      compilers,
-      languageClient,
-    ),
+    new InlineValueCodeAction(trees, compilers, languageClient),
     new ConvertToNamedArguments(trees, compilers, languageClient),
     new FlatMapToForComprehensionCodeAction(trees, buffers),
     new MillifyDependencyCodeAction(buffers),

diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/ConvertToNamedArguments.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/ConvertToNamedArguments.scala
@@ -16,7 +16,6 @@ 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}
 
@@ -29,8 +28,8 @@ class ConvertToNamedArguments(
   import ConvertToNamedArguments._
   override val kind: String = l.CodeActionKind.RefactorRewrite
 
-  override val maybeCodeActionId: Option[CodeActionId] = Some(
-    CodeActionId.ConvertToNamedArguments
+  override val maybeCodeActionId: Option[String] = Some(
+    "ConvertToNamedArguments"
   )
 
   override type CommandData = ServerCommands.ConvertToNamedArgsRequest

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
@@ -15,7 +15,6 @@ import scala.meta.internal.metals.clients.language.MetalsLanguageClient
 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.CodeActionParams
 import org.eclipse.{lsp4j => l}
@@ -33,8 +32,8 @@ class ExtractMethodCodeAction(
   )
   override def kind: String = l.CodeActionKind.RefactorExtract
 
-  override val maybeCodeActionId: Option[CodeActionId] = Some(
-    CodeActionId.ExtractMethod
+  override val maybeCodeActionId: Option[String] = Some(
+    "ExtractMethod"
   )
 
   override def handleCommand(

diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/ImplementAbstractMembers.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/ImplementAbstractMembers.scala
@@ -8,16 +8,15 @@ import scala.meta.internal.metals.MetalsEnrichments._
 import scala.meta.internal.metals.ScalacDiagnostic
 import scala.meta.internal.metals.codeactions.CodeAction
 import scala.meta.pc.CancelToken
-import scala.meta.pc.CodeActionId
 
 import org.eclipse.{lsp4j => l}
 
 class ImplementAbstractMembers(compilers: Compilers) extends CodeAction {
 
   override def kind: String = l.CodeActionKind.QuickFix
 
-  override val maybeCodeActionId: Option[CodeActionId] = Some(
-    CodeActionId.ImplementAbstractMembers
+  override val maybeCodeActionId: Option[String] = Some(
+    "ImplementAbstractMembers"
   )
 
   override def contribute(

diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/ImportMissingSymbol.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/ImportMissingSymbol.scala
@@ -10,7 +10,6 @@ import scala.meta.internal.metals.ScalaVersions
 import scala.meta.internal.metals.ScalacDiagnostic
 import scala.meta.internal.metals.codeactions.CodeAction
 import scala.meta.pc.CancelToken
-import scala.meta.pc.CodeActionId
 
 import org.eclipse.{lsp4j => l}
 
@@ -19,8 +18,8 @@ class ImportMissingSymbol(compilers: Compilers, buildTargets: BuildTargets)
 
   override def kind: String = l.CodeActionKind.QuickFix
 
-  override val maybeCodeActionId: Option[CodeActionId] = Some(
-    CodeActionId.ImportMissingSymbol
+  override val maybeCodeActionId: Option[String] = Some(
+    "ImportMissingSymbol"
   )
 
   override def contribute(

diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/InlineValueCodeAction.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/InlineValueCodeAction.scala
@@ -16,7 +16,6 @@ import scala.meta.internal.metals.codeactions.CodeAction
 import scala.meta.internal.parsing.Trees
 import scala.meta.io.AbsolutePath
 import scala.meta.pc.CancelToken
-import scala.meta.pc.CodeActionId
 
 import org.eclipse.{lsp4j => l}
 
@@ -33,8 +32,8 @@ class InlineValueCodeAction(
 
   override def kind: String = l.CodeActionKind.RefactorInline
 
-  override val maybeCodeActionId: Option[CodeActionId] = Some(
-    CodeActionId.InlineValue
+  override val maybeCodeActionId: Option[String] = Some(
+    "InlineValue"
   )
 
   override def contribute(params: l.CodeActionParams, token: CancelToken)(

diff --git a/metals/src/main/scala/scala/meta/internal/metals/codeactions/InsertInferredType.scala b/metals/src/main/scala/scala/meta/internal/metals/codeactions/InsertInferredType.scala
@@ -16,7 +16,6 @@ import scala.meta.internal.metals.codeactions.CodeAction
 import scala.meta.internal.metals.codeactions.CodeActionBuilder
 import scala.meta.internal.parsing.Trees
 import scala.meta.pc.CancelToken
-import scala.meta.pc.CodeActionId
 
 import org.eclipse.{lsp4j => l}
 
@@ -34,8 +33,8 @@ class InsertInferredType(
   import InsertInferredType._
   override def kind: String = l.CodeActionKind.QuickFix
 
-  override val maybeCodeActionId: Option[CodeActionId] = Some(
-    CodeActionId.InsertInferredType
+  override val maybeCodeActionId: Option[String] = Some(
+    "InsertInferredType"
   )
 
   override def handleCommand(

diff --git a/mtags-interfaces/src/main/java/scala/meta/pc/CodeActionId.java b/mtags-interfaces/src/main/java/scala/meta/pc/CodeActionId.java
diff --git a/mtags-interfaces/src/main/java/scala/meta/pc/PresentationCompiler.java b/mtags-interfaces/src/main/java/scala/meta/pc/PresentationCompiler.java
@@ -115,21 +115,21 @@ public CompletableFuture<java.util.List<ReferencesResult>> references(References
 	/**
 	 * Execute the given code action
 	 */
-	public CompletableFuture<List<TextEdit>> codeAction(OffsetParams params, CodeActionId codeActionId, Object codeActionPayload) {
+	public CompletableFuture<List<TextEdit>> codeAction(OffsetParams params, String codeActionId, Object codeActionPayload) {
 		return CompletableFuture.completedFuture(Collections.emptyList());
 	}
 
 	/**
 	 * Returns the list of code actions supported by the current presentation compiler.
 	 */
-	public List<CodeActionId> supportedCodeActions() {
+	public List<String> supportedCodeActions() {
 		return Arrays.asList(
-			CodeActionId.ConvertToNamedArguments,
-			CodeActionId.ExtractMethod,
-			CodeActionId.ImplementAbstractMembers,
-			CodeActionId.ImportMissingSymbol,
-			CodeActionId.InlineValue,
-			CodeActionId.InsertInferredType
+			"ConvertToNamedArguments",
+			"ExtractMethod",
+			"ImplementAbstractMembers",
+			"ImportMissingSymbol",
+			"InlineValue",
+			"InsertInferredType"
 		);
 	}