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

KT-7486 Auto import inserts qualified name in companion object

Browse Source 
#KT-7486 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-05-15 13:16:13 +03:00
parent 60b0236101
commit cdf6229fff
6 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt
+7 -9
View File
@@ -273,18 +273,16 @@ public abstract class ElementResolver protected(
private fun getAnnotationsByDeclaration(resolveSession: ResolveSession, modifierList: JetModifierList, declaration: JetDeclaration): Annotations {
var descriptor = resolveSession.resolveToDescriptor(declaration)
if (declaration is JetClass) {
val jetClass = declaration
val classDescriptor = descriptor as ClassDescriptor
if (modifierList == jetClass.getPrimaryConstructorModifierList()) {
descriptor = classDescriptor.getUnsubstitutedPrimaryConstructor()
if (modifierList == declaration.getPrimaryConstructorModifierList()) {
descriptor = (descriptor as ClassDescriptor).getUnsubstitutedPrimaryConstructor()
?: error("No constructor found: ${declaration.getText()}")
}
else if (modifierList.getParent() == jetClass.getBody()) {
if (classDescriptor is LazyClassDescriptor) {
return classDescriptor.getDanglingAnnotations()
}
}
}
if (declaration is JetClassOrObject && modifierList.getParent() == declaration.getBody() && descriptor is LazyClassDescriptor) {
return descriptor.getDanglingAnnotations()
}
return descriptor.getAnnotations()
}