Skip to content

Commit a40b999

Browse files
kasiaMarekkasiaMarek
committed
bugfix: Show implicit chained calls in inlay hints
1 parent 31f5b4e commit a40b999

File tree

2 files changed

+185
-13
lines changed

2 files changed

+185
-13
lines changed

‎presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala‎

Lines changed: 69 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ class PcInlayHintsProvider(
8080
LabelPart(")") :: Nil,
8181
InlayHintKind.Parameter,
8282
)
83-
case ImplicitParameters(symbols, pos, allImplicit) =>
84-
val labelParts = symbols.map(s => List(labelPart(s, s.decodedName)))
85-
val label =
86-
if allImplicit then labelParts.separated("(using ", ", ", ")")
87-
else labelParts.separated(", ")
83+
case ImplicitParameters(trees, pos) =>
8884
inlayHints.add(
8985
adjustPos(pos).toLsp,
90-
label,
91-
InlayHintKind.Parameter,
86+
ImplicitParameters.partsFromImplicitArgs(trees).map((label, maybeSymbol) =>
87+
maybeSymbol match
88+
case Some(symbol) => labelPart(symbol, label)
89+
case None => LabelPart(label)
90+
),
91+
InlayHintKind.Parameter
9292
)
9393
case ValueOf(label, pos) =>
9494
inlayHints.add(
@@ -221,12 +221,8 @@ object ImplicitParameters:
221221
case Apply(fun, args)
222222
if args.exists(isSyntheticArg) && !tree.sourcePos.span.isZeroExtent && !args.exists(isQuotes(_)) =>
223223
val (implicitArgs, providedArgs) = args.partition(isSyntheticArg)
224-
val allImplicit = providedArgs.isEmpty || providedArgs.forall {
225-
case Ident(name) => name == nme.MISSING
226-
case _ => false
227-
}
228224
val pos = implicitArgs.head.sourcePos
229-
Some(implicitArgs.map(_.symbol), pos, allImplicit)
225+
Some(implicitArgs, pos)
230226
case _ => None
231227
} else None
232228

@@ -242,6 +238,67 @@ object ImplicitParameters:
242238
private def isQuotes(tree: Tree)(using Context) =
243239
tree.tpe.typeSymbol == defn.QuotesClass
244240

241+
def partsFromImplicitArgs(trees: List[Tree])(using Context): List[(String, Option[Symbol])] = {
242+
@tailrec
243+
def recurseImplicitArgs(
244+
currentArgs: List[Tree],
245+
remainingArgsLists: List[List[Tree]],
246+
parts: List[(String, Option[Symbol])]
247+
): List[(String, Option[Symbol])] =
248+
(currentArgs, remainingArgsLists) match {
249+
case (Nil, Nil) => parts
250+
case (Nil, headArgsList :: tailArgsList) =>
251+
if (headArgsList.isEmpty) {
252+
recurseImplicitArgs(
253+
headArgsList,
254+
tailArgsList,
255+
(")", None) :: parts
256+
)
257+
} else {
258+
recurseImplicitArgs(
259+
headArgsList,
260+
tailArgsList,
261+
(", ", None) :: (")", None) :: parts
262+
)
263+
}
264+
case (arg :: remainingArgs, remainingArgsLists) =>
265+
arg match {
266+
case Apply(fun, args) =>
267+
val applyLabel = (fun.symbol.decodedName, Some(fun.symbol))
268+
recurseImplicitArgs(
269+
args,
270+
remainingArgs :: remainingArgsLists,
271+
("(", None) :: applyLabel :: parts
272+
)
273+
case t if t.isTerm =>
274+
val termLabel = (t.symbol.decodedName, Some(t.symbol))
275+
if (remainingArgs.isEmpty)
276+
recurseImplicitArgs(
277+
remainingArgs,
278+
remainingArgsLists,
279+
termLabel :: parts
280+
)
281+
else
282+
recurseImplicitArgs(
283+
remainingArgs,
284+
remainingArgsLists,
285+
(", ", None) :: termLabel :: parts
286+
)
287+
case _ =>
288+
recurseImplicitArgs(
289+
remainingArgs,
290+
remainingArgsLists,
291+
parts
292+
)
293+
}
294+
}
295+
((")", None) :: recurseImplicitArgs(
296+
trees,
297+
Nil,
298+
List(("(using ", None))
299+
)).reverse
300+
}
301+
245302
end ImplicitParameters
246303

247304
object ValueOf:

‎presentation-compiler/test/dotty/tools/pc/tests/inlayHints/InlayHintsSuite.scala‎

