Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More jdeps fixes #484

Merged
merged 7 commits into from
Feb 18, 2021
Merged

More jdeps fixes #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6c25c5
* Support property annotations
jongerrish Feb 17, 2021
379b564
* Property reference to class with super type should collect super re…
jongerrish Feb 17, 2021
92a8eb4
* Support functions imported from objects.
jongerrish Feb 17, 2021
0140692
* Support enum property references
jongerrish Feb 17, 2021
45398c5
* Support annotations with target = FIELD are located on backing field.
jongerrish Feb 17, 2021
fb1e432
* Support indirect property references
jongerrish Feb 17, 2021
3fbd8b7
* Support nested type parameters
jongerrish Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions src/main/kotlin/io/bazel/kotlin/plugin/jdeps/JdepsGenExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.FunctionImportedFromObject
import org.jetbrains.kotlin.resolve.PropertyImportedFromObject
import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker
import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext
Expand Down Expand Up @@ -127,6 +128,12 @@ class JdepsGenExtension(
context: CallCheckerContext
) {
when (val resultingDescriptor = resolvedCall.resultingDescriptor) {
is FunctionImportedFromObject -> {
collectTypeReferences((resolvedCall.resultingDescriptor as FunctionImportedFromObject).containingObject.defaultType)
}
is PropertyImportedFromObject -> {
collectTypeReferences((resolvedCall.resultingDescriptor as PropertyImportedFromObject).containingObject.defaultType)
}
is JavaMethodDescriptor -> {
getClassCanonicalPath((resultingDescriptor.containingDeclaration as ClassDescriptor).typeConstructor)?.let { explicitClassesCanonicalPaths.add(it) }
}
Expand All @@ -143,17 +150,20 @@ class JdepsGenExtension(
getClassCanonicalPath(resultingDescriptor)?.let { explicitClassesCanonicalPaths.add(it) }
}
is FakeCallableDescriptorForObject -> {
getClassCanonicalPath(resultingDescriptor)?.let { explicitClassesCanonicalPaths.add(it) }
collectTypeReferences(resultingDescriptor.type)
}
is JavaPropertyDescriptor -> {
getClassCanonicalPath(resultingDescriptor)?.let { explicitClassesCanonicalPaths.add(it) }
}
is PropertyImportedFromObject -> {
collectTypeReferences((resolvedCall.resultingDescriptor as PropertyImportedFromObject).containingObject.defaultType)
}
is PropertyDescriptor -> {
val virtualFileClass = (resultingDescriptor).getContainingKotlinJvmBinaryClass() as? VirtualFileKotlinClass ?: return
explicitClassesCanonicalPaths.add(virtualFileClass.file.path)
when (resultingDescriptor.containingDeclaration) {
is ClassDescriptor -> collectTypeReferences((resultingDescriptor.containingDeclaration as ClassDescriptor).defaultType)
else -> {
val virtualFileClass = (resultingDescriptor).getContainingKotlinJvmBinaryClass() as? VirtualFileKotlinClass ?: return
explicitClassesCanonicalPaths.add(virtualFileClass.file.path)
}
}
addImplicitDep(resultingDescriptor.type)
}
else -> return
}
Expand Down Expand Up @@ -181,6 +191,12 @@ class JdepsGenExtension(
}
is PropertyDescriptor -> {
collectTypeReferences(descriptor.type)
descriptor.annotations.forEach { annotation ->
collectTypeReferences(annotation.type)
}
descriptor.backingField?.annotations?.forEach { annotation ->
collectTypeReferences(annotation.type)
}
}
is LocalVariableDescriptor -> {
collectTypeReferences(descriptor.type)
Expand Down Expand Up @@ -211,9 +227,14 @@ class JdepsGenExtension(
}
}

collectTypeArguments(kotlinType)
}

fun collectTypeArguments(kotlinType: KotlinType) {
kotlinType.arguments.map { it.type }.forEach { typeArgument ->
addExplicitDep(typeArgument)
typeArgument.supertypes().forEach { addImplicitDep(it) }
collectTypeArguments(typeArgument)
}
}
}
Expand Down
Loading