Skip to content

Fix incorrect XRay hint #24738

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 12, 2025
+41 −2
Merged

Fix incorrect XRay hint #24738

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
7 changes: 5 additions & 2 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 @@ -529,15 +529,18 @@ object XRayModeHint:
case apply @ Apply(inner, _)
if !apply.span.isZeroExtent && inner.sourcePos.exists && !isParentOnSameLine &&
!isParentApply && endsInSimpleSelect(apply) && isEndOfLine(tree.sourcePos) =>
Some((apply.tpe.widen.deepDealiasAndSimplify, tree.sourcePos))
Some((apply.tpe.widen.finalResultType.deepDealiasAndSimplify, tree.sourcePos))
/*
innerTree
.select
*/
case select @ Select(innerTree, _)
if !select.span.isZeroExtent && innerTree.sourcePos.exists &&
!isParentOnSameLine && !isParentApply && isEndOfLine(tree.sourcePos) =>
Some((select.tpe.widen.deepDealiasAndSimplify, tree.sourcePos))
val tpe = parent match
case Some(ta: TypeApply) => ta.tpe
case _ => select.tpe
Some((tpe.widen.finalResultType.deepDealiasAndSimplify, tree.sourcePos))
case _ => None
else None

Expand Down
36 changes: 36 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 @@ -1687,4 +1687,40 @@ class InlayHintsSuite extends BaseInlayHintsSuite {
|}
|""".stripMargin
)

@Test def `xray-metals-i8021` =
check(
"""|object Main:
|
| case class Order(id: String, amount: BigDecimal)
| case class User(name: String, orders: List[Order])
|
| val users = List(
| User("Alice", List(Order("A1", 100), Order("A2", 50))),
| User("Bob", List(Order("B1", 200)))
| )
|
| val total = users
| .filter(_.name.startsWith("A"))
| .flatMap(_.orders)
| .map(_.amount)
| .sum
|""".stripMargin,
"""|object Main:
|
| case class Order(id: String, amount: BigDecimal)
| case class User(name: String, orders: List[Order])
|
| val users/*: List<<scala/collection/immutable/List#>>[User<<(4:13)>>]*/ = List/*[User<<(4:13)>>]*/(
| /*elems = */User(/*name = */"Alice", /*orders = */List/*[Order<<(3:13)>>]*/(/*elems = */Order(/*id = */"A1", /*int2bigDecimal<<scala/math/BigDecimal.int2bigDecimal().>>(*//*amount = */100/*)*/), Order(/*id = */"A2", /*int2bigDecimal<<scala/math/BigDecimal.int2bigDecimal().>>(*//*amount = */50/*)*/))),
| User(/*name = */"Bob", /*orders = */List/*[Order<<(3:13)>>]*/(/*elems = */Order(/*id = */"B1", /*int2bigDecimal<<scala/math/BigDecimal.int2bigDecimal().>>(*//*amount = */200/*)*/)))
| )
|
| val total/*: BigDecimal<<scala/math/BigDecimal#>>*/ = users
| .filter(/*p = */_.name.startsWith("A"))/*: List<<scala/collection/immutable/List#>>[User<<(4:13)>>]*/
| .flatMap/*[Order<<(3:13)>>]*/(/*f = */_.orders)/* : List<<scala/collection/immutable/List#>>[Order<<(3:13)>>]*/
| .map/*[BigDecimal<<scala/math/BigDecimal#>>]*/(/*f = */_.amount)/* : List<<scala/collection/immutable/List#>>[BigDecimal<<scala/math/BigDecimal#>>]*/
| .sum/*[BigDecimal<<scala/math/BigDecimal#>>]*//*(using BigDecimalIsFractional<<scala/math/Numeric.BigDecimalIsFractional.>>)*//* : BigDecimal<<scala/math/BigDecimal#>>*/
|""".stripMargin
)
}
Loading