Current package members to have less priority than explicit imports

This commit is contained in:
Valentin Kipyatkov
2015-01-15 20:54:35 +03:00
parent 59f24020b2
commit 929d6b885d
14 changed files with 188 additions and 93 deletions
@@ -4733,6 +4733,18 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("CurrentPackageAndAllUnderImport.kt")
public void testCurrentPackageAndAllUnderImport() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CurrentPackageAndAllUnderImport.kt");
doTest(fileName);
}
@TestMetadata("CurrentPackageAndExplicitImport.kt")
public void testCurrentPackageAndExplicitImport() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CurrentPackageAndExplicitImport.kt");
doTest(fileName);
}
@TestMetadata("DontImportRootScope.kt")
public void testDontImportRootScope() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/DontImportRootScope.kt");
@@ -4775,6 +4787,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("ImportHidingDefinitionInTheSameFile.kt")
public void testImportHidingDefinitionInTheSameFile() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportHidingDefinitionInTheSameFile.kt");
doTest(fileName);
}
@TestMetadata("ImportObjectAndUseAsSupertype.kt")
public void testImportObjectAndUseAsSupertype() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.kt");
@@ -4817,12 +4835,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("ImportsHiddenByDefinitionInTheSameFile.kt")
public void testImportsHiddenByDefinitionInTheSameFile() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt");
doTest(fileName);
}
@TestMetadata("ImportsUselessSimpleImport.kt")
public void testImportsUselessSimpleImport() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsUselessSimpleImport.kt");