Skip to content

Handle inlined tree in implicit parameter inlay hints #24762

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.

Sign up for GitHub

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
tgodzik merged 1 commit into from
Dec 16, 2025
+43 −5
Merged

Handle inlined tree in implicit parameter inlay hints #24762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,18 @@ object ImplicitParameters:
def unapply(tree: Tree)(using params: InlayHintsParams, ctx: Context) =
if (params.implicitParameters()) {
tree match
case Apply(fun, args)
if args.exists(isSyntheticArg) && !tree.sourcePos.span.isZeroExtent && !args.exists(isQuotes(_)) =>
val (implicitArgs, providedArgs) = args.partition(isSyntheticArg)
val pos = implicitArgs.head.sourcePos
Some(implicitArgs, pos)
case Apply(_, args) if hasImplicitArgs(tree, args) => implicitArgs(args)
case Inlined(Apply(_, args), _, _) if hasImplicitArgs(tree, args) => implicitArgs(args)
case _ => None
} else None

private def hasImplicitArgs(tree: Tree, args: List[Tree])(using Context): Boolean =
args.exists(isSyntheticArg) && !tree.sourcePos.span.isZeroExtent && !args.exists(isQuotes)

private def implicitArgs(args: List[Tree])(using Context): Option[(List[Tree], SourcePosition)] =
val found = args.filter(isSyntheticArg)
Option.when(found.nonEmpty)(found, found.head.sourcePos)

@tailrec
def isSyntheticArg(tree: Tree)(using Context): Boolean = tree match
case tree: Ident =>
Expand Down
34 changes: 34 additions & 0 deletions presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1723,4 +1723,38 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
| .sum/*[BigDecimal<<scala/math/BigDecimal#>>]*//*(using BigDecimalIsFractional<<scala/math/Numeric.BigDecimalIsFractional.>>)*//* : BigDecimal<<scala/math/BigDecimal#>>*/
|""".stripMargin
)

@Test def `implicit-params-metals-i8029` =
check(
"""|trait Codec[T]
|object Main {
| given intCodec: Codec[Int] = ???
| val x = summon[Codec[Int]]
|}
|""".stripMargin,
"""|trait Codec[T]
|object Main {
| given intCodec: Codec[Int] = ???
| val x/*: Codec<<(1:6)>>[Int<<scala/Int#>>]*/ = summon[Codec[Int]]/*(using intCodec<<(3:8)>>)*/
|}
|""".stripMargin
)

@Test def `implicit-params-metals-i8029-2` =
check(
"""|trait Codec[T]
|object Main {
| implicit val intCodec: Codec[Int] = ???
| val x = implicitly[Codec[Int]]
| val y = summon[Codec[Int]]
|}
|""".stripMargin,
"""|trait Codec[T]
|object Main {
| implicit val intCodec: Codec[Int] = ???
| val x/*: Codec<<(1:6)>>[Int<<scala/Int#>>]*/ = implicitly[Codec[Int]]/*(using intCodec<<(3:15)>>)*/
| val y/*: Codec<<(1:6)>>[Int<<scala/Int#>>]*/ = summon[Codec[Int]]/*(using intCodec<<(3:15)>>)*/
|}
|""".stripMargin
)
}
Loading