Skip to content

Fix duplicate member entries in Scaladoc generation #24712

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

Open
cheeseng wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −1
Open

Fix duplicate member entries in Scaladoc generation #24712

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: 6 additions & 1 deletion scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,12 @@ object ScaladocTastyInspector:
val withNewMembers = p1.withNewMembers(p2.members)
if withNewMembers.docs.isEmpty then withNewMembers.withDocs(p2.docs) else withNewMembers
)
basePck.withMembers((basePck.members ++ rest).sortBy(_.name))
// Deduplicate members coming from different parser instances by a stable key:
// (location, member fullName, kind name).
val combined = basePck.members ++ rest
val keyed = combined.groupBy(m => (m.dri.location, m.fullName, m.kind.name))
val uniqueMembers = keyed.values.map(g => g.find(_.docs.nonEmpty).getOrElse(g.head)).toList.sortBy(_.name)
basePck.withMembers(uniqueMembers)
}.toList -> inspector.rootDoc

end ScaladocTastyInspector
Expand Down
Loading