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

Move SAM adapters from static scope to synthetic one

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-05-02 14:25:48 +03:00
parent 2ff28ebced
commit 95ede7fb67
37 changed files with 281 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+18
View File
@@ -12489,12 +12489,30 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("inheritedStaticSam.kt")
public void testInheritedStaticSam() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/sam/inheritedStaticSam.kt");
doTest(fileName);
}
@TestMetadata("samOnTypeParameter.kt")
public void testSamOnTypeParameter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/sam/samOnTypeParameter.kt");
doTest(fileName);
}
@TestMetadata("staticSamFromImportWithStar.kt")
public void testStaticSamFromImportWithStar() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/sam/staticSamFromImportWithStar.kt");
doTest(fileName);
}
@TestMetadata("staticSamWithExplicitImport.kt")
public void testStaticSamWithExplicitImport() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/sam/staticSamWithExplicitImport.kt");
doTest(fileName);
}
@TestMetadata("typeInferenceOnSamAdapters.kt")
public void testTypeInferenceOnSamAdapters() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/sam/typeInferenceOnSamAdapters.kt");
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
+6
View File
@@ -1613,6 +1613,12 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
doTest(fileName);
}
@TestMetadata("samAgainstFunctionalType.kt")
public void testSamAgainstFunctionalType() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt");
doTest(fileName);
}
@TestMetadata("samConstructorVsFun.kt")
public void testSamConstructorVsFun() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/samConstructorVsFun.kt");
compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java
+6
View File
@@ -1357,6 +1357,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTestCompiledJava(fileName);
}
@TestMetadata("FakeStaticOverrides.java")
public void testFakeStaticOverrides() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.java");
doTestCompiledJava(fileName);
}
@TestMetadata("FilenameFilter.java")
public void testFilenameFilter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java");
compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaWithFastClassReadingTestGenerated.java
+6
View File
@@ -1355,6 +1355,12 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW
doTestCompiledJava(fileName);
}
@TestMetadata("FakeStaticOverrides.java")
public void testFakeStaticOverrides() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.java");
doTestCompiledJava(fileName);
}
@TestMetadata("FilenameFilter.java")
public void testFilenameFilter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java");