From 59b66e75796cf5cb12f3c21e3a3edd6affff0454 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 20 Oct 2014 20:36:43 +0400 Subject: [PATCH] Fixed KT-6074 Package facade classes are shown in completion in kotlin files #KT-6074 Fixed --- .../org/jetbrains/jet/plugin/completion/TypesCompletion.kt | 2 +- .../completion/basic/common/NoPackageFacadeClasses.kt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 idea/testData/completion/basic/common/NoPackageFacadeClasses.kt diff --git a/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt index 5873fd81baf..05c04fb86b7 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt @@ -59,7 +59,7 @@ class TypesCompletion(val parameters: CompletionParameters, if (JavaResolverPsiUtils.isCompiledKotlinClass(psiClass)) { addLookupElementForCompiledKotlinClass(psiClass, collector) } - else { + else if (!JavaResolverPsiUtils.isCompiledKotlinPackageClass(psiClass)) { collector.addElementWithAutoInsertionSuppressed(KotlinLookupElementFactory.createLookupElementForJavaClass(psiClass)) } } diff --git a/idea/testData/completion/basic/common/NoPackageFacadeClasses.kt b/idea/testData/completion/basic/common/NoPackageFacadeClasses.kt new file mode 100644 index 00000000000..cd05e01ecf7 --- /dev/null +++ b/idea/testData/completion/basic/common/NoPackageFacadeClasses.kt @@ -0,0 +1,5 @@ +fun foo() { + UtilPack +} + +// ABSENT: UtilPackage