Skip to content

Backport from Metals #22426

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 8 commits into from
Jan 22, 2025
Merged

Backport from Metals #22426

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d3c8ca
refactor: Use codeAction interface for most code actions
kasiaMarek Jan 21, 2025
31f5b4e
Update ScalaPresentationCompiler.scala
kasiaMarek Jan 21, 2025
a40b999
bugfix: Show implicit chained calls in inlay hints
kasiaMarek Jan 21, 2025
eaa827e
improvement: Make including detail in completion label configurable
kasiaMarek Jan 21, 2025
7e50b1e
fix: deduplicate scaladoc
kasiaMarek Jan 21, 2025
6187ac0
fix: don't look for overshadow conflicts for symbols not in the scope
kasiaMarek Jan 21, 2025
9a028cd
fix: don't show incorrect docs for inner methods
kasiaMarek Jan 21, 2025
d1a150a
adjust for Java 8 and fix doc test
kasiaMarek Jan 22, 2025
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
Prev Previous commit
Next Next commit
fix: deduplicate scaladoc
  • Loading branch information
@kasiaMarek
kasiaMarek committed Jan 21, 2025
commit 7e50b1efc8f316cfbcac6609a56aec300bc88ce3
2 changes: 1 addition & 1 deletion presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ object CompletionItemResolver extends ItemResolver:
else gsymDoc
else
val companionDoc = docs(companion)
if companionDoc.isEmpty() then gsymDoc
if companionDoc.isEmpty() || companionDoc == gsymDoc then gsymDoc
else if gsymDoc.isEmpty() then companionDoc
else
List(
Expand Down