[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve performance when using BracePair #48

Merged
merged 5 commits into from
May 2, 2018
Merged

improve performance when using BracePair #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cecce7
improve performance when using `BracePair`
izhangzhihao May 1, 2018
94f7340
`pairs` should not be lazy
izhangzhihao May 1, 2018
10ca525
Simplify code
izhangzhihao May 1, 2018
147cf29
Do NOT check brackets is valid or not
izhangzhihao May 1, 2018
2136fad
Simplify code
izhangzhihao May 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/BracePairs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/*
* BracePairs
*
* Created by Yii.Guxing on 2018/01/25
*/
package com.github.izhangzhihao.rainbow.brackets

import com.github.izhangzhihao.rainbow.brackets.provider.PairedBraceProvider
Expand Down Expand Up @@ -34,13 +29,18 @@ object BracePairs {

val pairsList = providers.forLanguage(language)?.pairs?.let {
if (pairs != null && pairs.isNotEmpty()) {
it.toMutableSet().apply { addAll(pairs) }.toList()
it.toMutableSet().apply { addAll(pairs) }
} else {
it
}
} ?: pairs?.toList()

language to pairsList
val braceMap = pairsList
?.map { listOf(Pair(it.leftBraceType.toString(), it), Pair(it.rightBraceType.toString(), it)) }
?.flatten()
?.toMap()

language to braceMap
}
.toMap()
}
Expand All @@ -49,5 +49,5 @@ object BracePairs {

}

inline val Language.bracePairs: List<BracePair>?
inline val Language.bracePairs: Map<String, BracePair>?
get() = BracePairs.getBracePairs(this)
49 changes: 7 additions & 42 deletions src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/visitor/DefaultRainbowVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.github.izhangzhihao.rainbow.brackets.visitor

import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter.isDoNOTRainbowifyBracketsWithoutContent
import com.github.izhangzhihao.rainbow.brackets.bracePairs
import com.github.izhangzhihao.rainbow.brackets.visitor.DefaultRainbowVisitor.Companion.filterPairs
import com.intellij.codeInsight.daemon.impl.HighlightVisitor
import com.intellij.lang.BracePair
import com.intellij.psi.PsiElement
Expand All @@ -21,15 +20,10 @@ class DefaultRainbowVisitor : RainbowHighlightVisitor() {

override fun visit(element: PsiElement) {
val type = (element as? LeafPsiElement)?.elementType ?: return
val pairs = element.language.bracePairs ?: return

val matching = filterPairs(pairs, type, element)
if (matching.isEmpty()) {
return
}
val matching = filterPairs(type, element) ?: return

val pair = matching.find { element.isValidBracket(it) } ?: return
val level = element.getBracketLevel(pair)
val level = element.getBracketLevel(matching)
if (level >= 0) {
element.setHighlightInfo(level)
}
Expand Down Expand Up @@ -88,44 +82,15 @@ class DefaultRainbowVisitor : RainbowHighlightVisitor() {
return (this as? LeafPsiElement)?.elementType
}

private fun LeafPsiElement.isValidBracket(pair: BracePair): Boolean {
val pairType = when (elementType) {
pair.leftBraceType -> pair.rightBraceType
pair.rightBraceType -> pair.leftBraceType
else -> return false
}

return if (pairType == pair.leftBraceType) {
checkBracePair(this, parent.firstChild, pairType, PsiElement::getNextSibling)
} else {
checkBracePair(this, parent.lastChild, pairType, PsiElement::getPrevSibling)
}
}

private fun checkBracePair(brace: PsiElement,
start: PsiElement,
type: IElementType,
next: PsiElement.() -> PsiElement?): Boolean {
var element: PsiElement? = start
while (element != null && element != brace) {
if (element is LeafPsiElement && element.elementType == type) {
return true
}

element = element.next()
}

return false
}

private fun filterPairs(pairs: List<BracePair>, type: IElementType, element: LeafPsiElement): List<BracePair> {
val filterBraceType = pairs.filter { it.leftBraceType == type || it.rightBraceType == type }
private fun filterPairs(type: IElementType, element: LeafPsiElement): BracePair? {
val pairs = element.language.bracePairs ?: return null
val filterBraceType = pairs[type.toString()] ?: return null
return if (!isDoNOTRainbowifyBracketsWithoutContent) {
filterBraceType
} else {
filterBraceType
.filterNot { it.leftBraceType == type && element.nextSibling?.elementType() == it.rightBraceType }
.filterNot { it.rightBraceType == type && element.prevSibling?.elementType() == it.leftBraceType }
.takeUnless { it.leftBraceType == type && element.nextSibling?.elementType() == it.rightBraceType }
.takeUnless { it?.rightBraceType == type && element.prevSibling?.elementType() == it.leftBraceType }
}
}
}
Expand Down