Post 1.2.31 review fixes

Author: Kordyjan

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/asJava/KotlinLightClassGeneration.kt

@@ -69,7 +69,7 @@ object KotlinLightClassGeneration {
                     override fun shouldGenerateScript(script: KtScript): Boolean = false
 
                     override fun shouldGenerateClassMembers(processingClassOrObject: KtClassOrObject): Boolean {
-						return shouldGenerateClass(processingClassOrObject) ||
+						return super.shouldGenerateClassMembers(processingClassOrObject) ||
 								processingClassOrObject.hasModifier(KtTokens.COMPANION_KEYWORD)
 					}
 			}).build()

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/KotlinPackagePartProvider.kt

@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.name.ClassId
 
 public class KotlinPackagePartProvider(private val environment: KotlinCommonEnvironment) : PackagePartProvider {
-    private data class ModuleMappingInfo(val root: VirtualFile, val mapping: ModuleMapping)
+    private data class ModuleMappingInfo(val root: VirtualFile, val mapping: ModuleMapping, val name: String)
 
     private val notLoadedRoots by lazy(LazyThreadSafetyMode.NONE) {
             environment.getRoots()
@@ -42,15 +42,18 @@ public class KotlinPackagePartProvider(private val environment: KotlinCommonEnvi
 
     private val deserializationConfiguration = CompilerDeserializationConfiguration(LanguageVersionSettingsImpl.DEFAULT)
 
-	override fun getAnnotationsOnBinaryModule(moduleName: String): List<ClassId> = emptyList()
+    override fun getAnnotationsOnBinaryModule(moduleName: String): List<ClassId> =
+            loadedModules.mapNotNull { (_, mapping, name) ->
+                mapping.moduleData.annotations.takeIf { name == moduleName }
+            }.flatten()
 
     override fun findPackageParts(packageFqName: String): List<String> {
         val rootToPackageParts = getPackageParts(packageFqName)
         if (rootToPackageParts.isEmpty()) return emptyList()
 
         val result = linkedSetOf<String>()
         val visitedMultifileFacades = linkedSetOf<String>()
-        for ((virtualFile, packageParts) in rootToPackageParts) {
+        for ((_, packageParts) in rootToPackageParts) {
             for (name in packageParts.parts) {
                 val facadeName = packageParts.getMultifileFacadeName(name)
                 if (facadeName == null || facadeName !in visitedMultifileFacades) {
@@ -96,15 +99,15 @@ public class KotlinPackagePartProvider(private val environment: KotlinCommonEnvi
         for (root in relevantRoots) {
             val metaInf = root.findChild("META-INF") ?: continue
             val moduleFiles = metaInf.children.filter { it.name.endsWith(ModuleMapping.MAPPING_FILE_EXT) }
-            for (moduleFile in moduleFiles) {
+            for (moduleFile: VirtualFile in moduleFiles) {
                 val mapping = try {
                     ModuleMapping.create(moduleFile.contentsToByteArray(), moduleFile.toString(), deserializationConfiguration)
                 }
                 catch (e: EOFException) {
                     throw RuntimeException("Error on reading package parts for '$packageFqName' package in '$moduleFile', " +
                                            "roots: $notLoadedRoots", e)
                 }
-                loadedModules.add(ModuleMappingInfo(root, mapping))
+                loadedModules.add(ModuleMappingInfo(root, mapping, moduleFile.nameWithoutExtension))
             }
         }
     }

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaReferenceAnnotationArgument.java

@@ -20,8 +20,9 @@
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.load.java.structure.JavaEnumValueAnnotationArgument;
 import org.jetbrains.kotlin.load.java.structure.JavaField;
-import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.name.ClassId;
+import org.jetbrains.kotlin.name.FqName;
+import org.jetbrains.kotlin.name.Name;
 
 public class EclipseJavaReferenceAnnotationArgument extends EclipseJavaAnnotationArgument<IVariableBinding>
         implements JavaEnumValueAnnotationArgument {
@@ -44,6 +45,7 @@ public Name getEntryName() {
     @Override
     @Nullable
     public ClassId getEnumClassId() {
-        return null;
+        String className = getBinding().getType().getQualifiedName();
+        return ClassId.topLevel(new FqName(className));
     }
 }

kotlin-eclipse-ui-test/src/org/jetbrains/kotlin/checkers/KotlinDiagnosticsTestCase.java

@@ -561,7 +561,7 @@ private Set<ActualDiagnostic> computeJvmSignatureDiagnostics(BindingContext bind
                 jvmSignatureDiagnostics.addAll(CollectionsKt.map(diagnostics.forElement(declaration), new Function1<Diagnostic, ActualDiagnostic>() {
                     @Override
                     public ActualDiagnostic invoke(Diagnostic arg0) {
-                        return new ActualDiagnostic(arg0, null, true);
+                        return new ActualDiagnostic(arg0, null, false);
                     }
                 }));