fix: show zero extent references when using pc #6583
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| package tests.pc | ||
|
|
||
| import java.net.URI | ||
|
|
||
| import scala.meta.internal.jdk.CollectionConverters._ | ||
| import scala.meta.internal.metals.CompilerVirtualFileParams | ||
| import scala.meta.internal.metals.EmptyCancelToken | ||
| import scala.meta.internal.pc.PcReferencesRequest | ||
|
|
||
| import munit.Location | ||
| import munit.TestOptions | ||
| import org.eclipse.lsp4j.jsonrpc.messages.{Either => JEither} | ||
| import tests.BasePCSuite | ||
| import tests.RangeReplace | ||
|
|
||
| class PcReferencesSuite extends BasePCSuite with RangeReplace { | ||
| def check( | ||
| name: TestOptions, | ||
| original: String, | ||
| compat: Map[String, String] = Map.empty | ||
| )(implicit location: Location): Unit = | ||
| test(name) { | ||
| val edit = original.replaceAll("(<<|>>)", "") | ||
| val expected = original.replaceAll("@@", "") | ||
| val base = original.replaceAll("(<<|>>|@@)", "") | ||
|
|
||
| val (code, offset) = params(edit, "Highlight.scala") | ||
| val ranges = presentationCompiler | ||
| .references( | ||
| PcReferencesRequest( | ||
| CompilerVirtualFileParams( | ||
| URI.create("file:/Highlight.scala"), | ||
| code, | ||
| EmptyCancelToken | ||
| ), | ||
| includeDefinition = false, | ||
| offsetOrSymbol = JEither.forLeft(offset) | ||
| ) | ||
| ) | ||
| .get() | ||
| .asScala | ||
| .flatMap(_.locations().asScala.map(_.getRange())) | ||
| .toList | ||
|
|
||
| assertEquals( | ||
| renderRangesAsString(base, ranges), | ||
| getExpected(expected, compat, scalaVersion) | ||
| ) | ||
| } | ||
|
|
||
| check( | ||
| "implicit-args", | ||
| """|package example | ||
| | | ||
| |class Bar(i: Int) | ||
| | | ||
| |object Hello { | ||
| | def m(i: Int)(implicit b: Bar) = ??? | ||
| | val foo = { | ||
| | implicit val b@@arr: Bar = new Bar(1) | ||
| | m<<>>(3) | ||
| | } | ||
| |} | ||
| |""".stripMargin, | ||
| compat = Map("3" -> """|package example | ||
| | | ||
| |class Bar(i: Int) | ||
| | | ||
| |object Hello { | ||
| | def m(i: Int)(implicit b: Bar) = ??? | ||
| | val foo = { | ||
| | implicit val barr: Bar = new Bar(1) | ||
| | m(3)<<>> | ||
| | } | ||
| |} | ||
| |""".stripMargin) | ||
| ) | ||
|
|
||
| check( | ||
| "implicit-args-2", | ||
| """|package example | ||
| | | ||
| |class Bar(i: Int) | ||
| |class Foo(implicit b: Bar) | ||
| | | ||
| |object Hello { | ||
| | implicit val b@@arr: Bar = new Bar(1) | ||
| | val foo = <<>>new Foo | ||
| |} | ||
| |""".stripMargin, | ||
| compat = Map( | ||
| "3" -> """|package example | ||
| | | ||
| |class Bar(i: Int) | ||
| |class Foo(implicit b: Bar) | ||
| | | ||
| |object Hello { | ||
| | implicit val barr: Bar = new Bar(1) | ||
| | val foo = new Foo<<>> | ||
| |} | ||
| |""".stripMargin | ||
| ) | ||
| ) | ||
|
|
||
| // for Scala 3 the symbol in bar reference is missing (<none>) | ||
| check( | ||
| "implicit-args-3".tag(IgnoreScala3), | ||
| """|package example | ||
| | | ||
| |class Bar(i: Int) | ||
| |class Foo(implicit b: Bar) | ||
| | | ||
| |object Hello { | ||
| | implicit val b@@arr = new Bar(1) | ||
| | for { | ||
| | _ <- Some(1) | ||
| | foo = <<>>new Foo() | ||
| | } yield () | ||
| |} | ||
| |""".stripMargin | ||
| ) | ||
|
|
||
| check( | ||
| "case-class", | ||
| """|case class Ma@@in(i: Int) | ||
|
There was a problem hiding this comment. Why add these two tests with no usages? Is this on puspose? There was a problem hiding this comment. Initially I added all zero-extent symbols, not only implicits, so it showed some additional refs in those tests, that shouldn't be there. |
||
| |""".stripMargin | ||
| ) | ||
|
|
||
| check( | ||
| "case-class-with-implicit", | ||
| """"|case class A()(implicit val fo@@o: Int) | ||
| |""".stripMargin | ||
| ) | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we reprort an issue upstrem?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This won't compile for Scala 3. I think I confused myself by a combination of VirtusLab/scala-cli#2638 and VirtusLab/scala-cli#2226 (or something similar) 😂