Skip to content

Commit 0091b56

Browse files
committed
Fix code action resolution
1 parent e86fe29 commit 0091b56

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import scala.concurrent.Future
55

66
import scala.meta.Term
77
import scala.meta.internal.metals.Compilers
8-
import scala.meta.internal.metals.JsonParser
98
import scala.meta.internal.metals.JsonParser.XtensionSerializableToJson
109
import scala.meta.internal.metals.MetalsEnrichments._
1110
import scala.meta.internal.metals.codeactions.CodeAction
@@ -30,19 +29,17 @@ class ConvertToNamedLambdaParameters(
3029

3130
override val kind: String = l.CodeActionKind.RefactorRewrite
3231

33-
private val parser = new JsonParser.Of[ConvertToNamedLambdaParametersParams]
34-
35-
private case class ConvertToNamedLambdaParametersParams(
36-
position: l.TextDocumentPositionParams
37-
)
32+
private case class ConvertToNamedLambdaParametersData(
33+
codeActionId: String,
34+
position: l.TextDocumentPositionParams,
35+
) extends CodeActionResolveData
3836

3937
override def resolveCodeAction(
4038
codeAction: l.CodeAction,
4139
token: CancelToken,
4240
)(implicit ec: ExecutionContext): Option[Future[l.CodeAction]] = {
43-
val data = codeAction.getData()
44-
data match {
45-
case parser.Jsonized(data) =>
41+
parseData[ConvertToNamedLambdaParametersData](codeAction) match {
42+
case Some(data) =>
4643
Some {
4744
val uri = data.position.getTextDocument().getUri()
4845
for {
@@ -79,8 +76,9 @@ class ConvertToNamedLambdaParameters(
7976
new l.Position(lambda.pos.startLine, lambda.pos.startColumn),
8077
)
8178
val data =
82-
ConvertToNamedLambdaParametersParams(
83-
position = position
79+
ConvertToNamedLambdaParametersData(
80+
codeActionId = CodeActionId.ConvertToNamedLambdaParameters,
81+
position = position,
8482
)
8583
val codeAction = CodeActionBuilder.build(
8684
title = ConvertToNamedLambdaParameters.title,

mtags/src/main/scala-2/scala/meta/internal/pc/ExtractMethodProvider.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ final class ExtractMethodProvider(
1414
)(implicit queryInfo: PcQueryContext)
1515
extends ExtractMethodUtils {
1616
import compiler._
17+
1718
def extractMethod: List[l.TextEdit] = {
1819
val text = range.text()
1920
val unit = addCompilationUnit(

0 commit comments

Comments
 (0)