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

Synthetic java properties are not always bold in completion and are not sorted as extensions

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-08-13 13:59:21 +03:00
parent 000d2f0cd1
commit ec7c55c9be
29 changed files with 408 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
+4 -7
View File
@@ -21,29 +21,26 @@ import com.intellij.psi.PsiElement
import com.intellij.util.SmartList
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.JetNameReferenceExpression
import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor
import org.jetbrains.kotlin.utils.addIfNotNull
sealed class SyntheticPropertyAccessorReference(expression: JetNameReferenceExpression, private val getter: Boolean) : JetSimpleReference<JetNameReferenceExpression>(expression) {
override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
val descriptors = super.getTargetDescriptors(context)
if (descriptors.none { it.original is SyntheticJavaPropertyDescriptor }) return emptyList()
if (descriptors.none { it is SyntheticJavaPropertyDescriptor }) return emptyList()
val result = SmartList<FunctionDescriptor>()
for (descriptor in descriptors) {
val original = descriptor.original
if (original is SyntheticJavaPropertyDescriptor) {
if (descriptor is SyntheticJavaPropertyDescriptor) {
if (getter) {
result.add(original.getMethod)
result.add(descriptor.getMethod)
}
else {
result.addIfNotNull(original.setMethod)
result.addIfNotNull(descriptor.setMethod)
}
}
}