Lines changed: 116 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,122 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
937937
| given A = A()
938938
| implicit def bar(using a: A): B[A] = B[A]()
939939
| def foo(using b: B[A]): String = "aaa"
940-
| val g: String = foo/*(using bar<<(5:15)>>)*/
940+
| val g: String = foo/*(using bar<<(5:15)>>(given_A<<(4:8)>>))*/
941941
|""".stripMargin
942942
)
943+
944+
@Test def `multiple-params-list` =
945+
check(
946+
"""|object Main {
947+
| case class A()
948+
| case class B()
949+
| implicit val theA: A = A()
950+
| def foo(b: B)(implicit a: A): String = "aaa"
951+
| val g: String = foo(B())
952+
|}
953+
|""".stripMargin,
954+
"""|object Main {
955+
| case class A()
956+
| case class B()
957+
| implicit val theA: A = A()
958+
| def foo(b: B)(implicit a: A): String = "aaa"
959+
| val g: String = foo(B())/*(using theA<<(4:15)>>)*/
960+
|}
961+
|""".stripMargin,
962+
)
963+
964+
@Test def `implicit-chain` =
965+
check(
966+
"""|object Main{
967+
| def hello()(implicit string: String, integer: Int, long: Long): String = {
968+
| println(s"Hello $string, $long, $integer!")
969+
| }
970+
| implicit def theString(implicit i: Int): String = i.toString
971+
| implicit def theInt(implicit l: Long): Int = l
972+
| implicit val theLong: Long = 42
973+
| hello()
974+
|}
975+
|""".stripMargin,
976+
"""|object Main{
977+
| def hello()(implicit string: String, integer: Int, long: Long): String = {
978+
| println(s"Hello $string, $long, $integer!")
979+
| }
980+
| implicit def theString(implicit i: Int): String = i.toString
981+
| implicit def theInt(implicit l: Long): Int = l
982+
| implicit val theLong: Long = 42
983+
| hello()/*(using theString<<(5:15)>>(theInt<<(6:15)>>(theLong<<(7:15)>>)), theInt<<(6:15)>>(theLong<<(7:15)>>), theLong<<(7:15)>>)*/
984+
|}
985+
|""".stripMargin,
986+
)
987+
988+
@Test def `implicit-parameterless-def` =
989+
check(
990+
"""|object Main{
991+
| def hello()(implicit string: String, integer: Int, long: Long): String = {
992+
| println(s"Hello $string, $long, $integer!")
993+
| }
994+
| implicit def theString(implicit i: Int): String = i.toString
995+
| implicit def theInt: Int = 43
996+
| implicit def theLong: Long = 42
997+
| hello()
998+
|}
999+
|""".stripMargin,
1000+
"""|object Main{
1001+
| def hello()(implicit string: String, integer: Int, long: Long): String = {
1002+
| println(s"Hello $string, $long, $integer!")
1003+
| }
1004+
| implicit def theString(implicit i: Int): String = i.toString
1005+
| implicit def theInt: Int = 43
1006+
| implicit def theLong: Long = 42
1007+
| hello()/*(using theString<<(5:15)>>(theInt<<(6:15)>>), theInt<<(6:15)>>, theLong<<(7:15)>>)*/
1008+
|}
1009+
|""".stripMargin,
1010+
)
1011+
1012+
@Test def `implicit-fn` =
1013+
check(
1014+
"""|object Main{
1015+
| implicit def stringLength(s: String): Int = s.length
1016+
| implicitly[String => Int]
1017+
|
1018+
| implicit val namedStringLength: String => Long = (s: String) => s.length.toLong
1019+
| implicitly[String => Long]
1020+
|}
1021+
|""".stripMargin,
1022+
"""|object Main{
1023+
| implicit def stringLength(s: String): Int = s.length
1024+
| implicitly[String => Int]
1025+
|
1026+
| implicit val namedStringLength: String => Long = (s: String) => s.length.toLong
1027+
| implicitly[String => Long]/*(using namedStringLength<<(5:15)>>)*/
1028+
|}
1029+
|""".stripMargin,
1030+
)
1031+
1032+
@Test def `implicit-fn2` =
1033+
check(
1034+
"""|object Main{
1035+
| implicit def stringLength(s: String, i: Int): Int = s.length
1036+
| implicitly[(String, Int) => Int]
1037+
|}
1038+
|""".stripMargin,
1039+
"""|object Main{
1040+
| implicit def stringLength(s: String, i: Int): Int = s.length
1041+
| implicitly[(String, Int) => Int]
1042+
|}
1043+
|""".stripMargin,
1044+
)
1045+
1046+
@Test def `strip-margin` =
1047+
check(
1048+
"""|object Main{
1049+
| "".stripMargin
1050+
|}
1051+
|""".stripMargin,
1052+
"""|package test
1053+
|object Main{
1054+
| /*augmentString<<scala/Predef.augmentString().>>(*/""/*)*/.stripMargin
1055+
|}
1056+
|""".stripMargin
1057+
)
9431058
}

0 commit comments

Comments
 (0)