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

Copy to interface just companion object public const properties

Browse Source
This commit is contained in:
Michael Bogdanov
2015-10-07 18:02:02 +03:00
parent a9aa2bc147
commit 12afbffb09
33 changed files with 111 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
+2 -2
View File
@@ -72,8 +72,8 @@ public abstract class BaseDiagnosticsTest extends
public static final String CHECK_TYPE_IMPORT = "import " + CHECK_TYPE_PACKAGE + ".*";
public static final String EXPLICIT_FLEXIBLE_TYPES_DIRECTIVE = "EXPLICIT_FLEXIBLE_TYPES";
public static final String EXPLICIT_FLEXIBLE_PACKAGE = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.getPackageFqName().asString();
public static final String EXPLICIT_FLEXIBLE_CLASS_NAME = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.getRelativeClassName().asString();
public static final String EXPLICIT_FLEXIBLE_PACKAGE = Flexibility.Companion.getFLEXIBLE_TYPE_CLASSIFIER().getPackageFqName().asString();
public static final String EXPLICIT_FLEXIBLE_CLASS_NAME = Flexibility.Companion.getFLEXIBLE_TYPE_CLASSIFIER().getRelativeClassName().asString();
private static final String EXPLICIT_FLEXIBLE_TYPES_DECLARATIONS
= "\npackage " + EXPLICIT_FLEXIBLE_PACKAGE +
"\npublic class " + EXPLICIT_FLEXIBLE_CLASS_NAME + "<L, U>";
compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class GenerationUtils {
@NotNull
public static GenerationState compileManyFilesGetGenerationStateForTest(@NotNull Project project, @NotNull List<JetFile> files) {
return compileManyFilesGetGenerationStateForTest(project, files, PackagePartProvider.EMPTY);
return compileManyFilesGetGenerationStateForTest(project, files, PackagePartProvider.Companion.getEMPTY());
}
@NotNull
compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
+12
View File
@@ -779,6 +779,12 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
doTest(fileName);
}
@TestMetadata("internalConstVal.kt")
public void testInternalConstVal() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalConstVal.kt");
doTest(fileName);
}
@TestMetadata("internalVal.kt")
public void testInternalVal() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVal.kt");
@@ -827,6 +833,12 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
doTest(fileName);
}
@TestMetadata("publicConstVal.kt")
public void testPublicConstVal() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicConstVal.kt");
doTest(fileName);
}
@TestMetadata("publicVal.kt")
public void testPublicVal() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVal.kt");
compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java
+3 -3
View File
@@ -37,7 +37,7 @@ public class JvmResolveUtil {
public static String TEST_MODULE_NAME = "java-integration-test";
@NotNull
public static AnalysisResult analyzeOneFileWithJavaIntegrationAndCheckForErrors(@NotNull JetFile file) {
return analyzeOneFileWithJavaIntegrationAndCheckForErrors(file, PackagePartProvider.EMPTY);
return analyzeOneFileWithJavaIntegrationAndCheckForErrors(file, PackagePartProvider.Companion.getEMPTY());
}
@NotNull
@@ -63,7 +63,7 @@ public class JvmResolveUtil {
@NotNull
public static AnalysisResult analyzeOneFileWithJavaIntegration(@NotNull JetFile file) {
return analyzeOneFileWithJavaIntegration(file, PackagePartProvider.EMPTY);
return analyzeOneFileWithJavaIntegration(file, PackagePartProvider.Companion.getEMPTY());
}
@NotNull
@@ -71,7 +71,7 @@ public class JvmResolveUtil {
@NotNull Project project,
@NotNull Collection<JetFile> files
) {
return analyzeFilesWithJavaIntegrationAndCheckForErrors(project, files, PackagePartProvider.EMPTY);
return analyzeFilesWithJavaIntegrationAndCheckForErrors(project, files, PackagePartProvider.Companion.getEMPTY());
}
@NotNull
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class JetTestUtils {
@NotNull
@Override
public Diagnostics getDiagnostics() {
return Diagnostics.EMPTY;
return Diagnostics.Companion.getEMPTY();
}
@Override