KT-658 Show types in IDEA auto assist for kotlin

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java

@@ -267,7 +267,7 @@ public class JavaDescriptorResolver {
         return javaFacade.findClass(qualifiedName, javaSearchScope);
     }
 
-    private PsiPackage findPackage(String qualifiedName) {
+    /*package*/ PsiPackage findPackage(String qualifiedName) {
         return javaFacade.findPackage(qualifiedName);
     }
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java

@@ -1,10 +1,17 @@
 package org.jetbrains.jet.lang.resolve.java;
 
+import com.google.common.collect.Sets;
 import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiModifier;
+import com.intellij.psi.PsiPackage;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 
@@ -14,11 +21,13 @@ import java.util.Set;
 public class JavaPackageScope extends JetScopeImpl {
     private final JavaSemanticServices semanticServices;
     private final DeclarationDescriptor containingDescriptor;
-    private final String packagePrefix;
+    private final String packageFQN;
+
+    private Collection<DeclarationDescriptor> allDescriptors;
 
     public JavaPackageScope(@NotNull String packageFQN, DeclarationDescriptor containingDescriptor, JavaSemanticServices semanticServices) {
         this.semanticServices = semanticServices;
-        this.packagePrefix = packageFQN.isEmpty() ? "" : packageFQN + ".";
+        this.packageFQN = packageFQN;
         this.containingDescriptor = containingDescriptor;
     }
 
@@ -36,7 +45,7 @@ public class JavaPackageScope extends JetScopeImpl {
     @Override
     public Set<FunctionDescriptor> getFunctions(@NotNull String name) {
         // TODO: what is GlobalSearchScope
-        PsiClass psiClass = semanticServices.getDescriptorResolver().javaFacade.findClass(packagePrefix + "namespace");
+        PsiClass psiClass = semanticServices.getDescriptorResolver().javaFacade.findClass(getQualifiedName("namespace"));
         if (psiClass == null) {
             return Collections.emptySet();
         }
@@ -54,7 +63,35 @@ public class JavaPackageScope extends JetScopeImpl {
         return containingDescriptor;
     }
 
-    private String getQualifiedName(String name) {
-        return packagePrefix + name;
+    @NotNull
+    @Override
+    public Collection<DeclarationDescriptor> getAllDescriptors() {
+        if (allDescriptors == null) {
+            allDescriptors = Sets.newHashSet();
+
+            final PsiPackage javaPackage = semanticServices.getDescriptorResolver().findPackage(packageFQN);
+
+            if (javaPackage != null) {
+                final JavaDescriptorResolver descriptorResolver = semanticServices.getDescriptorResolver();
+
+                for (PsiPackage psiSubPackage : javaPackage.getSubPackages()) {
+                    allDescriptors.add(descriptorResolver.resolveNamespace(psiSubPackage.getQualifiedName()));
+                }
+
+                for (PsiClass psiClass : javaPackage.getClasses()) {
+                    if (psiClass.hasModifierProperty(PsiModifier.PUBLIC)) {
+                        allDescriptors.add(descriptorResolver.resolveClass(psiClass));
+                    }
+                }
+            }
+        }
+
+        return allDescriptors;
     }
+
+    private String getQualifiedName(String name) {
+        return (packageFQN.isEmpty() ? "" : packageFQN + ".") + name;
+    }
+
+
 }