From ebbd08a5467a4bc3b47220ba2b7eee16d3aac649 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 9 Oct 2014 18:46:16 +0400
Subject: [PATCH] Respect resolve scope when adapting java types completion

Do not suggest classes from unrelated modules
---
 idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt | 2 +-
 .../normalname.groovy                                           | 2 ++
 .../script-file-no-classes.groovy                               | 2 ++
 .../script-file-with-class.groovy                               | 2 ++
 .../multifile/NotImportedObject/NotImportedObject.dependency.kt | 2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt
index c48e6168e39..df866a2819a 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt
@@ -52,7 +52,7 @@ class TypesCompletion(val parameters: CompletionParameters, val resolveSession:
      * Add java elements with performing conversion to kotlin elements if necessary.
      */
     private fun addAdaptedJavaCompletion(result: LookupElementsCollector) {
-        JavaClassNameCompletionContributor.addAllClasses(parameters, false, prefixMatcher, object : Consumer<LookupElement> {
+        JavaClassNameCompletionContributor.addAllClasses(parameters, true, prefixMatcher, object : Consumer<LookupElement> {
             override fun consume(lookupElement: LookupElement?) {
                 if (lookupElement is JavaPsiClassReferenceElement) {
                     val psiClass = lookupElement.getObject()
diff --git a/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/normalname.groovy b/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/normalname.groovy
index d4b65fb0eff..98730f63b15 100644
--- a/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/normalname.groovy
+++ b/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/normalname.groovy
@@ -1,2 +1,4 @@
+package nondefault
+
 public class TestGroovyNormal {
 }
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-no-classes.groovy b/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-no-classes.groovy
index 28e1317297d..f2b42e48754 100644
--- a/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-no-classes.groovy
+++ b/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-no-classes.groovy
@@ -1,3 +1,5 @@
+package nondefault
+
 def method() {
 
 }
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-with-class.groovy b/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-with-class.groovy
index dde56e81b0a..f2566b1fd1e 100644
--- a/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-with-class.groovy
+++ b/idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-with-class.groovy
@@ -1,2 +1,4 @@
+package nondefault
+
 public class TestGroovyScript {
 }
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt b/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt
index 0361250a3cd..df943f44992 100644
--- a/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt
+++ b/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt
@@ -12,3 +12,5 @@ class Some {
     object NamedObjectInClassObject
   }
 }
+
+// ALLOW_AST_ACCESS
\ No newline at end of file