chylex/IntelliJ-Rainbow-Brackets
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-Rainbow-Brackets.git synced 2025-05-30 04:34:07 +02:00
Code

refactoring

Browse Source
This commit is contained in:
张志豪 2021-08-13 10:22:57 +08:00
parent 6e0c8ab2d9
commit 9f21c1272d
4 changed files with 7 additions and 9 deletions
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets
BracePairs.kt
visitor
DefaultRainbowVisitor.ktRainbowHighlightVisitor.ktXmlRainbowVisitor.kt

9
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/BracePairs.kt
View File

@ -8,14 +8,13 @@ import com.intellij.psi.tree.IElementType
object BracePairs { object BracePairs {
@Suppress("MemberVisibilityCanBePrivate") private val providers = LanguageExtension<BracePairProvider>("izhangzhihao.rainbow.brackets.bracePairProvider")
val providers = LanguageExtension<BracePairProvider>("izhangzhihao.rainbow.brackets.bracePairProvider")
private val bracePairs = private val bracePairs =
Language.getRegisteredLanguages() Language.getRegisteredLanguages()
.map { language -> .map { language ->
if (language is CompositeLanguage) { if (language is CompositeLanguage) {
return@map language to null return@map language.displayName to null
} }
val pairs = val pairs =
@ -60,11 +59,11 @@ object BracePairs {
} }
} }
language to braceMap language.displayName to braceMap
} }
.toMap() .toMap()
fun getBracePairs(language: Language): MutableMap<String, MutableList<BracePair>>? = bracePairs[language] fun getBracePairs(language: Language): MutableMap<String, MutableList<BracePair>>? = bracePairs[language.displayName]
private fun getBraceTypeSetOf(language: Language): Set<IElementType> = getBracePairs(language)?.values?.flatten()?.map { it -> listOf(it.leftBraceType, it.rightBraceType) }?.flatten()?.toSet() ?: emptySet() private fun getBraceTypeSetOf(language: Language): Set<IElementType> = getBracePairs(language)?.values?.flatten()?.map { it -> listOf(it.leftBraceType, it.rightBraceType) }?.flatten()?.toSet() ?: emptySet()

2
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/visitor/DefaultRainbowVisitor.kt
View File

@ -105,7 +105,7 @@ class DefaultRainbowVisitor : RainbowHighlightVisitor() {
return findLeftBracket && findRightBracket return findLeftBracket && findRightBracket
} }
fun PsiElement.elementType(): IElementType? { private fun PsiElement.elementType(): IElementType? {
return (this as? LeafPsiElement)?.elementType return (this as? LeafPsiElement)?.elementType
} }

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

@ -80,7 +80,7 @@ abstract class RainbowHighlightVisitor : HighlightVisitor {
} }
companion object { companion object {
val isIntelliJHaskellEnabled: Boolean by lazy { private val isIntelliJHaskellEnabled: Boolean by lazy {
PluginManagerCore.getPlugin( PluginManagerCore.getPlugin(
PluginId.getId("intellij.haskell"))?.isEnabled ?: false PluginId.getId("intellij.haskell"))?.isEnabled ?: false
} }

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

@ -24,8 +24,7 @@ open class XmlRainbowVisitor : RainbowHighlightVisitor() {
return return
} }
val tokenType = element.tokenType when (val tokenType = element.tokenType) {
when (tokenType) {
XmlTokenType.XML_DOCTYPE_START, XmlTokenType.XML_DOCTYPE_START,
XmlTokenType.XML_DOCTYPE_END, XmlTokenType.XML_DOCTYPE_END,
XmlTokenType.XML_PI_START, XmlTokenType.XML_PI_START,