diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java index 51a0d317c26..4172e9ff5ac 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java @@ -177,7 +177,8 @@ public class LazyImportScope implements JetScope, LazyEntity { ImportResolveStatus status = importedScopesProvider.invoke(importDirective).importResolveStatus; if (status != null && !status.descriptors.isEmpty()) { - ImportsResolver.reportUselessImport(importDirective, this, status.descriptors, traceForImportResolve); + JetScope fileScope = resolveSession.getScopeProvider().getFileScope((JetFile) importDirective.getContainingFile()); + ImportsResolver.reportUselessImport(importDirective, fileScope, status.descriptors, traceForImportResolve); } } } diff --git a/compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt b/compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt new file mode 100644 index 00000000000..e6bb152639b --- /dev/null +++ b/compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt @@ -0,0 +1,4 @@ +import kotlin.Double +import kotlin.List + +class List {} diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index a63240f5042..b0f16148b39 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -3413,6 +3413,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest("compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt"); } + @TestMetadata("ImportsHiddenByDefinitionInTheSameFile.kt") + public void testImportsHiddenByDefinitionInTheSameFile() throws Exception { + doTest("compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt"); + } + @TestMetadata("RenameOnImport.kt") public void testRenameOnImport() throws Exception { doTest("compiler/testData/diagnostics/tests/imports/RenameOnImport.kt");