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

Respect resolve scope when adapting java types completion

Browse Source 
Do not suggest classes from unrelated modules
This commit is contained in:
Pavel V. Talanov
2014-10-09 18:46:16 +04:00
parent b6d76157c4
commit ebbd08a546
5 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt
+1 -1
View File
@@ -52,7 +52,7 @@ class TypesCompletion(val parameters: CompletionParameters, val resolveSession:
* Add java elements with performing conversion to kotlin elements if necessary. * Add java elements with performing conversion to kotlin elements if necessary.
*/ */
private fun addAdaptedJavaCompletion(result: LookupElementsCollector) { 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?) { override fun consume(lookupElement: LookupElement?) {
if (lookupElement is JavaPsiClassReferenceElement) { if (lookupElement is JavaPsiClassReferenceElement) {
val psiClass = lookupElement.getObject() val psiClass = lookupElement.getObject()
idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/normalname.groovy
+2
View File
@@ -1,2 +1,4 @@
package nondefault
public class TestGroovyNormal { public class TestGroovyNormal {
} }
idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-no-classes.groovy
+2
View File
@@ -1,3 +1,5 @@
package nondefault
def method() { def method() {
} }
idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/script-file-with-class.groovy
+2
View File
@@ -1,2 +1,4 @@
package nondefault
public class TestGroovyScript { public class TestGroovyScript {
} }
idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt
+2
View File
@@ -12,3 +12,5 @@ class Some {
object NamedObjectInClassObject object NamedObjectInClassObject
} }
} }
// ALLOW_AST_ACCESS