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

Deprecate visibility of static members inherited from Java

Browse Source 
Now they are not visible by short name through companion objects, just
like classifiers in KT-21515

^KT-25333 In progress
This commit is contained in:
Dmitry Savvinov
2018-07-06 13:23:10 +03:00
committed by Dmitry Savvinov
parent 63202fe560
commit 76c651421b
45 changed files with 1206 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
Generated
+60 -15
View File
@@ -13870,6 +13870,26 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
runTest("compiler/testData/diagnostics/tests/objects/kt21515/inheritedFromDeprecatedWithQualificationOld.kt");
}
@TestMetadata("staticsFromJavaNew.kt")
public void testStaticsFromJavaNew() throws Exception {
runTest("compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaNew.kt");
}
@TestMetadata("staticsFromJavaOld.kt")
public void testStaticsFromJavaOld() throws Exception {
runTest("compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaOld.kt");
}
@TestMetadata("staticsFromJavaWithQualificationNew.kt")
public void testStaticsFromJavaWithQualificationNew() throws Exception {
runTest("compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaWithQualificationNew.kt");
}
@TestMetadata("staticsFromJavaWithQualificationOld.kt")
public void testStaticsFromJavaWithQualificationOld() throws Exception {
runTest("compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaWithQualificationOld.kt");
}
@TestMetadata("useDeprecatedConstructorNew.kt")
public void testUseDeprecatedConstructorNew() throws Exception {
runTest("compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorNew.kt");
@@ -17903,33 +17923,58 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
@TestMetadata("accessToStaticMembersOfParentClass.kt")
public void testAccessToStaticMembersOfParentClass() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass.kt");
@TestMetadata("accessToStaticMembersOfParentClassJKJ_after.kt")
public void testAccessToStaticMembersOfParentClassJKJ_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ_after.kt");
}
@TestMetadata("accessToStaticMembersOfParentClassJKJ.kt")
public void testAccessToStaticMembersOfParentClassJKJ() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ.kt");
@TestMetadata("accessToStaticMembersOfParentClassJKJ_before.kt")
public void testAccessToStaticMembersOfParentClassJKJ_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ_before.kt");
}
@TestMetadata("accessToStaticMembersOfParentClass_after.kt")
public void testAccessToStaticMembersOfParentClass_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass_after.kt");
}
@TestMetadata("accessToStaticMembersOfParentClass_before.kt")
public void testAccessToStaticMembersOfParentClass_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass_before.kt");
}
public void testAllFilesPresentInCompanionObject() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("inheritFromContainingClass.kt")
public void testInheritFromContainingClass() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass.kt");
@TestMetadata("inheritFromContainingClass_after.kt")
public void testInheritFromContainingClass_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.kt");
}
@TestMetadata("inheritFromJava.kt")
public void testInheritFromJava() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava.kt");
@TestMetadata("inheritFromContainingClass_before.kt")
public void testInheritFromContainingClass_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.kt");
}
@TestMetadata("inheritFromJavaAfterKotlin.kt")
public void testInheritFromJavaAfterKotlin() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin.kt");
@TestMetadata("inheritFromJavaAfterKotlin_after.kt")
public void testInheritFromJavaAfterKotlin_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_after.kt");
}
@TestMetadata("inheritFromJavaAfterKotlin_before.kt")
public void testInheritFromJavaAfterKotlin_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_before.kt");
}
@TestMetadata("inheritFromJava_after.kt")
public void testInheritFromJava_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava_after.kt");
}
@TestMetadata("inheritFromJava_before.kt")
public void testInheritFromJava_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava_before.kt");
}
}
}