Fix resolve (members/extensions with 'infix' has higher priority)

This commit is contained in:
Yan Zhulanow
2015-09-30 21:39:26 +03:00
parent d28ecc2316
commit 7e8674c6ee
9 changed files with 65 additions and 25 deletions
@@ -95,7 +95,7 @@ var <PROPERTY_WITH_BACKING_FIELD><PACKAGE_PROPERTY><MUTABLE_VARIABLE>globalCount
}
override fun getAttributeDescriptors(): Array<AttributesDescriptor> {
fun String.to(key: TextAttributesKey) = AttributesDescriptor(this, key)
infix fun String.to(key: TextAttributesKey) = AttributesDescriptor(this, key)
return arrayOf(OptionsBundle.message("options.java.attribute.descriptor.keyword") to JetHighlightingColors.KEYWORD,
JetBundle.message("options.kotlin.attribute.descriptor.builtin.annotation") to JetHighlightingColors.BUILTIN_ANNOTATION,