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

Do not report redeclaration when outer class and default object's members clash

Browse Source 
Previously we prohibited classes and properties with the same name (now it's unnecessary)
Add test for backends that they support qualified (by default object name) member references inside class body
This commit is contained in:
Pavel V. Talanov
2015-03-11 14:05:35 +03:00
parent 76832df933
commit 2987e72d29
19 changed files with 172 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+18 -12
View File
@@ -9195,18 +9195,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("EnumEntriesAndClassObjectMembers.kt")
public void testEnumEntriesAndClassObjectMembers() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.kt");
doTest(fileName);
}
@TestMetadata("kt2247.kt")
public void testKt2247() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2247.kt");
doTest(fileName);
}
@TestMetadata("kt2418.kt")
public void testKt2418() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2418.kt");
@@ -9231,6 +9219,18 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("NoRedeclarationForClassesInDefaultObject.kt")
public void testNoRedeclarationForClassesInDefaultObject() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt");
doTest(fileName);
}
@TestMetadata("NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt")
public void testNoRedeclarationForEnumEntriesAndDefaultObjectMembers() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt");
doTest(fileName);
}
@TestMetadata("PropertyAndFunInClass.kt")
public void testPropertyAndFunInClass() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.kt");
@@ -9243,6 +9243,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("RedeclarationInDefaultObject.kt")
public void testRedeclarationInDefaultObject() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt");
doTest(fileName);
}
@TestMetadata("RedeclarationInMultiFile.kt")
public void testRedeclarationInMultiFile() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt");
compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
+6
View File
@@ -1007,6 +1007,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("defaultObjectSameNamesAsInOuter.kt")
public void testDefaultObjectSameNamesAsInOuter() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt");
doTest(fileName);
}
@TestMetadata("delegation2.kt")
public void testDelegation2() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation2.kt");