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

[KT-4124] Add more generated tests from Java backend. Fix support of deeply nested classes (i.e. A.B.C) and nested enums.

Browse Source
This commit is contained in:
Alexey Andreev
2016-02-10 16:31:40 +03:00
parent c48c6bc055
commit 8f74720973
8 changed files with 1697 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java
+8 -3
View File
@@ -61,9 +61,14 @@ public final class ReferenceTranslator {
}
if (descriptor instanceof ClassDescriptor) {
ClassDescriptor entryClass = (ClassDescriptor) descriptor;
if (entryClass.getKind() == ClassKind.ENUM_ENTRY && !AnnotationsUtils.isNativeObject(entryClass)) {
DeclarationDescriptor enumClass = entryClass.getContainingDeclaration();
qualifier = Namer.getCompanionObjectAccessor(translateAsFQReference(enumClass, context));
if (entryClass.getKind() == ClassKind.ENUM_ENTRY) {
if (!AnnotationsUtils.isNativeObject(entryClass)) {
DeclarationDescriptor enumClass = entryClass.getContainingDeclaration();
qualifier = Namer.getCompanionObjectAccessor(translateAsFQReference(enumClass, context));
}
}
else if (entryClass.getKind() == ClassKind.CLASS || entryClass.getKind() == ClassKind.ENUM_CLASS) {
qualifier = null;
}
}