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

Avoid adding DYNAMIC_PROPERTY_CALL highlighting twice

Browse Source 
Tested in idea/testData/highlighter/Dynamic.kt
This commit is contained in:
Nikolay Krasko
2019-03-06 11:59:27 +03:00
parent 1cc59f4b18
commit 06dbe1ec09
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.kt
+16 -9
View File
@@ -23,8 +23,8 @@ import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic
import org.jetbrains.kotlin.resolve.calls.tower.isSynthesized import org.jetbrains.kotlin.resolve.calls.tower.isSynthesized
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
internal class PropertiesHighlightingVisitor(holder: AnnotationHolder, bindingContext: BindingContext) internal class PropertiesHighlightingVisitor(holder: AnnotationHolder, bindingContext: BindingContext) :
: AfterAnalysisHighlightingVisitor(holder, bindingContext) { AfterAnalysisHighlightingVisitor(holder, bindingContext) {
override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) { override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) {
if (expression.parent is KtThisExpression) { if (expression.parent is KtThisExpression) {
@@ -47,8 +47,9 @@ internal class PropertiesHighlightingVisitor(holder: AnnotationHolder, bindingCo
} }
} ?: attributeKeyByPropertyType(target) } ?: attributeKeyByPropertyType(target)
highlightName(expression, attributesKey) if (attributesKey != null) {
highlightName(expression, attributesKey)
}
} }
override fun visitProperty(property: KtProperty) { override fun visitProperty(property: KtProperty) {
@@ -78,16 +79,22 @@ internal class PropertiesHighlightingVisitor(holder: AnnotationHolder, bindingCo
elementToHighlight: PsiElement, elementToHighlight: PsiElement,
descriptor: PropertyDescriptor descriptor: PropertyDescriptor
) { ) {
highlightName( val textAttributesKey =
elementToHighlight,
attributeKeyForDeclarationFromExtensions(elementToHighlight, descriptor) ?: attributeKeyByPropertyType(descriptor) attributeKeyForDeclarationFromExtensions(elementToHighlight, descriptor) ?: attributeKeyByPropertyType(descriptor)
)
if (textAttributesKey != null) {
highlightName(
elementToHighlight,
textAttributesKey
)
}
} }
private fun attributeKeyByPropertyType(descriptor: PropertyDescriptor): TextAttributesKey { private fun attributeKeyByPropertyType(descriptor: PropertyDescriptor): TextAttributesKey? {
return when { return when {
descriptor.isDynamic() -> descriptor.isDynamic() ->
DYNAMIC_PROPERTY_CALL // The property is set in VariablesHighlightingVisitor
null
descriptor.extensionReceiverParameter != null -> descriptor.extensionReceiverParameter != null ->
if (descriptor.isSynthesized) SYNTHETIC_EXTENSION_PROPERTY else EXTENSION_PROPERTY if (descriptor.isSynthesized) SYNTHETIC_EXTENSION_PROPERTY else EXTENSION_PROPERTY