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

KT-11588 Type aliases

Browse Source 
Light class generation: do not fail on type aliases
TODO: actual binary representation for type aliases
This commit is contained in:
Dmitry Petrov
2016-05-10 14:21:31 +03:00
parent a4406687f1
commit 59472927cd
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
+3 -5
View File
@@ -22,10 +22,7 @@ import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.KtNamedFunction
import org.jetbrains.kotlin.psi.KtProperty
import org.jetbrains.kotlin.psi.KtScript
import java.util.* import java.util.*
object PackagePartClassUtils { object PackagePartClassUtils {
@@ -64,7 +61,8 @@ object PackagePartClassUtils {
file.declarations.any { file.declarations.any {
it is KtProperty || it is KtProperty ||
it is KtNamedFunction || it is KtNamedFunction ||
it is KtScript it is KtScript ||
it is KtTypeAlias
} }
@JvmStatic fun getFilePartShortName(fileName: String): String = @JvmStatic fun getFilePartShortName(fileName: String): String =
compiler/testData/diagnostics/tests/typealias/aliasesOnly.kt
Vendored
+1
View File
@@ -0,0 +1 @@
typealias S = String
compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public typealias S = kotlin.String
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+6
View File
@@ -19016,6 +19016,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Typealias extends AbstractDiagnosticsTest { public static class Typealias extends AbstractDiagnosticsTest {
@TestMetadata("aliasesOnly.kt")
public void testAliasesOnly() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typealias/aliasesOnly.kt");
doTest(fileName);
}
public void testAllFilesPresentInTypealias() throws Exception { public void testAllFilesPresentInTypealias() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/typealias"), Pattern.compile("^(.+)\\.kt$"), true); KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/typealias"), Pattern.compile("^(.+)\\.kt$"), true);
} }