Skip to content

pc: Implement code action 'convert to named lambda parameters' #22799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
package dotty.tools.pc

import java.nio.file.Paths
import java.util as ju

import scala.jdk.CollectionConverters.*
import scala.meta.pc.OffsetParams

import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.core.Contexts.Context
import dotty.tools.dotc.core.Flags
import dotty.tools.dotc.interactive.Interactive
import dotty.tools.dotc.interactive.InteractiveDriver
import dotty.tools.dotc.util.SourceFile
import dotty.tools.dotc.util.SourcePosition
import org.eclipse.lsp4j as l
import dotty.tools.pc.utils.InteractiveEnrichments.*
import dotty.tools.pc.utils.TermNameInference.*

/**
* Facilitates the code action that converts a wildcard lambda to a lambda with named parameters
* e.g.
*
* List(1, 2).map(<<_>> + 1) => List(1, 2).map(i => i + 1)
*/
final class PcConvertToNamedLambdaParameters(
driver: InteractiveDriver,
params: OffsetParams
):
import PcConvertToNamedLambdaParameters._

def convertToNamedLambdaParameters: ju.List[l.TextEdit] = {
val uri = params.uri
val filePath = Paths.get(uri)
driver.run(
uri,
SourceFile.virtual(filePath.toString, params.text),
)
given newctx: Context = driver.localContext(params)
val pos = driver.sourcePosition(params)
val trees = driver.openedTrees(uri)
val treeList = Interactive.pathTo(trees, pos)
// Extractor for a lambda function (needs context, so has to be defined here)
val LambdaExtractor = Lambda(using newctx)
// select the most inner wildcard lambda
val firstLambda = treeList.collectFirst {
case LambdaExtractor(params, rhsFn) if params.forall(isWildcardParam) =>
params -> rhsFn
}

firstLambda match {
case Some((params, lambda)) =>
// avoid names that are either defined or referenced in the lambda
val namesToAvoid = allDefAndRefNamesInTree(lambda)
// compute parameter names based on the type of the parameter
val computedParamNames: List[String] =
params.foldLeft(List.empty[String]) { (acc, param) =>
val name = singleLetterNameStream(param.tpe.typeSymbol.name.toString())
.find(n => !namesToAvoid.contains(n) && !acc.contains(n))
acc ++ name.toList
}
if computedParamNames.size == params.size then
val paramReferenceEdits = params.zip(computedParamNames).flatMap { (param, paramName) =>
val paramReferencePosition = findParamReferencePosition(param, lambda)
paramReferencePosition.toList.map { pos =>
val position = pos.toLsp
val range = new l.Range(
position.getStart(),
position.getEnd()
)
new l.TextEdit(range, paramName)
}
}
val paramNamesStr = computedParamNames.mkString(", ")
val paramDefsStr =
if params.size == 1 then paramNamesStr
else s"($paramNamesStr)"
val defRange = new l.Range(
lambda.sourcePos.toLsp.getStart(),
lambda.sourcePos.toLsp.getStart()
)
val paramDefinitionEdits = List(
new l.TextEdit(defRange, s"$paramDefsStr => ")
)
(paramDefinitionEdits ++ paramReferenceEdits).asJava
else
List.empty.asJava
case _ =>
List.empty.asJava
}
}

end PcConvertToNamedLambdaParameters

object PcConvertToNamedLambdaParameters:
val codeActionId = "ConvertToNamedLambdaParameters"

class Lambda(using Context):
def unapply(tree: tpd.Block): Option[(List[tpd.ValDef], tpd.Tree)] = tree match {
case tpd.Block((ddef @ tpd.DefDef(_, tpd.ValDefs(params) :: Nil, _, body: tpd.Tree)) :: Nil, tpd.Closure(_, meth, _))
if ddef.symbol == meth.symbol =>
params match {
case List(param) =>
// lambdas with multiple wildcard parameters are represented as a single parameter function and a block with wildcard valdefs
Some(multipleUnderscoresFromBody(param, body))
case _ => Some(params -> body)
}
case _ => None
}
end Lambda

private def multipleUnderscoresFromBody(param: tpd.ValDef, body: tpd.Tree)(using Context): (List[tpd.ValDef], tpd.Tree) = body match {
case tpd.Block(defs, expr) if param.symbol.is(Flags.Synthetic) =>
val wildcardParamDefs = defs.collect {
case valdef: tpd.ValDef if isWildcardParam(valdef) => valdef
}
if wildcardParamDefs.size == defs.size then wildcardParamDefs -> expr
else List(param) -> body
case _ => List(param) -> body
}

def isWildcardParam(param: tpd.ValDef)(using Context): Boolean =
param.name.toString.startsWith("_$") && param.symbol.is(Flags.Synthetic)

def findParamReferencePosition(param: tpd.ValDef, lambda: tpd.Tree)(using Context): Option[SourcePosition] =
var pos: Option[SourcePosition] = None
object FindParamReference extends tpd.TreeTraverser:
override def traverse(tree: tpd.Tree)(using Context): Unit =
tree match
case ident @ tpd.Ident(_) if ident.symbol == param.symbol =>
pos = Some(tree.sourcePos)
case _ =>
traverseChildren(tree)
FindParamReference.traverse(lambda)
pos
end findParamReferencePosition

