azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USELESS_HIDDEN_IMPORT diagnostic fixed for LAZY mode

Browse Source
This commit is contained in:
Andrey Breslav
2014-04-09 14:06:20 +04:00
parent a3638eacef
commit f0a29f190b
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java
+2 -1
View File
@@ -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);
}
}
}
compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt
+4
View File
@@ -0,0 +1,4 @@
import kotlin.Double
import <!USELESS_HIDDEN_IMPORT!>kotlin.List<!>
class List {}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -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");