From 2e17c0b7f1a22724583824b5202868e64cc7e5bb Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 22 Nov 2017 00:25:45 +0900 Subject: [PATCH] Kapt: Filter out non-package all-under imports whenever possible in "correctErrorTypes" (KT-21359) --- .../kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt | 3 ++- .../kapt3/kapt3-compiler/testData/converter/aliasedImports.kt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt index 6bfba011076..27d0287d142 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt @@ -213,7 +213,8 @@ class ClassFileToSourceStubConverter( val importedReference = getReferenceExpression(importDirective.importedReference) ?.let { kaptContext.bindingContext[BindingContext.REFERENCE_TARGET, it] } - if (importedReference is CallableDescriptor) continue + if (importedReference is CallableDescriptor + || (importDirective.isAllUnder && importedReference is ClassifierDescriptor)) continue val importedExpr = treeMaker.FqName(importedFqName.asString()) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.kt b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.kt index 289773391f0..3ec3c0c25da 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.kt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.kt @@ -4,6 +4,7 @@ @file:Suppress("ENUM_ENTRY_AS_TYPE", "UNRESOLVED_REFERENCE") import java.util.Date as MyDate import java.util.concurrent.TimeUnit as MyTimeUnit +import java.util.concurrent.TimeUnit.* import java.util.concurrent.TimeUnit.MICROSECONDS as MyMicroseconds import a.b.ABC as MyABC import bcd as MyBCD