diff --git a/README.md b/README.md index 436cddc..fe20980 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Rainbow Brackets [](https://travis-ci.org/izhangzhihao/intellij-rainbow-brackets) [](https://www.codacy.com/app/izhangzhihao/intellij-rainbow-brackets?utm_source=github.com&utm_medium=referral&utm_content=izhangzhihao/intellij-rainbow-brackets&utm_campaign=badger) [](https://plugins.jetbrains.com/plugin/10080-rainbow-brackets) +# Rainbow Brackets [](https://travis-ci.org/izhangzhihao/intellij-rainbow-brackets) [](https://www.codacy.com/app/izhangzhihao/intellij-rainbow-brackets?utm_source=github.com&utm_medium=referral&utm_content=izhangzhihao/intellij-rainbow-brackets&utm_campaign=badger) [](https://plugins.jetbrains.com/plugin/10080-rainbow-brackets) ## Compatible with: @@ -20,6 +20,10 @@ IntelliJ IDEA, PhpStorm, WebStorm, PyCharm, RubyMine, AppCode, CLion, Gogland, D  +* with HTML/XML + + + * and more... ## Install diff --git a/gradle.properties b/gradle.properties index f699442..8de4506 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ name = "Rainbow Brackets" ideaVersion = IC-2017.2 javaVersion = 1.8 kotlinVersion = 1.1.51 -version = 2.2 +version = 2.3 downloadIdeaSources = false publishUsername = izhangzhihao publishChannels = Stable \ No newline at end of file diff --git a/screenshots/with-HTML.png b/screenshots/with-HTML.png new file mode 100644 index 0000000..6e50c9e Binary files /dev/null and b/screenshots/with-HTML.png differ diff --git a/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowBrackets.kt b/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowBrackets.kt index 5388bab..9ef6fd1 100644 --- a/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowBrackets.kt +++ b/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowBrackets.kt @@ -1,5 +1,6 @@ package com.github.izhangzhihao.rainbow.brackets +import com.github.izhangzhihao.rainbow.brackets.RainbowColors.angleBracketsColor import com.github.izhangzhihao.rainbow.brackets.RainbowColors.roundBracketsColor import com.github.izhangzhihao.rainbow.brackets.RainbowColors.squareBracketsColor import com.github.izhangzhihao.rainbow.brackets.RainbowColors.squigglyBracketsColor @@ -17,12 +18,14 @@ class RainbowBrackets : Annotator { private val roundBrackets = arrayOf("(", ")") private val squigglyBrackets = arrayOf("{", "}") private val squareBrackets = arrayOf("[", "]") + private val angleBrackets = arrayOf("<", ">", "</") private fun getAttributesColor(level: Int, bracket: String): Color { return when (bracket) { in roundBrackets -> dynamicallySelectColor(level, roundBracketsColor) in squigglyBrackets -> dynamicallySelectColor(level, squigglyBracketsColor) in squareBrackets -> dynamicallySelectColor(level, squareBracketsColor) + in angleBrackets -> dynamicallySelectColor(level, angleBracketsColor) else -> dynamicallySelectColor(level, roundBracketsColor) } } @@ -46,6 +49,7 @@ class RainbowBrackets : Annotator { element.text in roundBrackets -> getBracketLevel(element, roundBrackets) element.text in squigglyBrackets -> getBracketLevel(element, squigglyBrackets) element.text in squareBrackets -> getBracketLevel(element, squareBrackets) + element.text in angleBrackets -> getBracketLevel(element, angleBrackets) else -> 0 } } diff --git a/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowColors.kt b/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowColors.kt index 6539915..ac7d9c1 100644 --- a/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowColors.kt +++ b/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowColors.kt @@ -26,4 +26,6 @@ object RainbowColors { Color(205, 220, 57), Color(255, 152, 99) ) + + val angleBracketsColor = roundBracketsColor } \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 7e4ba92..a2fd407 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -9,9 +9,14 @@ <p><img src="https://raw.githubusercontent.com/izhangzhihao/intellij-rainbow-brackets/IC-2017.2/screenshots/with-scala.png" alt="with-scala"/></p> <p><img src="https://raw.githubusercontent.com/izhangzhihao/intellij-rainbow-brackets/IC-2017.2/screenshots/with-kotlin.png" alt="with-kotlin"/></p> <p><img src="https://raw.githubusercontent.com/izhangzhihao/intellij-rainbow-brackets/IC-2017.2/screenshots/with-material-theme-ui.png" alt="with-material-theme-ui.png"/></p> + <p><img src="https://raw.githubusercontent.com/izhangzhihao/intellij-rainbow-brackets/IC-2017.2/screenshots/with-HTML.png" alt="with-HTML.png"/></p> ]]></description> <change-notes><![CDATA[ + <p>2.3:</p> + <ul> + <li>Add support for HTML/XML</li> + </ul> <p>2.2:</p> <ul> <li>Add support for C#</li> @@ -63,6 +68,8 @@ implementationClass="com.github.izhangzhihao.rainbow.brackets.RainbowBrackets"/> <annotator language="PHP" implementationClass="com.github.izhangzhihao.rainbow.brackets.RainbowBrackets"/> <annotator language="C#" implementationClass="com.github.izhangzhihao.rainbow.brackets.RainbowBrackets"/> + <annotator language="HTML" implementationClass="com.github.izhangzhihao.rainbow.brackets.RainbowBrackets"/> + <annotator language="XML" implementationClass="com.github.izhangzhihao.rainbow.brackets.RainbowBrackets"/> </extensions> <application-components>