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

Kapt: Filter out non-package all-under imports whenever possible in "correctErrorTypes" (KT-21359)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-11-22 00:25:45 +09:00
parent 00bb38fbb1
commit 2e17c0b7f1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
+2 -1
View File
@@ -213,7 +213,8 @@ class ClassFileToSourceStubConverter(
val importedReference = getReferenceExpression(importDirective.importedReference) val importedReference = getReferenceExpression(importDirective.importedReference)
?.let { kaptContext.bindingContext[BindingContext.REFERENCE_TARGET, it] } ?.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()) val importedExpr = treeMaker.FqName(importedFqName.asString())
plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.kt
Vendored
+1
View File
@@ -4,6 +4,7 @@
@file:Suppress("ENUM_ENTRY_AS_TYPE", "UNRESOLVED_REFERENCE") @file:Suppress("ENUM_ENTRY_AS_TYPE", "UNRESOLVED_REFERENCE")
import java.util.Date as MyDate import java.util.Date as MyDate
import java.util.concurrent.TimeUnit as MyTimeUnit import java.util.concurrent.TimeUnit as MyTimeUnit
import java.util.concurrent.TimeUnit.*
import java.util.concurrent.TimeUnit.MICROSECONDS as MyMicroseconds import java.util.concurrent.TimeUnit.MICROSECONDS as MyMicroseconds
import a.b.ABC as MyABC import a.b.ABC as MyABC
import bcd as MyBCD import bcd as MyBCD