Do not create LightClasses for kt files as sources for libraries

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java

@@ -34,15 +34,12 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.java.JavaPsiFacadeKotlinHacks;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.util.QualifiedNamesUtil;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import static org.jetbrains.jet.codegen.CodegenUtil.getLocalNameForObject;
-
 public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacadeKotlinHacks.KotlinFinderMarker {
 
     @NotNull
@@ -102,8 +99,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
 
         for (JetClassOrObject declaration : classOrObjectDeclarations) {
             if (!(declaration instanceof JetEnumEntry)) {
-                KotlinLightClassForExplicitDeclaration
-                        lightClass = KotlinLightClassForExplicitDeclaration.create(psiManager, qualifiedName, declaration);
+                PsiClass lightClass = LightClassUtil.createLightClass(declaration);
                 if (lightClass != null) {
                     answer.add(lightClass);
                 }
@@ -129,18 +125,6 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
         }
     }
 
-    @Nullable
-    private static String getLocalName(JetDeclaration declaration) {
-        String given = declaration.getName();
-        if (given != null) return given;
-
-        if (declaration instanceof JetObjectDeclaration) {
-            return getLocalNameForObject((JetObjectDeclaration) declaration);
-        }
-
-        return null;
-    }
-
     @NotNull
     @Override
     public Set<String> getClassNames(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) {
@@ -205,13 +189,9 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
 
         Collection<JetClassOrObject> declarations = lightClassGenerationSupport.findClassOrObjectDeclarationsInPackage(packageFQN, scope);
         for (JetClassOrObject declaration : declarations) {
-            String localName = getLocalName(declaration);
-            if (localName != null) {
-                KotlinLightClassForExplicitDeclaration aClass = KotlinLightClassForExplicitDeclaration
-                        .create(psiManager, packageFQN.child(Name.identifier(localName)), declaration);
-                if (aClass != null) {
-                    answer.add(aClass);
-                }
+            PsiClass aClass = LightClassUtil.createLightClass(declaration);
+            if (aClass != null) {
+                answer.add(aClass);
             }
         }
 

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java

@@ -39,10 +39,12 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.JetJavaMirrorMarker;
+import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
@@ -59,11 +61,15 @@ public class KotlinLightClassForExplicitDeclaration extends AbstractLightClass i
     private final static Key<CachedValue<PsiJavaFileStub>> JAVA_API_STUB = Key.create("JAVA_API_STUB");
 
     @Nullable
-    public static KotlinLightClassForExplicitDeclaration create(@NotNull PsiManager manager, @NotNull FqName qualifiedName, @NotNull JetClassOrObject classOrObject) {
+    public static KotlinLightClassForExplicitDeclaration create(@NotNull PsiManager manager, @NotNull JetClassOrObject classOrObject) {
         if (LightClassUtil.belongsToKotlinBuiltIns((JetFile) classOrObject.getContainingFile())) {
             return null;
         }
-        return new KotlinLightClassForExplicitDeclaration(manager, qualifiedName, classOrObject);
+
+        JvmClassName jvmClassName = PsiCodegenPredictor.getPredefinedJvmClassName(classOrObject);
+        if (jvmClassName == null) return null;
+
+        return new KotlinLightClassForExplicitDeclaration(manager, jvmClassName.getFqName(), classOrObject);
     }
 
     private final FqName classFqName; // FqName of (possibly inner) class

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java

@@ -18,8 +18,10 @@ package org.jetbrains.jet.asJava;
 
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -60,4 +62,7 @@ public abstract class LightClassGenerationSupport {
 
     @NotNull
     public abstract Collection<FqName> getSubPackages(@NotNull FqName fqn, @NotNull GlobalSearchScope scope);
+
+    @Nullable
+    public abstract PsiClass getPsiClass(@NotNull JetClassOrObject classOrObject);
 }

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java

@@ -111,13 +111,9 @@ public class LightClassUtil {
     }
 
     @Nullable
-    public static KotlinLightClass createLightClass(@Nullable JetClassOrObject classOrObject) {
+    public static PsiClass createLightClass(@Nullable JetClassOrObject classOrObject) {
         if (classOrObject == null) return null;
-
-        JvmClassName jvmClassName = PsiCodegenPredictor.getPredefinedJvmClassName(classOrObject);
-        if (jvmClassName == null) return null;
-
-        return  KotlinLightClassForExplicitDeclaration.create(classOrObject.getManager(), jvmClassName.getFqName(), classOrObject);
+        return LightClassGenerationSupport.getInstance(classOrObject.getProject()).getPsiClass(classOrObject);
     }
 
     @Nullable