diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index 5a540f108420..bc9e22b8e4ed 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -1460,8 +1460,9 @@ trait Checking { report.error(ImportRenamedTwice(sel.imported), sel.imported.srcPos) seen += sel.name - for sel <- selectors do - if !sel.isWildcard then checkIdent(sel) + if !ctx.compilationUnit.isJava then + for sel <- selectors do + if !sel.isWildcard then checkIdent(sel) end checkImportSelectors } diff --git a/tests/pos/i15608/bar/Test.scala b/tests/pos/i15608/bar/Test.scala new file mode 100644 index 000000000000..01366d02d080 --- /dev/null +++ b/tests/pos/i15608/bar/Test.scala @@ -0,0 +1,6 @@ +package bar + +trait MDCAdapter + +object ScalaMDCAdapter extends MDCAdapter { +} diff --git a/tests/pos/i15608/foo/JavaMDCBinder.java b/tests/pos/i15608/foo/JavaMDCBinder.java new file mode 100644 index 000000000000..58670339278e --- /dev/null +++ b/tests/pos/i15608/foo/JavaMDCBinder.java @@ -0,0 +1,20 @@ +package foo; + +import bar.MDCAdapter; +import bar.ScalaMDCAdapter; +import bar.ScalaMDCAdapter$; + +public class JavaMDCBinder { + public static final JavaMDCBinder SINGLETON = new JavaMDCBinder(); + + private JavaMDCBinder() { + } + + public MDCAdapter getMDCA() { + return ScalaMDCAdapter$.MODULE$; + } + + public String getMDCAdapterClassStr() { + return ScalaMDCAdapter.class.getName(); + } +} \ No newline at end of file