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

Fix completion tests after "cast required" color change (KT-18089)

Browse Source 
#KT-18089 Fixed
This commit is contained in:
Nikolay Krasko
2018-11-22 21:31:24 +03:00
parent d06b04f025
commit b79f8ff8fa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
+3 -3
View File
@@ -77,6 +77,8 @@ class LookupElementFactory(
val parameter = descriptor.original.valueParameters.singleOrNull() ?: return false val parameter = descriptor.original.valueParameters.singleOrNull() ?: return false
return parameter.type.isFunctionType return parameter.type.isFunctionType
} }
val CAST_REQUIRED_COLOR = JBColor(0x4E4040, 0x969696)
} }
val insertHandlerProvider = basicFactory.insertHandlerProvider val insertHandlerProvider = basicFactory.insertHandlerProvider
@@ -272,8 +274,6 @@ class LookupElementFactory(
return element return element
} }
private val castRequiredColor = JBColor(0x4E4040, 0x969696)
private fun LookupElement.boldIfImmediate(weight: CallableWeight?): LookupElement { private fun LookupElement.boldIfImmediate(weight: CallableWeight?): LookupElement {
val style = when (weight?.enum) { val style = when (weight?.enum) {
CallableWeightEnum.thisClassMember, CallableWeightEnum.thisTypeExtension -> Style.BOLD CallableWeightEnum.thisClassMember, CallableWeightEnum.thisTypeExtension -> Style.BOLD
@@ -288,7 +288,7 @@ class LookupElementFactory(
presentation.isItemTextBold = true presentation.isItemTextBold = true
} }
else { else {
presentation.itemTextForeground = castRequiredColor presentation.itemTextForeground = CAST_REQUIRED_COLOR
// gray all tail fragments too: // gray all tail fragments too:
val fragments = presentation.tailFragments val fragments = presentation.tailFragments
presentation.clearTail() presentation.clearTail()
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt
+2 -2
View File
@@ -24,9 +24,9 @@ import com.google.gson.JsonParser
import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.completion.CompletionType
import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.codeInsight.lookup.LookupElementPresentation import com.intellij.codeInsight.lookup.LookupElementPresentation
import com.intellij.codeInsight.lookup.impl.LookupCellRenderer
import com.intellij.ui.JBColor import com.intellij.ui.JBColor
import com.intellij.util.ArrayUtil import com.intellij.util.ArrayUtil
import org.jetbrains.kotlin.idea.completion.LookupElementFactory
import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
import org.jetbrains.kotlin.idea.test.AstAccessControl import org.jetbrains.kotlin.idea.test.AstAccessControl
import org.jetbrains.kotlin.idea.util.module import org.jetbrains.kotlin.idea.util.module
@@ -346,7 +346,7 @@ object ExpectedCompletionUtils {
} }
val foreground = presentation.itemTextForeground val foreground = presentation.itemTextForeground
if (foreground != JBColor.foreground()) { if (foreground != JBColor.foreground()) {
assert(foreground == LookupCellRenderer.getGrayedForeground(false)) assert(foreground == LookupElementFactory.CAST_REQUIRED_COLOR)
if (length > 0) append(" ") if (length > 0) append(" ")
append("grayed") append("grayed")
} }