Skip to content

fix(#17255): cannot find Scala companion module from Java #19773

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 7 commits into from
Feb 28, 2024
Merged

fix(#17255): cannot find Scala companion module from Java #19773

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
22d98d6
fix: cannot find Scala companion module from Java
i10416 Feb 24, 2024
4cb34e5
tweak: try the original name first and then fallback to module
i10416 Feb 24, 2024
4992b4b
Update compiler/src/dotty/tools/dotc/core/ContextOps.scala
i10416 Feb 25, 2024
1d65c5b
fix: imported symbol missing for companion module
i10416 Feb 25, 2024
d84b3ca
test: add a test to confirm scala/scala#10644 is forward-ported
i10416 Feb 25, 2024
cbfdf57
fix(test): skip a test to avoid linking error due to java source
i10416 Feb 25, 2024
96c91da
Apply suggestions from code review
i10416 Feb 28, 2024
File filter

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
tweak: try the original name first and then fallback to module 
Avoid skipping searchin a member by the original name even when name is likely companion module name.
  • Loading branch information
@i10416
i10416 committed Feb 24, 2024
commit 4cb34e5b6134c3bccc25dc61ff53da80f992aaa3
17 changes: 10 additions & 7 deletions compiler/src/dotty/tools/dotc/core/ContextOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,16 @@ object ContextOps:
val preSym = pre.typeSymbol
// 1. Try to search in current type and parents.
val directSearch =
if name.isTypeName && name.endsWith(StdNames.str.MODULE_SUFFIX) then
pre.findMember(name.stripModuleClassSuffix, pre, required, excluded) match
case NoDenotation => NoDenotation
case symDenot: SymDenotation =>
symDenot.companionModule.denot
else
pre.findMember(name, pre, required, excluded)
def asModule =
if name.isTypeName && name.endsWith(StdNames.str.MODULE_SUFFIX) then
pre.findMember(name.stripModuleClassSuffix, pre, required, excluded) match
case NoDenotation => NoDenotation
case symDenot: SymDenotation =>
symDenot.companionModule.denot
else NoDenotation
pre.findMember(name, pre, required, excluded) match
case NoDenotation => asModule
case denot => denot

// 2. Try to search in companion class if current is an object.
def searchCompanionClass = if lookInCompanion && preSym.is(Flags.Module) then
Expand Down