Skip to content

bugfix: Fix issues with annotations not detected #22878

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 1 commit into from
Mar 28, 2025
Merged

bugfix: Fix issues with annotations not detected #22878

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
6 changes: 3 additions & 3 deletions presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ trait PcCollector[T]:
def collectEndMarker =
EndMarker.getPosition(df, pos, sourceText).map:
collect(EndMarker(df.symbol), _)
val annots = collectTrees(df.mods.annotations)
val annots = collectTrees(df.symbol.annotations.map(_.tree))
val traverser =
new PcCollector.DeepFolderWithParent[Set[T]](
collectNamesWithParent
Expand Down Expand Up @@ -215,8 +215,8 @@ trait PcCollector[T]:
* @<<JsonNotification>>("")
* def params() = ???
*/
case mdf: MemberDef if mdf.mods.annotations.nonEmpty =>
val trees = collectTrees(mdf.mods.annotations)
case mdf: MemberDef if mdf.symbol.annotations.nonEmpty =>
val trees = collectTrees(mdf.symbol.annotations.map(_.tree))
val traverser =
new PcCollector.DeepFolderWithParent[Set[T]](
collectNamesWithParent
Expand Down
18 changes: 18 additions & 0 deletions presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,24 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite:
|""".stripMargin
)

@Test def `metals-6823` =
check(
s"""|package <<example>>/*namespace*/
|
| @<<main>>/*class*/ def <<main1>>/*method,definition*/(): <<Unit>>/*class,abstract*/ =
| val <<array>>/*variable,definition,readonly*/ = <<Array>>/*class*/(1, 2, 3)
| <<println>>/*method*/(<<array>>/*variable,readonly*/)
|
|@<<main>>/*class*/ def <<main2>>/*method,definition*/(): <<Unit>>/*class,abstract*/ =
| val <<list>>/*variable,definition,readonly*/ = <<List>>/*class*/(1, 2, 3)
| <<println>>/*method*/(<<list>>/*variable,readonly*/)
|
|@<<main>>/*class*/ def <<main3>>/*method,definition*/(): <<Unit>>/*class,abstract*/ =
| val <<list>>/*variable,definition,readonly*/ = <<List>>/*class*/(1, 2, 3)
| <<println>>/*method*/(<<list>>/*variable,readonly*/)
|""".stripMargin
)

@Test def `Comment(Single-Line, Multi-Line)` =
check(
s"""|package <<example>>/*namespace*/
Expand Down
Loading