Skip to content

Fix go to definition on constructor calls #5240

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
merged 2 commits into from
Oct 12, 2018
Merged

Fix go to definition on constructor calls #5240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f0cd51
Fix go to definition on constructor calls
Duhemm Oct 11, 2018
f43654d
Address review
Duhemm Oct 12, 2018
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
4 changes: 4 additions & 0 deletions compiler/src/dotty/tools/dotc/interactive/Interactive.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ object Interactive {
}.getOrElse(fn.symbol)
}

// For constructor calls, return the `<init>` that was selected
case _ :: (_: New) :: (select: Select) :: _ =>
select.symbol

case _ =>
enclosingTree(path).symbol
}
Expand Down
6 changes: 5 additions & 1 deletion compiler/src/dotty/tools/dotc/interactive/SourceTree.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ case class SourceTree(tree: tpd.NameTree, source: SourceFile) {
if (treePos.isZeroExtent || tree.name.toTermName == nme.ERROR)
NoSourcePosition
else {
val nameLength = tree.name.stripModuleClassSuffix.show.toString.length
// Constructors are named `<init>` in the trees, but `this` in the source.
val nameLength = tree.name match {
case nme.CONSTRUCTOR => nme.this_.toString.length
case other => other.stripModuleClassSuffix.show.toString.length
}
val position = {
// FIXME: This is incorrect in some cases, like with backquoted identifiers,
// see https://github.com/lampepfl/dotty/pull/1634#issuecomment-257079436
Expand Down
41 changes: 41 additions & 0 deletions language-server/test/dotty/tools/languageserver/DefinitionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,24 @@ class DefinitionTest {
.definition(m5 to m6, List(m1 to m2))
}

@Test def caseClassDefinition0: Unit = {
withSources(
code"""case class ${m1}Foo${m2}(x: String) {
def ${m3}this${m4}(x: Int) = ${m5}this${m6}(x.toString)
}""",
code"""class Bar {
val foo: ${m7}Foo${m8} = ${m9}Foo${m10}("hello")
val bar: ${m11}Foo${m12} = new ${m13}Foo${m14}(2)
}"""
) .definition(m1 to m2, List(m1 to m2))
.definition(m3 to m4, List(m3 to m4))
.definition(m5 to m6, List(m1 to m2))
.definition(m7 to m8, List(m1 to m2))
.definition(m9 to m10, List(m1 to m2))
.definition(m11 to m12, List(m1 to m2))
.definition(m13 to m14, List(m3 to m4))
}

@Test def valDefinition0: Unit = {
withSources(
code"class Foo { val ${m1}x$m2 = 0; ${m3}x$m4 }",
Expand Down Expand Up @@ -134,6 +152,18 @@ class DefinitionTest {
.definition(m11 to m12, List(m1 to m2))
}

@Test def goToParamApply: Unit = {
withSources(
code"""case class Foo(${m1}x${m2}: Int, ${m3}y${m4}: String)""",
code"""object Bar {
Foo(${m5}x${m6} = 1, ${m7}y${m8} = "hello")
}"""
) .definition(m1 to m2, List(m1 to m2))
.definition(m3 to m4, List(m3 to m4))
.definition(m5 to m6, List(m1 to m2))
.definition(m7 to m8, List(m3 to m4))
}

@Test def goToParamCopyMethod: Unit = {

withSources(
Expand All @@ -148,4 +178,15 @@ class DefinitionTest {
.definition(m9 to m10, List(m3 to m4))
}

@Test def constructorDefinition: Unit = {
withSources(
code"class ${m1}A${m2}(x: Boolean) { def ${m3}this${m4}(x: Int) = ${m5}this${m6}(x > 0) }",
code"object B { val a0 = new ${m7}A${m8}(true); val a1 = new ${m9}A${m10}(0) }"
) .definition(m1 to m2, List(m1 to m2))
.definition(m3 to m4, List(m3 to m4))
.definition(m5 to m6, List(m1 to m2))
.definition(m7 to m8, List(m1 to m2))
.definition(m9 to m10, List(m3 to m4))
}

}