def allDefAndRefNamesInTree(tree: tpd.Tree)(using Context): List[String] =
object FindDefinitionsAndRefs extends tpd.TreeAccumulator[List[String]]:
override def apply(x: List[String], tree: tpd.Tree)(using Context): List[String] =
tree match
case tpd.DefDef(name, _, _, _) =>
super.foldOver(x :+ name.toString, tree)
case tpd.ValDef(name, _, _) =>
super.foldOver(x :+ name.toString, tree)
case tpd.Ident(name) =>
super.foldOver(x :+ name.toString, tree)
case _ =>
super.foldOver(x, tree)
FindDefinitionsAndRefs.foldOver(Nil, tree)
end allDefAndRefNamesInTree

end PcConvertToNamedLambdaParameters
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ case class ScalaPresentationCompiler(
CodeActionId.ImplementAbstractMembers,
CodeActionId.ExtractMethod,
CodeActionId.InlineValue,
CodeActionId.InsertInferredType
CodeActionId.InsertInferredType,
PcConvertToNamedLambdaParameters.codeActionId
).asJava

def this() = this("", None, Nil, Nil)
Expand All @@ -82,26 +83,30 @@ case class ScalaPresentationCompiler(
codeActionPayload: Optional[T]
): CompletableFuture[ju.List[TextEdit]] =
(codeActionId, codeActionPayload.asScala) match
case (
CodeActionId.ConvertToNamedArguments,
Some(argIndices: ju.List[_])
) =>
val payload =
argIndices.asScala.collect { case i: Integer => i.toInt }.toSet
convertToNamedArguments(params, payload)
case (CodeActionId.ImplementAbstractMembers, _) =>
implementAbstractMembers(params)
case (CodeActionId.InsertInferredType, _) =>
insertInferredType(params)
case (CodeActionId.InlineValue, _) =>
inlineValue(params)
case (CodeActionId.ExtractMethod, Some(extractionPos: OffsetParams)) =>
params match {
case range: RangeParams =>
extractMethod(range, extractionPos)
case _ => failedFuture(new IllegalArgumentException(s"Expected range parameters"))
}
case (id, _) => failedFuture(new IllegalArgumentException(s"Unsupported action id $id"))
case (
CodeActionId.ConvertToNamedArguments,
Some(argIndices: ju.List[_])
) =>
val payload =
argIndices.asScala.collect { case i: Integer => i.toInt }.toSet
convertToNamedArguments(params, payload)
case (CodeActionId.ImplementAbstractMembers, _) =>
implementAbstractMembers(params)
case (CodeActionId.InsertInferredType, _) =>
insertInferredType(params)
case (CodeActionId.InlineValue, _) =>
inlineValue(params)
case (CodeActionId.ExtractMethod, Some(extractionPos: OffsetParams)) =>
params match {
case range: RangeParams =>
extractMethod(range, extractionPos)
case _ => failedFuture(new IllegalArgumentException(s"Expected range parameters"))
}
case (PcConvertToNamedLambdaParameters.codeActionId, _) =>
compilerAccess.withNonInterruptableCompiler(List.empty[l.TextEdit].asJava, params.token) {
access => PcConvertToNamedLambdaParameters(access.compiler(), params).convertToNamedLambdaParameters
}(params.toQueryContext)
case (id, _) => failedFuture(new IllegalArgumentException(s"Unsupported action id $id"))

private def failedFuture[T](e: Throwable): CompletableFuture[T] =
val f = new CompletableFuture[T]()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package dotty.tools.pc.utils

/**
* Helpers for generating variable names based on the desired types.
*/
object TermNameInference {

/** Single character names for types. (`Int` => `i`, `i1`, `i2`, ...) */
def singleLetterNameStream(typeName: String): LazyList[String] = {
val typeName1 = sanitizeInput(typeName)
val firstCharStr = typeName1.headOption.getOrElse('x').toLower.toString
numberedStreamFromName(firstCharStr)
}

/** Names only from upper case letters (`OnDemandSymbolIndex` => `odsi`, `odsi1`, `odsi2`, ...) */
def shortNameStream(typeName: String): LazyList[String] = {
val typeName1 = sanitizeInput(typeName)
val upperCases = typeName1.filter(_.isUpper).map(_.toLower)
val name = if (upperCases.isEmpty) typeName1 else upperCases
numberedStreamFromName(name)
}

/** Names from lower case letters (`OnDemandSymbolIndex` => `onDemandSymbolIndex`, `onDemandSymbolIndex1`, ...) */
def fullNameStream(typeName: String): LazyList[String] = {
val typeName1 = sanitizeInput(typeName)
val withFirstLower =
typeName1.headOption.map(_.toLower).getOrElse('x').toString + typeName1.drop(1)
numberedStreamFromName(withFirstLower)
}

/** A lazy list of names: a, b, ..., z, aa, ab, ..., az, ba, bb, ... */
def saneNamesStream: LazyList[String] = {
val letters = ('a' to 'z').map(_.toString)
def computeNext(acc: String): String = {
if (acc.last == 'z')
computeNext(acc.init) + letters.head
else
acc.init + letters(letters.indexOf(acc.last) + 1)
}
def loop(acc: String): LazyList[String] =
acc #:: loop(computeNext(acc))
loop("a")
}

private def sanitizeInput(typeName: String): String =
typeName.filter(_.isLetterOrDigit)

private def numberedStreamFromName(name: String): LazyList[String] = {
val rest = LazyList.from(1).map(name + _)
name #:: rest
}
}
Loading
Loading