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

Do not try to write KotlinPackage annotation if package class is not generated

Browse Source
This commit is contained in:
Pavel V. Talanov
2013-08-27 15:22:05 +04:00
parent 16d656c7af
commit 7920321e3d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+7 -4
View File
@@ -102,8 +102,8 @@ public class NamespaceCodegen extends MemberCodegen {
public void generate(@NotNull CompilationErrorHandler errorHandler) { public void generate(@NotNull CompilationErrorHandler errorHandler) {
List<MemberMap> namespaceMembers = new ArrayList<MemberMap>(files.size() + 1); List<MemberMap> namespaceMembers = new ArrayList<MemberMap>(files.size() + 1);
boolean shouldGeneratePackageClass = shouldGenerateNSClass(files);
if (shouldGenerateNSClass(files)) { if (shouldGeneratePackageClass) {
namespaceMembers.add(v.getClassBuilder().getMemberMap()); namespaceMembers.add(v.getClassBuilder().getMemberMap());
} }
@@ -128,9 +128,12 @@ public class NamespaceCodegen extends MemberCodegen {
} }
} }
writeKotlinPackageAnnotationIfNeeded(MemberMap.union(namespaceMembers)); if (shouldGeneratePackageClass) {
writeKotlinPackageAnnotationIfNeeded(MemberMap.union(namespaceMembers));
}
assert v.isActivated() == shouldGenerateNSClass(files) : "Different algorithms for generating namespace class and for heuristics"; assert v.isActivated() == shouldGeneratePackageClass :
"Different algorithms for generating namespace class and for heuristics for: " + name.asString();
} }
private void writeKotlinPackageAnnotationIfNeeded(@NotNull MemberMap members) { private void writeKotlinPackageAnnotationIfNeeded(@NotNull MemberMap members) {