chylex/IntelliJ-Rainbow-Brackets
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-Rainbow-Brackets.git synced 2025-04-11 03:15:49 +02:00
Code

Migrate deprecated usages

Browse Source
This commit is contained in:
张志豪 2020-04-05 17:00:38 +08:00
parent 78cbdec6e2
commit ed83f2caa3
5 changed files with 19 additions and 10 deletions
src/main
kotlin/com/github/izhangzhihao/rainbow/brackets
annotator
KotlinLabelAnnotator.ktKotlinLambdaExpressionArrowAnnotator.ktRainbowAnnotator.kt
visitor
RainbowHighlightVisitor.kt
resources/META-INF
plugin.xml

7
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/annotator/KotlinLabelAnnotator.kt
View File

@ -5,6 +5,7 @@ import com.github.izhangzhihao.rainbow.brackets.RainbowInfo
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
import com.intellij.lang.annotation.AnnotationHolder
import com.intellij.lang.annotation.Annotator
import com.intellij.lang.annotation.HighlightSeverity
import com.intellij.openapi.editor.markup.EffectType
import com.intellij.openapi.editor.markup.TextAttributes
import com.intellij.psi.PsiElement
@ -64,8 +65,10 @@ class KotlinLabelAnnotator : Annotator {
refElement
.let { RainbowInfo.RAINBOW_INFO_KEY[it]?.color ?: RainbowHighlighter.DEFAULT_KOTLIN_LABEL_COLOR }
.let {
holder.createInfoAnnotation(target, null)
.enforcedTextAttributes = TextAttributes(it, null, null, EffectType.BOXED, Font.PLAIN)
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
.range(target)
.enforcedTextAttributes(TextAttributes(it, null, null, EffectType.BOXED, Font.PLAIN))
.create()
}
}

7
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/annotator/KotlinLambdaExpressionArrowAnnotator.kt
View File

@ -3,6 +3,7 @@ package com.github.izhangzhihao.rainbow.brackets.annotator
import com.github.izhangzhihao.rainbow.brackets.RainbowInfo
import com.intellij.lang.annotation.AnnotationHolder
import com.intellij.lang.annotation.Annotator
import com.intellij.lang.annotation.HighlightSeverity
import com.intellij.openapi.editor.markup.EffectType
import com.intellij.openapi.editor.markup.TextAttributes
import com.intellij.psi.PsiElement
@ -15,8 +16,10 @@ class KotlinLambdaExpressionArrowAnnotator : Annotator {
override fun annotate(element: PsiElement, holder: AnnotationHolder) {
if ((element as? LeafPsiElement)?.elementType == KtTokens.ARROW) {
RainbowInfo.RAINBOW_INFO_KEY[element.parent]?.color?.let {
holder.createInfoAnnotation(element, null)
.enforcedTextAttributes = TextAttributes(it, null, null, EffectType.BOXED, Font.PLAIN)
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
.range(element)
.enforcedTextAttributes(TextAttributes(it, null, null, EffectType.BOXED, Font.PLAIN))
.create()
}
}
}

11
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/annotator/RainbowAnnotator.kt
View File

@ -10,6 +10,7 @@ import com.github.izhangzhihao.rainbow.brackets.annotator.RainbowUtils.settings
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
import com.intellij.lang.annotation.AnnotationHolder
import com.intellij.lang.annotation.Annotator
import com.intellij.lang.annotation.HighlightSeverity
import com.intellij.openapi.editor.colors.EditorColorsManager
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
@ -84,11 +85,17 @@ object RainbowUtils {
val scheme = EditorColorsManager.getInstance().globalScheme
if (RainbowSettings.instance.isDoNOTRainbowifyTheFirstLevel) {
if (level >= 1) {
holder.createInfoAnnotation(element.psi, null).enforcedTextAttributes = getTextAttributes(scheme, rainbowName, level)
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
.range(element.psi)
.enforcedTextAttributes(getTextAttributes(scheme, rainbowName, level))
.create()
}
} else {
if (level >= 0) {
holder.createInfoAnnotation(element.psi, null).enforcedTextAttributes = getTextAttributes(scheme, rainbowName, level)
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
.range(element.psi)
.enforcedTextAttributes(getTextAttributes(scheme, rainbowName, level))
.create()
}
}
}

3
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/visitor/RainbowHighlightVisitor.kt
View File

@ -27,9 +27,6 @@ abstract class RainbowHighlightVisitor : HighlightVisitor {
private fun fileIsNotHaskellOrIntelliJHaskellPluginNotEnabled(fileType: String) =
fileType != "Haskell" || !isIntelliJHaskellEnabled
@Suppress("OverridingDeprecatedMember")
final override fun order(): Int = 1
final override fun analyze(file: PsiFile, updateWholeFile: Boolean, holder: HighlightInfoHolder, action: Runnable)
: Boolean {
highlightInfoHolder = holder

1
src/main/resources/META-INF/plugin.xml
View File

@ -538,7 +538,6 @@
<applicationConfigurable instance="com.github.izhangzhihao.rainbow.brackets.settings.RainbowConfigurable" dynamic="true"/>
<applicationService
serviceImplementation="com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings"/>
<applicationService serviceImplementation="com.github.izhangzhihao.rainbow.brackets.util.RainbowBracketsPluginUpdater"/>
<colorAndFontPanelFactory
implementation="com.github.izhangzhihao.rainbow.brackets.settings.RainbowColorsPageFactory"/>
<colorAndFontDescriptorProvider