Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Backport "Fix active param index for empty param lists" to LTS #21054

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Backport "Fix active param index for empty param lists" to LTS #21054

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 compiler/src/dotty/tools/dotc/util/Signatures.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ object Signatures {
fun: tpd.Tree,
isTypeApply: Boolean = false
)(using Context): (Int, Int, List[Signature]) =
def treeQualifier(tree: tpd.Tree): tpd.Tree = tree match
def treeQualifier(tree: tpd.Tree): tpd.Tree =
tree match
case Apply(qual, _) => treeQualifier(qual)
case TypeApply(qual, _) => treeQualifier(qual)
case AppliedTypeTree(qual, _) => treeQualifier(qual)
Expand Down Expand Up @@ -247,7 +248,9 @@ object Signatures {
val alternativeSignatures = alternativesWithTypes
.flatMap(toApplySignature(_, findOutermostCurriedApply(untpdPath), safeParamssListIndex))

val finalParamIndex = currentParamsIndex + previousArgs
val finalParamIndex =
if currentParamsIndex == -1 then -1
else previousArgs + currentParamsIndex
(finalParamIndex, alternativeIndex, alternativeSignatures)
else
(0, 0, Nil)
Expand Down
2 changes: 1 addition & 1 deletion presentation-compiler/test/dotty/tools/pc/base/BaseSignatureHelpSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ abstract class BaseSignatureHelpSuite extends BasePCSuite:
out
.append(signature.getLabel)
.append("\n")
if (result.getActiveSignature == i && result.getActiveParameter != null && signature.getParameters.size() > 0) {
if (result.getActiveSignature == i && result.getActiveParameter != null && result.getActiveParameter() >= 0 && signature.getParameters.size() > 0) {
val param = signature.getParameters.get(result.getActiveParameter)
val label = param.getLabel.getLeft()
/* We need to find the label of the active parameter and show ^ at that spot
Expand Down
25 changes: 25 additions & 0 deletions presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,3 +1533,28 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
|foo(i: Boolean, s: String)(b: Int): Unit
|""".stripMargin
)

@Test def `proper-param-empty-list` =
check(
"""
|object x {
| def foo[K, V](): Unit = ???
| foo(@@)
|}
|""".stripMargin,
"foo[K, V](): Unit"
)

@Test def `proper-param-list-after-param-empty-list` =
check(
"""
|object x {
| def foo[K, V]()(x: Int): Unit = ???
| foo()(@@)
|}
|""".stripMargin,
"""
|foo[K, V]()(x: Int): Unit
| ^^^^^^
""".stripMargin
)