test

.gitignore

@@ -1,8 +1,5 @@
 /.idea/*
-!/.idea/dictionaries
 !/.idea/runConfigurations
 
 /.gradle/
-/.kotlin/
-/.intellijPlatform/
 /build/

.idea/dictionaries/project.xml

@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="project">
-    <words>
-      <w>Rainbowify</w>
-    </words>
-  </dictionary>
-</component>

.idea/runConfigurations/Run_CLion.xml

@@ -17,11 +17,8 @@
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
     <DebugAllEnabled>false</DebugAllEnabled>
     <RunAsTest>false</RunAsTest>
-    <GradleProfilingDisabled>false</GradleProfilingDisabled>
-    <GradleCoverageDisabled>false</GradleCoverageDisabled>
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Run_IDEA.xml

@@ -10,18 +10,15 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":base:runIde" />
+          <option value=":runIde" />
         </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
     <DebugAllEnabled>false</DebugAllEnabled>
     <RunAsTest>false</RunAsTest>
-    <GradleProfilingDisabled>false</GradleProfilingDisabled>
-    <GradleCoverageDisabled>false</GradleCoverageDisabled>
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Run_Rider.xml

@@ -17,11 +17,8 @@
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
     <DebugAllEnabled>false</DebugAllEnabled>
     <RunAsTest>false</RunAsTest>
-    <GradleProfilingDisabled>false</GradleProfilingDisabled>
-    <GradleCoverageDisabled>false</GradleCoverageDisabled>
     <method v="2" />
   </configuration>
 </component>

.idea/vcs.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="CommitMessageInspectionProfile">
+        <profile version="1.0">
+            <inspection_tool class="GrazieCommit" enabled="true" level="TYPO" enabled_by_default="true"/>
+        </profile>
+    </component>
+    <component name="VcsDirectoryMappings">
+        <mapping directory="$PROJECT_DIR$" vcs="Git"/>
+    </component>
+    <component name="IssueNavigationConfiguration">
+        <option name="links">
+            <list>
+                <IssueNavigationLink>
+                    <option name="issueRegexp" value="#(\d+)"/>
+                    <option name="linkRegexp" value="https://github.com//izhangzhihao/intellij-rainbow-brackets/issues/$1"/>
+                </IssueNavigationLink>
+            </list>
+        </option>
+    </component>
+    <component name="VcsDirectoryMappings">
+        <mapping directory="" vcs="Git"/>
+    </component>
+</project>

README.md

@@ -4,9 +4,5 @@ This is a fork of the [🌈Rainbow Brackets](https://github.com/izhangzhihao/int
 
 ## Key Changes
 
-- Updates for new IntelliJ Platform versions
-- Support for C# (Rider)
-- Support for C++
-- Support for Settings Sync
-- Improved highlighting performance
-- Increased default setting for maximum line count from 1K to 100K
+- Support for CLion and Rider
+- Fixed service initialization warnings reported by 2024.2+

base/build.gradle.kts

@@ -1,44 +0,0 @@
-import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-import org.jetbrains.intellij.platform.gradle.extensions.excludeCoroutines
-import org.jetbrains.intellij.platform.gradle.extensions.excludeKotlinStdlib
-
-val ideaVersion: String by project
-
-dependencies {
-	intellijPlatform {
-		@Suppress("DEPRECATION")
-		intellijIdeaUltimate(ideaVersion)
-		
-		bundledPlugin("JavaScript")
-		bundledPlugin("com.intellij.css")
-		bundledPlugin("com.intellij.database")
-		bundledPlugin("com.intellij.java")
-		bundledPlugin("org.intellij.groovy")
-		bundledPlugin("org.intellij.plugins.markdown")
-		bundledPlugin("org.jetbrains.kotlin")
-		bundledPlugin("org.jetbrains.plugins.yaml")
-		
-		compatiblePlugin("PythonCore")
-		compatiblePlugin("com.intellij.clion")
-		compatiblePlugin("com.intellij.nativeDebug")
-		compatiblePlugin("com.jetbrains.php")
-		compatiblePlugin("com.jetbrains.plugins.jade")
-		compatiblePlugin("com.jetbrains.sh")
-		compatiblePlugin("org.intellij.scala")
-		compatiblePlugin("org.jetbrains.plugins.clion.radler")
-		compatiblePlugin("org.jetbrains.plugins.go-template")
-		compatiblePlugin("org.jetbrains.plugins.ruby")
-		
-		plugin("Dart:507.0.0") // https://plugins.jetbrains.com/plugin/6351-dart/versions/stable
-		
-		testFramework(TestFrameworkType.Platform)
-		testFramework(TestFrameworkType.Plugin.Java)
-		testFramework(TestFrameworkType.Plugin.JavaScript)
-	}
-	
-	testImplementation("junit:junit:4.13.2")
-	testImplementation("io.kotest:kotest-assertions-core:5.8.0") {
-		excludeKotlinStdlib()
-		excludeCoroutines()
-	}
-}

base/src/main/kotlin/com/chylex/intellij/coloredbrackets/provider/CppBracePairProvider.kt

@@ -1,13 +0,0 @@
-package com.chylex.intellij.coloredbrackets.provider
-
-import com.intellij.lang.BracePair
-import com.jetbrains.rider.cpp.fileType.lexer.CppTokenTypes
-
-class CppBracePairProvider : BracePairProvider {
-	override fun pairs(): List<BracePair> = listOf(
-		BracePair(CppTokenTypes.LPAR, CppTokenTypes.RPAR, false),
-		BracePair(CppTokenTypes.LBRACE, CppTokenTypes.RBRACE, false),
-		BracePair(CppTokenTypes.LBRACKET, CppTokenTypes.RBRACKET, false),
-		BracePair(CppTokenTypes.LT, CppTokenTypes.GT, false),
-	)
-}

base/src/main/kotlin/com/chylex/intellij/coloredbrackets/visitor/CppRainbowVisitor.kt

@@ -1,20 +0,0 @@
-package com.chylex.intellij.coloredbrackets.visitor
-
-import com.intellij.codeInsight.daemon.impl.HighlightVisitor
-import com.intellij.psi.PsiElement
-import com.intellij.psi.tree.IElementType
-import com.jetbrains.rider.cpp.fileType.lexer.CppTokenTypes
-import com.jetbrains.rider.cpp.fileType.psi.CppDummyNode
-
-class CppRainbowVisitor : ReSharperRainbowVisitor("C++") {
-	
-	override fun clone(): HighlightVisitor = CppRainbowVisitor()
-	
-	override fun isAllowedElementType(type: IElementType): Boolean {
-		return type == CppTokenTypes.LPAR || type == CppTokenTypes.RPAR
-	}
-	
-	override fun PsiElement.isDummyNode(): Boolean {
-		return this is CppDummyNode
-	}
-}

base/src/main/kotlin/com/chylex/intellij/coloredbrackets/visitor/ReSharperRainbowVisitor.kt

@@ -1,120 +0,0 @@
-package com.chylex.intellij.coloredbrackets.visitor
-
-import com.chylex.intellij.coloredbrackets.BracePairs.bracePairs
-import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
-import com.intellij.lang.BracePair
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiFile
-import com.intellij.psi.impl.source.tree.LeafPsiElement
-import com.intellij.psi.tree.IElementType
-import com.intellij.psi.util.elementType
-
-abstract class ReSharperRainbowVisitor(private val languageId: String) : RainbowHighlightVisitor() {
-	
-	override fun suitableForFile(file: PsiFile): Boolean {
-		return super.suitableForFile(file) && (file.language.id == languageId || file.viewProvider.allFiles.any { it.language.id == languageId })
-	}
-	
-	protected abstract fun isAllowedElementType(type: IElementType): Boolean
-	
-	final override fun visit(element: PsiElement) {
-		val type = (element as? LeafPsiElement)?.elementType?.takeIf(::isAllowedElementType) ?: return
-		val pair = type.language.bracePairs?.getValue(type.toString())?.singleOrNull() ?: return
-		
-		val settings = RainbowSettings.instance
-		
-		if (settings.isDoNOTRainbowifyBracketsWithoutContent) {
-			if (pair.leftBraceType == type && element.nextSibling?.elementType == pair.rightBraceType) {
-				return
-			}
-			
-			if (pair.rightBraceType == type && element.prevSibling?.elementType == pair.leftBraceType) {
-				return
-			}
-		}
-		
-		val level = element.getBracketLevel(pair, type)
-		
-		if (settings.isDoNOTRainbowifyTheFirstLevel) {
-			if (level >= 1) {
-				rainbowPairs(element, pair, level)
-			}
-		}
-		else {
-			if (level >= 0) {
-				rainbowPairs(element, pair, level)
-			}
-		}
-	}
-	
-	private fun rainbowPairs(element: LeafPsiElement, pair: BracePair, level: Int) {
-		val startElement = element.takeIf { it.elementType == pair.leftBraceType }
-		val endElement = element.takeIf { it.elementType == pair.rightBraceType }
-		element.setHighlightInfo(element.parent, level, startElement, endElement)
-	}
-	
-	private fun LeafPsiElement.getBracketLevel(pair: BracePair, type: IElementType): Int {
-		return iterateBracketParents(this, pair, -1, type)
-	}
-	
-	private tailrec fun iterateBracketParents(element: PsiElement?, pair: BracePair, count: Int, type: IElementType): Int {
-		if (element == null || element is PsiFile) {
-			return count
-		}
-		
-		var nextCount = count
-		
-		if (element is LeafPsiElement) {
-			if (type == pair.leftBraceType && element.elementType == pair.rightBraceType) {
-				nextCount--
-			}
-			
-			if (type == pair.rightBraceType && element.elementType == pair.leftBraceType) {
-				nextCount--
-			}
-			
-			if (type == element.elementType) {
-				nextCount++
-			}
-		}
-		
-		return if (type == pair.leftBraceType) {
-			val prev = element.prevSibling
-			if (prev == null) {
-				iterateBracketParents(element.parent.prevSibling.iterForPreDummyNode()?.lastChild, pair, nextCount, type)
-			}
-			else {
-				iterateBracketParents(prev, pair, nextCount, type)
-			}
-		}
-		else {
-			val next = element.nextSibling
-			if (next == null) {
-				iterateBracketParents(element.parent.nextSibling.iterForNextDummyNode()?.firstChild, pair, nextCount, type)
-			}
-			else {
-				iterateBracketParents(next, pair, nextCount, type)
-			}
-		}
-	}
-	
-	protected abstract fun PsiElement.isDummyNode(): Boolean
-	
-	private tailrec fun PsiElement?.iterForNextDummyNode(): PsiElement? {
-		return when {
-			this == null             -> null
-			this.isDummyNode()       -> this
-			this.nextSibling == null -> null
-			else                     -> this.nextSibling.iterForNextDummyNode()
-		}
-	}
-	
-	private tailrec fun PsiElement?.iterForPreDummyNode(): PsiElement? {
-		return when {
-			this == null             -> null
-			this.isDummyNode()       -> this
-			this.prevSibling == null -> null
-			else                     -> this.prevSibling.iterForPreDummyNode()
-		}
-	}
-}

base/src/main/resources/META-INF/plugin-cpp.xml

@@ -1,10 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.chylex.coloredbrackets">
-    <bracePairProvider language="C++"
-                       implementationClass="com.chylex.intellij.coloredbrackets.provider.CppBracePairProvider" />
-  </extensions>
-  
-  <extensions defaultExtensionNs="com.intellij">
-    <highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.CppRainbowVisitor" />
-  </extensions>
-</idea-plugin>

base/src/main/resources/META-INF/plugin.xml

@@ -1,118 +0,0 @@
-<idea-plugin require-restart="true">
-  <id>com.chylex.coloredbrackets</id>
-  <name>Colored Brackets</name>
-  <vendor url="https://chylex.com">chylex</vendor>
-  
-  <description><![CDATA[
-    Fork of the <a href="https://github.com/izhangzhihao/intellij-rainbow-brackets">Rainbow Brackets</a> plugin by <a href="https://github.com/izhangzhihao">izhangzhihao</a>, based on version 6.26.
-    <br><br>
-    <b>Key Changes</b>
-    <ul>
-      <li>Updates for new IntelliJ Platform versions</li>
-      <li>Support for C# (Rider)</li>
-      <li>Support for C++</li>
-      <li>Support for Settings Sync</li>
-      <li>Improved highlighting performance</li>
-      <li>Increased default setting for maximum line count from 1K to 100K</li>
-    </ul>
-  ]]></description>
-  
-  <change-notes><![CDATA[
-    <b>Version 1.5.0</b>
-    <ul>
-      <li>Updated to IntelliJ Platform 2026.2.</li>
-      <li>Added support for C++ plugin for IntelliJ IDEA.</li>
-    </ul>
-    <b>Version 1.4.0</b>
-    <ul>
-      <li>Updated to IntelliJ Platform 2025.3.</li>
-      <li>Removed support for the Haskell plugin, since it is no longer available.</li>
-    </ul>
-    <b>Version 1.3.0</b>
-    <ul>
-      <li>Fixed assertion error caused by missing read lock in indent guide renderer.</li>
-    </ul>
-    <b>Version 1.2.0</b>
-    <ul>
-      <li>Fixed not re-highlighting open files after changing settings.</li>
-      <li>Fixed exception when opening certain diff editors.</li>
-    </ul>
-    <b>Version 1.1.0</b>
-    <ul>
-      <li>Added support for C++ in Rider and CLion Nova.</li>
-      <li>Fixed broken option to not color parentheses without content in C#.</li>
-      <li>Improved highlighting performance.</li>
-      <li>Increased default setting for maximum line count from 1K to 100K.</li>
-    </ul>
-    <b>Version 1.0.0</b>
-    <ul>
-      <li>Restored support for CLion and Rider.</li>
-      <li>Added support for Settings Sync.</li>
-      <li>Fixed service initialization warnings reported by IntelliJ Platform 2024.2.</li>
-    </ul>
-  ]]></change-notes>
-  
-  <depends>com.intellij.modules.lang</depends>
-  <depends optional="true" config-file="plugin-clion-classic.xml">com.intellij.cidr.lang</depends>
-  <depends optional="true" config-file="plugin-cpp.xml">org.jetbrains.plugins.clion.radler</depends>
-  <depends optional="true" config-file="plugin-dart.xml">Dart</depends>
-  <depends optional="true" config-file="plugin-go-template.xml">org.jetbrains.plugins.go-template</depends>
-  <depends optional="true" config-file="plugin-groovy.xml">org.intellij.groovy</depends>
-  <depends optional="true" config-file="plugin-jade.xml">com.jetbrains.plugins.jade</depends>
-  <depends optional="true" config-file="plugin-javascript.xml">JavaScript</depends>
-  <depends optional="true" config-file="plugin-kotlin.xml">org.jetbrains.kotlin</depends>
-  <depends optional="true" config-file="plugin-php.xml">com.jetbrains.php</depends>
-  <depends optional="true" config-file="plugin-python.xml">com.intellij.modules.python</depends>
-  <depends optional="true" config-file="plugin-rider.xml">com.intellij.modules.rider</depends>
-  <depends optional="true" config-file="plugin-sh.xml">com.jetbrains.sh</depends>
-  <depends optional="true" config-file="plugin-sql.xml">com.intellij.database</depends>
-  
-  <extensionPoints>
-    <extensionPoint name="bracePairProvider" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
-      <with attribute="implementationClass" implements="com.chylex.intellij.coloredbrackets.provider.BracePairProvider" />
-    </extensionPoint>
-  </extensionPoints>
-  
-  <extensions defaultExtensionNs="com.intellij">
-    <highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.DefaultRainbowVisitor" />
-    <highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.XmlRainbowVisitor" />
-    
-    <applicationConfigurable instance="com.chylex.intellij.coloredbrackets.settings.RainbowConfigurable" displayName="Colored Brackets" parentId="appearance" />
-    <applicationService serviceImplementation="com.chylex.intellij.coloredbrackets.settings.RainbowSettings" />
-    <colorAndFontPanelFactory implementation="com.chylex.intellij.coloredbrackets.settings.RainbowColorsPageFactory" />
-    <colorAndFontDescriptorProvider implementation="com.chylex.intellij.coloredbrackets.settings.RainbowColorsPageFactory" />
-    
-    <additionalTextAttributes scheme="Default" file="colorSchemes/rainbow-color-default.xml" />
-    <additionalTextAttributes scheme="Darcula" file="colorSchemes/rainbow-color-default-darcula.xml" />
-    <highlightingPassFactory implementation="com.chylex.intellij.coloredbrackets.indents.RainbowIndentsPassFactory" />
-    <editorNotificationProvider implementation="com.chylex.intellij.coloredbrackets.RainbowifyBanner" />
-  </extensions>
-  
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <supportsKotlinPluginMode supportsK2="true" />
-  </extensions>
-  
-  <applicationListeners>
-    <listener class="com.chylex.intellij.coloredbrackets.listener.RainbowColorsSchemeListener" topic="com.intellij.openapi.editor.colors.EditorColorsListener" />
-  </applicationListeners>
-  
-  <actions>
-    <action class="com.chylex.intellij.coloredbrackets.action.ScopeHighlightingAction"
-            id="Rainbow.ScopeHighlightingAction"
-            text="Highlight Current Scope"
-            description="Highlight current scope.">
-      <mouse-shortcut keymap="$default" keystroke="control button3" />
-      <mouse-shortcut keymap="Mac OS X" keystroke="meta button3" />
-      <mouse-shortcut keymap="Mac OS X 10.5+" keystroke="meta button3" />
-    </action>
-    <action class="com.chylex.intellij.coloredbrackets.action.ScopeOutsideHighlightingRestrainAction"
-            id="Rainbow.ScopeOutsideHighlightingRestrainAction"
-            text="Restrain Scope Highlighting"
-            description="Restrain outside of current scope highlighting.">
-      <mouse-shortcut keymap="$default" keystroke="alt button3" />
-      <mouse-shortcut keymap="Mac OS X" keystroke="alt button3" />
-      <mouse-shortcut keymap="Mac OS X 10.5+" keystroke="alt button3" />
-    </action>
-  </actions>
-
-</idea-plugin>

base/src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowJavaScriptTest.kt

@@ -1,219 +0,0 @@
-package com.chylex.intellij.coloredbrackets
-
-import com.intellij.ide.plugins.PluginManagerCore
-import com.intellij.lang.javascript.JSXFileType
-import com.intellij.lang.javascript.JavaScriptFileType
-import com.intellij.lang.javascript.TypeScriptFileType
-import com.intellij.openapi.extensions.PluginId
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
-import io.kotest.matchers.shouldBe
-import org.intellij.lang.annotations.Language
-
-class RainbowJavaScriptTest : LightJavaCodeInsightFixtureTestCase() {
-	
-	fun testJavaScriptPluginEnabled() {
-		assertTrue(PluginManagerCore.isLoaded(PluginId("JavaScript")))
-	}
-	
-	fun testIssue11() {
-		@Language("JavaScript") val code = """
-"use strict";
-
-const _ = require('lodash') || false
-const moment = require('moment')
-                            """.trimIndent()
-		
-		myFixture.configureByText(JavaScriptFileType, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				roundLevel(0),
-				roundLevel(0),
-				roundLevel(0),
-				roundLevel(0)
-			)
-		)
-	}
-	
-	fun testIssue12() {
-		@Language("JavaScript") val code = """
-"use strict";
-console.log(a > b)
-console.log(a == b)
-                            """.trimIndent()
-		myFixture.configureByText(JavaScriptFileType, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				roundLevel(0),
-				roundLevel(0),
-				roundLevel(0),
-				roundLevel(0)
-			)
-		)
-	}
-	
-	fun testIssue21() {
-		
-		@Language("JavaScript") val code = $$"open (${f})\nopen (${f} )"
-		
-		myFixture.configureByText(JavaScriptFileType, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				roundLevel(0),
-				roundLevel(0),
-				roundLevel(0),
-				roundLevel(0)
-			)
-		)
-	}
-	
-	fun testIssue23() {
-		@Language("JavaScript") val code = """
-"use strict";
-
-var a;
-
-if ((a.field_detail && a.is) ||
-    (a.field_detail && a.is) ||
-    (a.field_detail && a.is) ||
-    (a.field_detail && a.is) ||
-    (a.field_detail && a.is) ||
-    (a.field_detail && a.is) ||
-    (a.field_detail && a.is)
-) ;
-
-                            """.trimIndent()
-		
-		myFixture.configureByText(JavaScriptFileType, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				roundLevel(0),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(0)
-			)
-		)
-	}
-	
-	fun testIssue38() {
-		@Language("JavaScript") val code = """
-const element = ( <div> <h1>Hello, world!</h1> </div> );
-                            """.trimIndent()
-		
-		myFixture.configureByText(JSXFileType, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				roundLevel(0),
-				
-				angleLevel(0),
-				angleLevel(0),
-				angleLevel(1),
-				angleLevel(1),
-				angleLevel(1),
-				angleLevel(1),
-				angleLevel(0),
-				angleLevel(0),
-				
-				roundLevel(0)
-			)
-		)
-	}
-	
-	fun testIssue39() {
-		@Language("JavaScript") val code = """
-    const html = '<div><div><div>Hello</div></div></div>'
-                                """.trimIndent()
-		
-		myFixture.configureByText(JavaScriptFileType, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				angleLevel(0),
-				angleLevel(0),
-				angleLevel(1),
-				angleLevel(1),
-				angleLevel(2),
-				angleLevel(2),
-				angleLevel(2),
-				angleLevel(2),
-				angleLevel(1),
-				angleLevel(1),
-				angleLevel(0),
-				angleLevel(0)
-			)
-		)
-	}
-	
-	fun testIssue31() {
-		@Language("JavaScript") val code = """
-    "use strict";
-    const f = () => {}
-    const a = [1,2,3]
-    const s = `<ololo>`
-                                """.trimIndent()
-		
-		myFixture.configureByText(TypeScriptFileType, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				roundLevel(0),
-				roundLevel(0),
-				squigglyLevel(0),
-				squigglyLevel(0),
-				squareLevel(0),
-				squareLevel(0),
-				angleLevel(0),
-				angleLevel(0)
-			)
-		)
-	}
-	
-	fun testIssue427() {
-		@Language("TypeScript") val code = """let example: Array<Map<string,string>>;""".trimIndent()
-		
-		myFixture.configureByText(TypeScriptFileType, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				angleLevel(0),
-				angleLevel(1),
-				angleLevel(1),
-				angleLevel(0)
-			)
-		)
-	}
-	
-}

base/src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowKotlinTest.kt

@@ -1,134 +0,0 @@
-package com.chylex.intellij.coloredbrackets
-
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
-import io.kotest.matchers.shouldBe
-import org.intellij.lang.annotations.Language
-import org.jetbrains.kotlin.idea.KotlinFileType
-
-class RainbowKotlinTest : LightJavaCodeInsightFixtureTestCase() {
-	fun testRainbowForKotlin() {
-		@Language("kotlin") val code =
-			"""
-fun <T> filter(l: List<T>, f: (T) -> Boolean): MutableList<T> {
-    val res = mutableListOf<T>()
-    l.forEach { if (f(it)) { res += it  } }
-    return res
-}
-                """.trimIndent()
-		myFixture.configureByText(KotlinFileType.INSTANCE, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				angleLevel(0),
-				angleLevel(0),
-				
-				roundLevel(0),
-				angleLevel(0),
-				angleLevel(0),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(0),
-				
-				angleLevel(0),
-				angleLevel(0),
-				
-				squigglyLevel(0),
-				
-				angleLevel(0),
-				angleLevel(0),
-				
-				roundLevel(0),
-				roundLevel(0),
-				squigglyLevel(1),
-				
-				roundLevel(0),
-				roundLevel(1),
-				roundLevel(1),
-				roundLevel(0),
-				
-				squigglyLevel(2),
-				squigglyLevel(2),
-				
-				squigglyLevel(1),
-				
-				squigglyLevel(0)
-			
-			)
-		)
-	}
-	
-	fun testRainbowArrowForKotlin() {
-		@Language("kotlin") val code =
-			"""
-val a: (Int) -> Unit = { aa ->
-    val b: (Int) -> Unit = { bb ->
-        val c: (Int) -> Unit = { cc ->
-            val d: (Int) -> Unit = { dd ->
-            }
-        }
-    }
-}
-                """.trimIndent()
-		myFixture.configureByText(KotlinFileType.INSTANCE, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				roundLevel(0),
-				roundLevel(0),
-				squigglyLevel(0),
-				
-				roundLevel(0),
-				roundLevel(0),
-				squigglyLevel(1),
-				
-				roundLevel(0),
-				roundLevel(0),
-				squigglyLevel(2),
-				
-				roundLevel(0),
-				roundLevel(0),
-				squigglyLevel(3),
-				
-				squigglyLevel(3),
-				
-				squigglyLevel(2),
-				
-				squigglyLevel(1),
-				
-				squigglyLevel(0)
-			)
-		)
-	}
-	
-	fun testKotlinFunctionLiteralBracesAndArrow() {
-		@Language("kotlin") val code =
-			"""
-val a :Int = 1
-
-fun t() {
-    a?.let {
-    }
-}
-                """.trimIndent()
-		myFixture.configureByText(KotlinFileType.INSTANCE, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				roundLevel(0),
-				roundLevel(0),
-				squigglyLevel(0),
-				squigglyLevel(1),
-				squigglyLevel(1),
-				squigglyLevel(0)
-			)
-		)
-	}
-}

base/src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowXMLTest.kt

@@ -1,71 +0,0 @@
-package com.chylex.intellij.coloredbrackets
-
-import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
-import com.intellij.ide.highlighter.XmlFileType
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
-import io.kotest.matchers.shouldBe
-import org.intellij.lang.annotations.Language
-
-class RainbowXMLTest : LightJavaCodeInsightFixtureTestCase() {
-	fun testRainbowForXML() {
-		@Language("XML") val code =
-			"""
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE note SYSTEM>
-<idea-plugin>
-    <name>Rainbow Brackets</name>
-    <description>
-        <p>Supported languages:</p>
-        <p>Java, Scala, Clojure, Kotlin, Python, Haskell, Agda, Rust, JavaScript, TypeScript, Erlang, Go, Groovy, Ruby, Elixir, ObjectiveC, PHP, C#, HTML, XML, SQL, Apex language ...</p>
-        <br/>
-    </description>
-</idea-plugin>
-                """.trimIndent()
-		val rainbowSettings = RainbowSettings.instance
-		rainbowSettings.rainbowifyTagNameInXML = false
-		myFixture.configureByText(XmlFileType.INSTANCE, code)
-		PsiDocumentManager.getInstance(project).commitAllDocuments()
-		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
-			arrayOf(
-				angleLevel(0),
-				angleLevel(0),
-				
-				angleLevel(0),
-				angleLevel(0),
-				
-				angleLevel(0),
-				angleLevel(0),
-				
-				angleLevel(1),
-				angleLevel(1),
-				angleLevel(1),
-				angleLevel(1),
-				
-				angleLevel(1),
-				angleLevel(1),
-				
-				angleLevel(2),
-				angleLevel(2),
-				angleLevel(2),
-				angleLevel(2),
-				
-				angleLevel(2),
-				angleLevel(2),
-				angleLevel(2),
-				angleLevel(2),
-				
-				angleLevel(2),
-				angleLevel(2),
-				
-				angleLevel(1),
-				angleLevel(1),
-				
-				angleLevel(0),
-				angleLevel(0)
-			)
-		)
-	}
-}

build.gradle.kts

@@ -1,90 +1,131 @@
 @file:Suppress("ConvertLambdaToReference")
 
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import kotlin.io.path.Path
+
 plugins {
 	kotlin("jvm")
-	id("org.jetbrains.intellij.platform")
+	id("org.jetbrains.intellij")
 }
 
 group = "com.chylex.intellij.coloredbrackets"
-version = "1.5.0"
-
-val ideaVersion = "2026.2"
+version = "1.0.0"
 
 allprojects {
 	apply(plugin = "org.jetbrains.kotlin.jvm")
-	apply(plugin = "org.jetbrains.intellij.platform")
-	
-	ext {
-		set("ideaVersion", ideaVersion)
-	}
+	apply(plugin = "org.jetbrains.intellij")
 	
 	repositories {
 		mavenCentral()
-		
-		intellijPlatform {
-			defaultRepositories()
-		}
 	}
 
-	intellijPlatform {
-		sandboxContainer.set(layout.buildDirectory.map { it.dir("idea-sandbox") })
-		
-		pluginConfiguration {
-			ideaVersion {
-				sinceBuild.set("262")
-				untilBuild.set(provider { null })
-			}
-		}
-		
-		pluginVerification {
-			ides {
-				current()
-			}
-		}
+	intellij {
+		version.set("2023.3")
+		updateSinceUntilBuild.set(false)
 	}
 	
 	kotlin {
 		jvmToolchain(17)
-		
-		compilerOptions {
-			freeCompilerArgs = listOf(
-				"-X" + "jvm-default=all",
-			)
 	}
+	
+	tasks.withType<KotlinCompile> {
+		kotlinOptions.freeCompilerArgs = listOf(
+			"-Xjvm-default=all"
+		)
 	}
 }
 
 subprojects {
-	version = rootProject.version
-	
-	intellijPlatform {
-		buildSearchableOptions = false
+	tasks.buildSearchableOptions {
+		enabled = false
 	}
 }
 
 idea {
 	module {
-		excludeDirs.add(file(".kotlin"))
-		excludeDirs.add(file("build"))
 		excludeDirs.add(file("gradle"))
 	}
 }
 
-dependencies {
-	intellijPlatform {
-		@Suppress("DEPRECATION")
-		intellijIdeaUltimate(ideaVersion)
+intellij {
+	type.set("IU")
 	
-		pluginComposedModule(implementation(project(":base")))
-		pluginComposedModule(implementation(project(":clion")))
-		pluginComposedModule(implementation(project(":rider")))
+	plugins.set(
+		listOf(
+			// Built-in
+			"Groovy",
+			"JavaScript",
+			"com.intellij.css",
+			"com.intellij.database",
+			"com.intellij.java",
+			"org.intellij.plugins.markdown",
+			"org.jetbrains.kotlin",
+			"org.jetbrains.plugins.yaml",
+			// Downloaded
+			"Dart:233.11799.172",                              // https://plugins.jetbrains.com/plugin/6351-dart/versions/stable
+			"Pythonid:233.11799.300",                          // https://plugins.jetbrains.com/plugin/631-python/versions
+			"com.jetbrains.php:233.11799.300",                 // https://plugins.jetbrains.com/plugin/6610-php/versions
+			"com.jetbrains.sh:233.11799.165",                  // https://plugins.jetbrains.com/plugin/13122-shell-script/versions
+			"org.intellij.scala:2023.3.19",                    // https://plugins.jetbrains.com/plugin/1347-scala/versions
+			"org.jetbrains.plugins.go-template:233.11799.172", // https://plugins.jetbrains.com/plugin/10581-go-template/versions
+			"org.jetbrains.plugins.ruby:233.11799.300",        // https://plugins.jetbrains.com/plugin/1293-ruby/versions
+		)
+	)
+}
+
+dependencies {
+	testImplementation("junit:junit:4.13.2")
+	testImplementation("io.kotest:kotest-assertions-core:5.8.0") {
+		exclude(group = "org.jetbrains.kotlin")
 	}
 }
 
-intellijPlatform {
-	buildSearchableOptions.set(true)
+tasks.patchPluginXml {
+	sinceBuild.set("233")
 }
 
 tasks.test {
 	useJUnit()
 }
+
+tasks.buildPlugin {
+	
+	val projectName = rootProject.name
+	val instrumentedJarName = "instrumented-$projectName-$version"
+	
+	for (ide in listOf("clion", "rider")) {
+		val task = project(":$ide").tasks.buildPlugin
+		
+		dependsOn(task)
+		
+		from(task.map { it.outputs.files.map(::zipTree) }) {
+			include("$ide/lib/instrumented-$ide.jar")
+			into("lib")
+			
+			eachFile {
+				val newName = name.replace("instrumented-", "${instrumentedJarName}-")
+				val newPath = relativePath.segments.dropLast(3).plus(newName)
+				relativePath = RelativePath(true, *newPath.toTypedArray())
+			}
+			
+			
+			includeEmptyDirs = false
+		}
+	}
+	
+	doLast {
+		val expectedPaths = listOf(
+			Path(projectName, "lib", "instrumented-$projectName-$version-clion.jar"),
+			Path(projectName, "lib", "instrumented-$projectName-$version-rider.jar"),
+			Path(projectName, "lib", "instrumented-$projectName-$version.jar"),
+			Path(projectName, "lib", "searchableOptions-$version.jar"),
+		)
+		
+		val jarFiles = zipTree(outputs.files.singleFile)
+		
+		for (expectedPath in expectedPaths) {
+			val found = jarFiles.find { it.toPath().endsWith(expectedPath) }
+			checkNotNull(found) { "Expected path not found: $expectedPath" }
+		}
+	}
+}

clion/build.gradle.kts

@@ -1,11 +1,12 @@
-val ideaVersion: String by project
+intellij {
+	type.set("CL")
+	
+	plugins.set(listOf(
+		// Built-in
+		"cidr-base-plugin"
+	))
+}
 
 dependencies {
-	implementation(project(":base"))
-	
-	intellijPlatform {
-		clion(ideaVersion)
-		
-		compatiblePlugin("com.intellij.cidr.lang")
-	}
+	implementation(rootProject)
 }

gradle.properties

@@ -1,2 +1 @@
 kotlin.stdlib.default.dependency=false
-org.gradle.jvmargs=-Xmx1G

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,6 +112,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +170,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,14 +203,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -23,8 +21,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -45,13 +43,13 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -59,24 +57,36 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

rider/build.gradle.kts

@@ -1,13 +1,7 @@
-val ideaVersion: String by project
+intellij {
+	type.set("RD")
+}
 
 dependencies {
-	implementation(project(":base"))
-	
-	intellijPlatform {
-		rider(ideaVersion) {
-			useInstaller = false
-		}
-		
-		bundledModule("intellij.rider.languages")
-	}
+	implementation(rootProject)
 }

rider/src/main/kotlin/com/chylex/intellij/coloredbrackets/visitor/CSharpRainbowVisitor.kt

@@ -2,25 +2,130 @@ package com.chylex.intellij.coloredbrackets.visitor
 
 import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
 import com.intellij.codeInsight.daemon.impl.HighlightVisitor
+import com.intellij.lang.BracePair
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import com.intellij.psi.impl.source.tree.LeafPsiElement
 import com.intellij.psi.tree.IElementType
 import com.jetbrains.rider.languages.fileTypes.csharp.kotoparser.lexer.CSharpTokenType
 import com.jetbrains.rider.languages.fileTypes.csharp.psi.CSharpDummyNode
 
-class CSharpRainbowVisitor : ReSharperRainbowVisitor("C#") {
+class CSharpRainbowVisitor : RainbowHighlightVisitor() {
 	
-	override fun suitableForFile(file: PsiFile): Boolean {
-		return super.suitableForFile(file) && RainbowSettings.instance.isEnableRainbowAngleBrackets
-	}
-	
-	override fun isAllowedElementType(type: IElementType): Boolean {
-		return type == CSharpTokenType.LPARENTH || type == CSharpTokenType.RPARENTH
-	}
-	
-	override fun PsiElement.isDummyNode(): Boolean {
-		return this is CSharpDummyNode
-	}
+	override fun suitableForFile(file: PsiFile)
+		: Boolean = super.suitableForFile(file) &&
+		RainbowSettings.instance.isEnableRainbowAngleBrackets &&
+		(file.language.id == "C#" ||
+			file.viewProvider.allFiles.any { it.language.id == "C#" }
+			)
 	
 	override fun clone(): HighlightVisitor = CSharpRainbowVisitor()
+	
+	override fun visit(element: PsiElement) {
+		val type = (element as? LeafPsiElement)?.elementType ?: return
+		val pair = map[type]
+		if (pair != null) {
+			val level = element.getBracketLevel(pair, type)
+			if (RainbowSettings.instance.isDoNOTRainbowifyTheFirstLevel) {
+				if (level >= 1) {
+					rainbowPairs(element, pair, level)
+				}
+			}
+			else {
+				if (level >= 0) {
+					rainbowPairs(element, pair, level)
+				}
+			}
+		}
+	}
+	
+	private fun rainbowPairs(element: LeafPsiElement, pair: BracePair, level: Int) {
+		val startElement = element.takeIf { it.elementType == pair.leftBraceType }
+		val endElement = element.takeIf { it.elementType == pair.rightBraceType }
+		element.setHighlightInfo(element.parent, level, startElement, endElement)
+	}
+	
+	companion object {
+		val map = mapOf(
+			CSharpTokenType.LPARENTH to BracePair(CSharpTokenType.LPARENTH, CSharpTokenType.RPARENTH, true),
+			CSharpTokenType.RPARENTH to BracePair(CSharpTokenType.LPARENTH, CSharpTokenType.RPARENTH, true),
+			//LT to BracePair(LT, GT, true),
+			//GT to BracePair(LT, GT, true),
+		)
+		
+		private fun LeafPsiElement.getBracketLevel(pair: BracePair, type: IElementType): Int = iterateBracketParents(this, pair, -1, type)
+		
+		private tailrec fun iterateBracketParents(element: PsiElement?, pair: BracePair, count: Int, type: IElementType): Int {
+			if (element == null || element is PsiFile) {
+				return count
+			}
+			
+			var nextCount = count
+			
+			if (element is LeafPsiElement && type == pair.leftBraceType && element.elementType == pair.rightBraceType) {
+				nextCount--
+			}
+			
+			if (element is LeafPsiElement && type == pair.rightBraceType && element.elementType == pair.leftBraceType) {
+				nextCount--
+			}
+			
+			if (element is LeafPsiElement && element.elementType == type) {
+				nextCount++
+			}
+			
+			return if (type == pair.leftBraceType) {
+				val prev = element.prevSibling
+				if (prev == null) {
+					iterateBracketParents(element.parent.prevSibling.iterForPreDummyNode()?.lastChild, pair, nextCount, type)
+				}
+				else {
+					iterateBracketParents(prev, pair, nextCount, type)
+				}
+			}
+			else {
+				val next = element.nextSibling
+				if (next == null) {
+					iterateBracketParents(element.parent.nextSibling.iterForNextDummyNode()?.firstChild, pair, nextCount, type)
+				}
+				else {
+					iterateBracketParents(next, pair, nextCount, type)
+				}
+			}
+		}
+		
+		private tailrec fun PsiElement?.iterForNextDummyNode(): PsiElement? {
+			return if (this == null) {
+				null
+			}
+			else if (this is CSharpDummyNode) {
+				this
+			}
+			else {
+				if (this.nextSibling == null) {
+					null
+				}
+				else {
+					this.nextSibling.iterForNextDummyNode()
+				}
+			}
+		}
+		
+		private tailrec fun PsiElement?.iterForPreDummyNode(): PsiElement? {
+			return if (this == null) {
+				null
+			}
+			else if (this is CSharpDummyNode) {
+				this
+			}
+			else {
+				if (this.prevSibling == null) {
+					null
+				}
+				else {
+					this.prevSibling.iterForPreDummyNode()
+				}
+			}
+		}
+	}
 }

rider/src/main/resources/META-INF/csharp-annotator.xml

@@ -0,0 +1,5 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <annotator language="C#" implementationClass="com.chylex.intellij.coloredbrackets.annotator.RainbowAnnotator" />
+  </extensions>
+</idea-plugin>

settings.gradle.kts

@@ -2,11 +2,10 @@ rootProject.name = "ColoredBrackets"
 
 pluginManagement {
 	plugins {
-		kotlin("jvm") version "2.4.10"
-		id("org.jetbrains.intellij.platform") version "2.18.1"
+		kotlin("jvm") version "1.9.21"
+		id("org.jetbrains.intellij") version "1.17.4"
 	}
 }
 
-include(":base")
-include(":clion")
-include(":rider")
+include("clion")
+include("rider")

src/main/kotlin/com/chylex/intellij/coloredbrackets/BracePairs.kt

@@ -16,7 +16,7 @@ object BracePairs {
 	
 	private val providers = LanguageExtension<BracePairProvider>("com.chylex.coloredbrackets.bracePairProvider")
 	
-	val bracePairs = lazy {
+	private val bracePairs = lazy {
 		Language.getRegisteredLanguages()
 			.map { language ->
 				if (language is CompositeLanguage) {
@@ -57,7 +57,8 @@ object BracePairs {
 							true
 						}
 					}
-					?.flatMap { listOf(Pair(it.leftBraceType.toString(), it), Pair(it.rightBraceType.toString(), it)) }
+					?.map { listOf(Pair(it.leftBraceType.toString(), it), Pair(it.rightBraceType.toString(), it)) }
+					?.flatten()
 					?.forEach {
 						val bracePairs = braceMap[it.first]
 						if (bracePairs == null) {
@@ -68,18 +69,20 @@ object BracePairs {
 						}
 					}
 				
-				language.id to braceMap
+				language.displayName to braceMap
 			}
 			.toMap()
 	}
 	
-	private fun getBraceTypeSetOf(language: Language): Set<IElementType> = language.bracePairs?.values?.flatten()?.flatMap { listOf(it.leftBraceType, it.rightBraceType) }?.toSet() ?: emptySet()
+	fun getBracePairs(language: Language): MutableMap<String, MutableList<BracePair>>? = bracePairs.value[language.displayName]
+	
+	private fun getBraceTypeSetOf(language: Language): Set<IElementType> = getBracePairs(language)?.values?.flatten()?.map { listOf(it.leftBraceType, it.rightBraceType) }?.flatten()?.toSet() ?: emptySet()
 	
 	val braceTypeSet: (Language) -> Set<IElementType> = { language: Language -> getBraceTypeSetOf(language) }.memoize()
-	
-	inline val Language.bracePairs: MutableMap<String, MutableList<BracePair>>?
-		get() = BracePairs.bracePairs.value[this.id]
-	
-	inline val Language.braceTypeSet: Set<IElementType>
-		get() = BracePairs.braceTypeSet(this)
 }
+
+inline val Language.bracePairs: MutableMap<String, MutableList<BracePair>>?
+	get() = BracePairs.getBracePairs(this)
+
+inline val Language.braceTypeSet: Set<IElementType>
+	get() = BracePairs.braceTypeSet(this)

src/main/kotlin/com/chylex/intellij/coloredbrackets/RainbowHighlighter.kt

@@ -1,8 +1,6 @@
 package com.chylex.intellij.coloredbrackets
 
 import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
-import com.chylex.intellij.coloredbrackets.util.alphaBlend
-import com.chylex.intellij.coloredbrackets.util.create
 import com.chylex.intellij.coloredbrackets.util.memoize
 import com.intellij.codeInsight.daemon.impl.HighlightInfo
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType
@@ -57,9 +55,6 @@ object RainbowHighlighter {
 		createRainbowAttributesKeys(KEY_ANGLE_BRACKETS, settings.numberOfColors)
 	}
 	
-	private val SCOPE_HIGHLIGHTING_KEY = TextAttributesKey.createTempTextAttributesKey("ColoredBrackets:ScopeHighlighting", TextAttributes.ERASE_MARKER)
-	private val SCOPE_OUTSIDE_HIGHLIGHTING_KEY = TextAttributesKey.createTempTextAttributesKey("ColoredBrackets:ScopeOutsideHighlighting", TextAttributes.ERASE_MARKER)
-	
 	private val rainbowElement: HighlightInfoType = HighlightInfoType
 		.HighlightInfoTypeImpl(HighlightSeverity.INFORMATION, DefaultLanguageHighlighterColors.CONSTANT)
 	
@@ -142,7 +137,7 @@ object RainbowHighlighter {
 	}
 	
 	private fun genByOption(option: String, rainbowName: String, level: Int) =
-		create(
+		com.chylex.intellij.coloredbrackets.util.create(
 			"$rainbowName-$level",
 			TextAttributes(randomColor(option), null, null, null, 0)
 		)
@@ -230,23 +225,4 @@ object RainbowHighlighter {
 	private fun EditorColorsScheme.setInherited(key: TextAttributesKey, inherited: Boolean) {
 		setAttributes(key, if (inherited) AbstractColorsScheme.INHERITED_ATTRS_MARKER else TextAttributes())
 	}
-	
-	fun updateScopeHighlightingAttributes(scheme: EditorColorsScheme, rainbowInfo: RainbowInfo): TextAttributesKey {
-		val defaultBackground = EditorColorsManager.getInstance().globalScheme.defaultBackground
-		val background = rainbowInfo.color.alphaBlend(defaultBackground, 0.2f)
-		val attributes = TextAttributes(null, background, rainbowInfo.color, EffectType.BOXED, Font.PLAIN)
-		
-		scheme.setAttributes(SCOPE_HIGHLIGHTING_KEY, attributes)
-		return SCOPE_HIGHLIGHTING_KEY
-	}
-	
-	fun updateScopeOutsideHighlightingAttributes(scheme: EditorColorsScheme): TextAttributesKey {
-		val defaultBackground = scheme.defaultBackground
-		val background = Color.GRAY.alphaBlend(defaultBackground, 0.05f)
-		val foreground = Color.GRAY.alphaBlend(defaultBackground, 0.55f)
-		val attributes = TextAttributes(foreground, background, background, EffectType.BOXED, Font.PLAIN)
-		
-		scheme.setAttributes(SCOPE_OUTSIDE_HIGHLIGHTING_KEY, attributes)
-		return SCOPE_OUTSIDE_HIGHLIGHTING_KEY
-	}
 }

src/main/kotlin/com/chylex/intellij/coloredbrackets/RainbowifyBanner.kt

@@ -9,27 +9,21 @@ import com.intellij.icons.AllIcons
 import com.intellij.ide.actions.ShowSettingsUtilImpl
 import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.Ref
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.EditorNotificationPanel
-import com.intellij.ui.EditorNotificationProvider
 import com.intellij.ui.EditorNotifications
 import com.intellij.ui.HyperlinkLabel
-import java.util.function.Function
-import javax.swing.JComponent
 
-class RainbowifyBanner : EditorNotificationProvider {
-	override fun collectNotificationData(project: Project, file: VirtualFile): Function<in FileEditor, out JComponent?> {
-		return Function { createNotificationPanel(project, file) }
-	}
+class RainbowifyBanner : EditorNotifications.Provider<EditorNotificationPanel>() {
+	override fun getKey(): Key<EditorNotificationPanel> = KEY
 	
-	private fun createNotificationPanel(project: Project, file: VirtualFile): EditorNotificationPanel? {
+	override fun createNotificationPanel(file: VirtualFile, fileEditor: FileEditor, project: Project): EditorNotificationPanel? {
 		val settings = RainbowSettings.instance
 		
 		if (!settings.isRainbowEnabled) {
-			if (settings.suppressDisabledCheck) {
-				return null
-			}
+			if (settings.suppressDisabledCheck) return null
 			return EditorNotificationPanel().apply {
 				text("Colored Brackets is now disabled")
 				icon(AllIcons.General.GearPlain)
@@ -47,9 +41,7 @@ class RainbowifyBanner : EditorNotificationProvider {
 		
 		val psiFile = file.toPsiFile(project)
 		if (psiFile != null && !checkForBigFile(psiFile)) {
-			if (settings.suppressBigFileCheck) {
-				return null
-			}
+			if (settings.suppressBigFileCheck) return null
 			return EditorNotificationPanel().apply {
 				text("Rainbowify is disabled for files > " + settings.bigFilesLinesThreshold + " lines")
 				icon(AllIcons.General.InspectionsEye)
@@ -69,9 +61,7 @@ class RainbowifyBanner : EditorNotificationProvider {
 			settings.languageBlacklist.contains(file.fileType.name) ||
 			settings.languageBlacklist.contains(memoizedFileExtension(file.name))
 		) {
-			if (settings.suppressBlackListCheck) {
-				return null
-			}
+			if (settings.suppressBlackListCheck) return null
 			return EditorNotificationPanel().apply {
 				text("Rainbowify is disabled because the language/file extension is in the black list")
 				icon(AllIcons.General.InspectionsEye)
@@ -91,10 +81,14 @@ class RainbowifyBanner : EditorNotificationProvider {
 		return null
 	}
 	
-	private fun EditorNotificationPanel.createComponentActionLabel(labelText: String, callback: (HyperlinkLabel) -> Unit) {
+	companion object {
+		private val KEY = Key.create<EditorNotificationPanel>("RainbowifyBanner")
+		
+		fun EditorNotificationPanel.createComponentActionLabel(labelText: String, callback: (HyperlinkLabel) -> Unit) {
 			val label: Ref<HyperlinkLabel> = Ref.create()
 			label.set(createActionLabel(labelText) {
 				callback(label.get())
 			})
 		}
+	}
 }

src/main/kotlin/com/chylex/intellij/coloredbrackets/RandomColorGenerator.kt

@@ -2,7 +2,6 @@ package com.chylex.intellij.coloredbrackets
 
 import com.chylex.intellij.coloredbrackets.color.Luminosity
 import com.chylex.intellij.coloredbrackets.color.fromString
-import com.chylex.intellij.coloredbrackets.color.randomColor
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
@@ -12,7 +11,7 @@ val mapper: ObjectMapper by lazy { jacksonObjectMapper() }
 
 fun randomColor(options: String): Color {
 	val ops: Map<String, String> = mapper.readValue(options)
-	return randomColor(
+	return com.chylex.intellij.coloredbrackets.color.randomColor(
 		fromString(ops.getOrDefault("hue", "random")),
 		Luminosity.valueOf(ops.getOrDefault("luminosity", "random"))
 	)

src/main/kotlin/com/chylex/intellij/coloredbrackets/action/AbstractScopeHighlightingAction.kt

@@ -35,7 +35,7 @@ abstract class AbstractScopeHighlightingAction : AnAction() {
 		val offset = editor.caretModel.offset
 		val rainbowInfo = psiFile.findRainbowInfoAt(offset) ?: return
 		val highlightManager = HighlightManager.getInstance(project)
-		val highlighters = editor.addHighlighter(editor, highlightManager, rainbowInfo)
+		val highlighters = editor.addHighlighter(highlightManager, rainbowInfo)
 		
 		editor.highlightingDisposer?.dispose()
 		if (highlighters.isNotEmpty()) {
@@ -47,7 +47,6 @@ abstract class AbstractScopeHighlightingAction : AnAction() {
 	}
 	
 	protected abstract fun Editor.addHighlighter(
-		editor: Editor,
 		highlightManager: HighlightManager,
 		rainbowInfo: RainbowInfo,
 	): Collection<RangeHighlighter>

src/main/kotlin/com/chylex/intellij/coloredbrackets/action/ScopeHighlightingAction.kt

@@ -1,33 +1,38 @@
 package com.chylex.intellij.coloredbrackets.action
 
-import com.chylex.intellij.coloredbrackets.RainbowHighlighter
 import com.chylex.intellij.coloredbrackets.RainbowInfo
 import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
+import com.chylex.intellij.coloredbrackets.util.alphaBlend
 import com.intellij.codeInsight.highlighting.HighlightManager
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.colors.EditorColorsManager
+import com.intellij.openapi.editor.markup.EffectType
 import com.intellij.openapi.editor.markup.RangeHighlighter
+import com.intellij.openapi.editor.markup.TextAttributes
+import java.awt.Font
 import java.util.LinkedList
 
 class ScopeHighlightingAction : AbstractScopeHighlightingAction() {
 	
 	override fun Editor.addHighlighter(
-		editor: Editor,
 		highlightManager: HighlightManager,
 		rainbowInfo: RainbowInfo,
 	): Collection<RangeHighlighter> {
-		val attributesKey = RainbowHighlighter.updateScopeHighlightingAttributes(editor.colorsScheme, rainbowInfo)
+		val defaultBackground = EditorColorsManager.getInstance().globalScheme.defaultBackground
+		val background = rainbowInfo.color.alphaBlend(defaultBackground, 0.2f)
+		val attributes = TextAttributes(null, background, rainbowInfo.color, EffectType.BOXED, Font.PLAIN)
 		val highlighters = LinkedList<RangeHighlighter>()
-		
 		highlightManager.addRangeHighlight(
 			this,
 			rainbowInfo.startOffset,
 			rainbowInfo.endOffset,
-			attributesKey,
-			false,
-			RainbowSettings.instance.pressAnyKeyToRemoveTheHighlightingEffects,
+			attributes, //create("ScopeHighlightingAction", attributes),
+			false, //hideByTextChange
+			RainbowSettings.instance.pressAnyKeyToRemoveTheHighlightingEffects, //hideByAnyKey
 			highlighters
 		)
 		
 		return highlighters
 	}
+	
 }

src/main/kotlin/com/chylex/intellij/coloredbrackets/action/ScopeOutsideHighlightingRestrainAction.kt

@@ -1,21 +1,28 @@
 package com.chylex.intellij.coloredbrackets.action
 
-import com.chylex.intellij.coloredbrackets.RainbowHighlighter
 import com.chylex.intellij.coloredbrackets.RainbowInfo
 import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
+import com.chylex.intellij.coloredbrackets.util.alphaBlend
 import com.intellij.codeInsight.highlighting.HighlightManager
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.colors.EditorColorsManager
+import com.intellij.openapi.editor.markup.EffectType
 import com.intellij.openapi.editor.markup.RangeHighlighter
+import com.intellij.openapi.editor.markup.TextAttributes
+import java.awt.Color
+import java.awt.Font
 import java.util.LinkedList
 
 class ScopeOutsideHighlightingRestrainAction : AbstractScopeHighlightingAction() {
 	
 	override fun Editor.addHighlighter(
-		editor: Editor,
 		highlightManager: HighlightManager,
 		rainbowInfo: RainbowInfo,
 	): Collection<RangeHighlighter> {
-		val attributesKey = RainbowHighlighter.updateScopeOutsideHighlightingAttributes(editor.colorsScheme)
+		val defaultBackground = EditorColorsManager.getInstance().globalScheme.defaultBackground
+		val background = Color.GRAY.alphaBlend(defaultBackground, 0.05f)
+		val foreground = Color.GRAY.alphaBlend(defaultBackground, 0.55f)
+		val attributes = TextAttributes(foreground, background, background, EffectType.BOXED, Font.PLAIN)
 		val highlighters = LinkedList<RangeHighlighter>()
 		
 		val startOffset = rainbowInfo.startOffset
@@ -26,9 +33,9 @@ class ScopeOutsideHighlightingRestrainAction : AbstractScopeHighlightingAction()
 				this,
 				0,
 				startOffset,
-				attributesKey,
-				false,
-				hideByAnyKey,
+				attributes, //create("ScopeOutsideHighlightingRestrainAction", attributes),
+				false, //hideByTextChange
+				hideByAnyKey, //hideByAnyKey
 				highlighters
 			)
 		}
@@ -40,13 +47,14 @@ class ScopeOutsideHighlightingRestrainAction : AbstractScopeHighlightingAction()
 				this,
 				endOffset,
 				lastOffset,
-				attributesKey,
-				false,
-				hideByAnyKey,
+				attributes, //create("ScopeOutsideHighlightingRestrainAction", attributes),
+				false, //hideByTextChange
+				hideByAnyKey, //hideByAnyKey
 				highlighters
 			)
 		}
 		
 		return highlighters
 	}
+	
 }

src/main/kotlin/com/chylex/intellij/coloredbrackets/annotator/KotlinLambdaExpressionArrowAnnotator.kt

@@ -16,7 +16,7 @@ class KotlinLambdaExpressionArrowAnnotator : Annotator {
 		if ((element as? LeafPsiElement)?.elementType == KtTokens.ARROW) {
 			RainbowInfo.RAINBOW_INFO_KEY[element.parent]?.color?.let {
 				holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
-					.range(element as PsiElement) // Cast necessary due to overload conflict in Kotlin 2 compiler.
+					.range(element)
 					.textAttributes(
 						com.chylex.intellij.coloredbrackets.util.create(
 							"rainbow-kotlin-arrow",

src/main/kotlin/com/chylex/intellij/coloredbrackets/annotator/RainbowAnnotator.kt

@@ -0,0 +1,123 @@
+package com.chylex.intellij.coloredbrackets.annotator
+
+import com.chylex.intellij.coloredbrackets.RainbowHighlighter.NAME_ANGLE_BRACKETS
+import com.chylex.intellij.coloredbrackets.RainbowHighlighter.NAME_ROUND_BRACKETS
+import com.chylex.intellij.coloredbrackets.RainbowHighlighter.NAME_SQUARE_BRACKETS
+import com.chylex.intellij.coloredbrackets.RainbowHighlighter.NAME_SQUIGGLY_BRACKETS
+import com.chylex.intellij.coloredbrackets.RainbowHighlighter.getRainbowColorByLevel
+import com.chylex.intellij.coloredbrackets.annotator.RainbowUtils.annotateUtil
+import com.chylex.intellij.coloredbrackets.annotator.RainbowUtils.settings
+import com.chylex.intellij.coloredbrackets.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
+import com.intellij.psi.impl.source.tree.LeafPsiElement
+
+class RainbowAnnotator : Annotator {
+	override fun annotate(element: PsiElement, holder: AnnotationHolder) {
+		val settings = settings
+		if (settings.isRainbowEnabled && element is LeafPsiElement) {
+			if (!settings.applyColorsOfRoundForAllBrackets) {
+				if (settings.isEnableRainbowRoundBrackets) annotateUtil(element, holder, "(", ")", NAME_ROUND_BRACKETS)
+				if (settings.isEnableRainbowSquareBrackets) annotateUtil(element, holder, "[", "]", NAME_SQUARE_BRACKETS)
+				if (settings.isEnableRainbowSquigglyBrackets) annotateUtil(element, holder, "{", "}", NAME_SQUIGGLY_BRACKETS)
+				if (settings.isEnableRainbowAngleBrackets) annotateUtil(element, holder, "<", ">", NAME_ANGLE_BRACKETS)
+			}
+			else {
+				if (settings.isEnableRainbowRoundBrackets) annotateUtil(element, holder, "(", ")", NAME_ROUND_BRACKETS)
+				if (settings.isEnableRainbowSquareBrackets) annotateUtil(element, holder, "[", "]", NAME_ROUND_BRACKETS)
+				if (settings.isEnableRainbowSquigglyBrackets) annotateUtil(element, holder, "{", "}", NAME_ROUND_BRACKETS)
+				if (settings.isEnableRainbowAngleBrackets) annotateUtil(element, holder, "<", ">", NAME_ROUND_BRACKETS)
+			}
+		}
+	}
+}
+
+object RainbowUtils {
+	
+	private val leftBracketsSet = setOf("(", "[", "{", "<")
+	private val rightBracketsSet = setOf(")", "]", "}", ">")
+	
+	val settings
+		get() = RainbowSettings.instance
+	
+	private tailrec fun iterateChildren(
+		LEFT: String,
+		RIGHT: String,
+		currentNode: PsiElement,
+		currentLevel: Int,
+		currentChild: PsiElement,
+	): Int {
+		val calculatedLevel = if (currentChild is LeafPsiElement) {
+			//Using `currentChild.elementType.toString()` if we didn't want add more dependencies.
+			if (!settings.cycleCountOnAllBrackets) {
+				when (currentChild.text) {
+					LEFT  -> currentLevel + 1
+					RIGHT -> currentLevel - 1
+					else  -> currentLevel
+				}
+			}
+			else {
+				when {
+					leftBracketsSet.contains(currentChild.text)  -> currentLevel + 1
+					rightBracketsSet.contains(currentChild.text) -> currentLevel - 1
+					else                                         -> currentLevel
+				}
+			}
+		}
+		else currentLevel
+		
+		return if ((currentChild != currentNode) && (currentChild != currentNode.parent.lastChild))
+			iterateChildren(LEFT, RIGHT, currentNode, calculatedLevel, currentChild.nextSibling)
+		else
+			calculatedLevel
+	}
+	
+	private tailrec fun iterateParents(
+		LEFT: String,
+		RIGHT: String,
+		currentNode: PsiElement,
+		currentLevel: Int,
+	): Int = if (currentNode.parent !is PsiFile) {
+		val calculatedLevel = iterateChildren(LEFT, RIGHT, currentNode, currentLevel, currentNode.parent.firstChild)
+		iterateParents(LEFT, RIGHT, currentNode.parent, calculatedLevel)
+	}
+	else currentLevel
+	
+	private fun getBracketLevel(element: LeafPsiElement, LEFT: String, RIGHT: String): Int {
+		//Using `element.elementType.toString()` if we didn't want add more dependencies.
+		val startLevel = if (element.text == RIGHT) 0 else -1
+		return iterateParents(LEFT, RIGHT, element, startLevel)
+	}
+	
+	fun annotateUtil(
+		element: LeafPsiElement, holder: AnnotationHolder,
+		LEFT: String, RIGHT: String, rainbowName: String,
+	) {
+		//Using `element.elementType.toString()` if we didn't want add more dependencies.
+		val level = when (element.text) {
+			LEFT, RIGHT -> getBracketLevel(element, LEFT, RIGHT)
+			else        -> -1
+		}
+		val scheme = EditorColorsManager.getInstance().globalScheme
+		if (RainbowSettings.instance.isDoNOTRainbowifyTheFirstLevel) {
+			if (level >= 1) {
+				holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
+					.range(element.psi)
+					.textAttributes(getRainbowColorByLevel(scheme, rainbowName, level))
+					.create()
+			}
+		}
+		else {
+			if (level >= 0) {
+				holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
+					.range(element.psi)
+					.textAttributes(getRainbowColorByLevel(scheme, rainbowName, level))
+					.create()
+			}
+		}
+	}
+}

src/main/kotlin/com/chylex/intellij/coloredbrackets/color/RandomKolor.kt

@@ -134,14 +134,13 @@ private fun matchColor(hueValue: Int, hue: Hue): Color {
 				hueVal -= 360
 			}
 			
-			for (color in Color.entries) {
+			for (color in Color.values()) {
 				if (hueVal in color.hueRange.first..color.hueRange.second) {
 					return color
 				}
 			}
-			
 			// Returning Monochrome if we can't find a value, but this should never happen
-			Color.monochrome
+			return Color.monochrome
 		}
 	}
 }

src/main/kotlin/com/chylex/intellij/coloredbrackets/indents/RainbowIndentGuideRenderer.kt

@@ -7,21 +7,18 @@ import com.chylex.intellij.coloredbrackets.util.findNextSibling
 import com.chylex.intellij.coloredbrackets.util.findPrevSibling
 import com.chylex.intellij.coloredbrackets.util.lineNumber
 import com.chylex.intellij.coloredbrackets.util.startOffset
-import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.SoftWrap
-import com.intellij.openapi.editor.ex.DocumentEx
 import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.editor.impl.EditorImpl
 import com.intellij.openapi.editor.impl.view.EditorPainter
 import com.intellij.openapi.editor.impl.view.VisualLinesIterator
 import com.intellij.openapi.editor.markup.CustomHighlighterRenderer
 import com.intellij.openapi.editor.markup.RangeHighlighter
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Condition
-import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiManager
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.xml.XmlFile
 import com.intellij.psi.xml.XmlTag
@@ -38,15 +35,13 @@ import kotlin.math.max
  * */
 class RainbowIndentGuideRenderer : CustomHighlighterRenderer {
 	override fun paint(editor: Editor, highlighter: RangeHighlighter, g: Graphics) {
-		if (editor !is EditorEx) {
-			return
-		}
+		if (editor !is EditorEx) return
+		
+		val rainbowInfo = getRainbowInfo(editor, highlighter) ?: return
 		
 		val startOffset = highlighter.startOffset
 		val doc = highlighter.document
-		if (startOffset >= doc.textLength) {
-			return
-		}
+		if (startOffset >= doc.textLength) return
 		
 		val endOffset = highlighter.endOffset
 		
@@ -64,21 +59,15 @@ class RainbowIndentGuideRenderer : CustomHighlighterRenderer {
 		val startPosition = editor.offsetToVisualPosition(off)
 		val indentColumn = startPosition.column
 		
-		if (indentColumn <= 0) {
-			return
-		}
+		if (indentColumn <= 0) return
 		
 		val foldingModel = editor.foldingModel
-		if (foldingModel.isOffsetCollapsed(off)) {
-			return
-		}
+		if (foldingModel.isOffsetCollapsed(off)) return
 		
 		val headerRegion = foldingModel.getCollapsedRegionAtOffset(doc.getLineEndOffset(doc.getLineNumber(off)))
 		val tailRegion = foldingModel.getCollapsedRegionAtOffset(doc.getLineStartOffset(doc.getLineNumber(endOffset)))
 		
-		if (tailRegion != null && tailRegion === headerRegion) {
-			return
-		}
+		if (tailRegion != null && tailRegion === headerRegion) return
 		
 		val guide = editor.indentsModel.caretIndentGuide
 		val selected = if (guide != null) {
@@ -88,7 +77,7 @@ class RainbowIndentGuideRenderer : CustomHighlighterRenderer {
 		}
 		else false
 		
-		val lineHeight = editor.lineHeight
+		val lineHeight = editor.getLineHeight()
 		val start = editor.visualPositionToXY(startPosition)
 		start.y += lineHeight
 		val endPosition = editor.offsetToVisualPosition(endOffset)
@@ -105,11 +94,7 @@ class RainbowIndentGuideRenderer : CustomHighlighterRenderer {
 			}
 			maxY = StrictMath.min(maxY, clip.y + clip.height)
 		}
-		if (start.y >= maxY) {
-			return
-		}
-		
-		val rainbowInfo = getRainbowInfo(editor, highlighter) ?: return
+		if (start.y >= maxY) return
 		val targetX = max(0, start.x + EditorPainter.getIndentGuideShift(editor)).toDouble()
 		g.color = if (selected) {
 			rainbowInfo.color
@@ -177,19 +162,13 @@ class RainbowIndentGuideRenderer : CustomHighlighterRenderer {
 		}
 		
 		private fun getRainbowInfo(editor: EditorEx, highlighter: RangeHighlighter): RainbowInfo? {
-			val project = editor.project ?: return null
+			val virtualFile = editor.virtualFile?.takeIf { it.isValid } ?: return null
 			val document = editor.document
-			
-			return ReadAction.computeBlocking<RainbowInfo?, Throwable> {
-				getRainbowInfoInReadAction(project, document, highlighter)
-			}
-		}
-		
-		private fun getRainbowInfoInReadAction(project: Project, document: DocumentEx, highlighter: RangeHighlighter): RainbowInfo? {
-			val psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document) ?: return null
+			val project = editor.project ?: return null
+			val psiFile = PsiManager.getInstance(project).findFile(virtualFile) ?: return null
 			var element = try {
 				psiFile.findElementAt(highlighter.endOffset)?.parent ?: return null
-			} catch (_: Throwable) {
+			} catch (e: Throwable) {
 				return null
 			}
 			
@@ -285,5 +264,6 @@ class RainbowIndentGuideRenderer : CustomHighlighterRenderer {
 		
 		private fun XmlTag.getEndTagStartLineNumber(document: Document): Int? =
 			lastChild?.findPrevSibling(XML_END_TAG_START_CONDITION)?.let { document.lineNumber(it.startOffset) }
+		
 	}
 }

src/main/kotlin/com/chylex/intellij/coloredbrackets/indents/RainbowIndentsPass.kt

@@ -8,6 +8,7 @@ import com.intellij.ide.actions.ToggleZenModeAction
 import com.intellij.lang.LanguageParserDefinitions
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.IndentGuideDescriptor
+import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.intellij.openapi.editor.markup.HighlighterTargetArea
 import com.intellij.openapi.editor.markup.MarkupModel
@@ -22,8 +23,8 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiFile
 import com.intellij.psi.tree.TokenSet
 import com.intellij.util.DocumentUtil
+import com.intellij.util.containers.IntStack
 import com.intellij.util.text.CharArrayUtil
-import it.unimi.dsi.fastutil.ints.IntArrayList
 import java.lang.StrictMath.abs
 import java.lang.StrictMath.min
 import java.util.Collections
@@ -34,9 +35,11 @@ import java.util.Collections
  * */
 class RainbowIndentsPass internal constructor(
 	project: Project,
-	private val myEditor: Editor,
+	editor: Editor,
 	private val myFile: PsiFile,
-) : TextEditorHighlightingPass(project, myEditor.document, false), DumbAware {
+) : TextEditorHighlightingPass(project, editor.document, false), DumbAware {
+	
+	private val myEditor: EditorEx = editor as EditorEx
 	
 	@Volatile
 	private var myRanges = emptyList<TextRange>()
@@ -46,9 +49,7 @@ class RainbowIndentsPass internal constructor(
 	
 	override fun doCollectInformation(progress: ProgressIndicator) {
 		val stamp = myEditor.getUserData(LAST_TIME_INDENTS_BUILT)
-		if (stamp != null && stamp == nowStamp()) {
-			return
-		}
+		if (stamp != null && stamp.toLong() == nowStamp()) return
 		
 		myDescriptors = buildDescriptors()
 		
@@ -74,9 +75,7 @@ class RainbowIndentsPass internal constructor(
 		val stamp = myEditor.getUserData(LAST_TIME_INDENTS_BUILT)
 		val nowStamp = nowStamp()
 		
-		if (stamp == nowStamp) {
-			return
-		}
+		if (stamp == nowStamp) return
 		
 		myEditor.putUserData(LAST_TIME_INDENTS_BUILT, nowStamp)
 		
@@ -146,16 +145,14 @@ class RainbowIndentsPass internal constructor(
 	}
 	
 	private fun buildDescriptors(): List<IndentGuideDescriptor> {
-		if (!isRainbowIndentGuidesShown(this.myProject)) {
-			return emptyList()
-		}
+		if (!isRainbowIndentGuidesShown(this.myProject)) return emptyList()
 		
 		val calculator = IndentsCalculator()
 		calculator.calculate()
 		val lineIndents = calculator.lineIndents
 		
-		val lines = IntArrayList()
-		val indents = IntArrayList()
+		val lines = IntStack()
+		val indents = IntStack()
 		
 		lines.push(0)
 		indents.push(0)
@@ -164,10 +161,10 @@ class RainbowIndentsPass internal constructor(
 			ProgressManager.checkCanceled()
 			val curIndent = abs(lineIndents[line])
 			
-			while (!indents.isEmpty && curIndent <= indents.peekInt(0)) {
+			while (!indents.empty() && curIndent <= indents.peek()) {
 				ProgressManager.checkCanceled()
-				val level = indents.popInt()
-				val startLine = lines.popInt()
+				val level = indents.pop()
+				val startLine = lines.pop()
 				if (level > 0) {
 					for (i in startLine until line) {
 						if (level != abs(lineIndents[i])) {
@@ -187,10 +184,10 @@ class RainbowIndentsPass internal constructor(
 			}
 		}
 		
-		while (!indents.isEmpty) {
+		while (!indents.empty()) {
 			ProgressManager.checkCanceled()
-			val level = indents.popInt()
-			val startLine = lines.popInt()
+			val level = indents.pop()
+			val startLine = lines.pop()
 			if (level > 0) {
 				descriptors.add(createDescriptor(level, startLine, document.lineCount, lineIndents))
 			}
@@ -210,12 +207,38 @@ class RainbowIndentsPass internal constructor(
 		return IndentGuideDescriptor(level, sLine, endLine)
 	}
 	
+	/*
+	private fun findCodeConstructStart(startLine: Int): Int? {
+		val document = myEditor.document
+		val text = document.immutableCharSequence
+		val lineStartOffset = document.getLineStartOffset(startLine)
+		val firstNonWsOffset = CharArrayUtil.shiftForward(text, lineStartOffset, " \t")
+		val type = PsiUtilBase.getPsiFileAtOffset(myFile, firstNonWsOffset).fileType
+		val language = PsiUtilCore.getLanguageAtOffset(myFile, firstNonWsOffset)
+		val braceMatcher = BraceMatchingUtil.getBraceMatcher(type, language)
+		val iterator = myEditor.highlighter.createIterator(firstNonWsOffset)
+		return if (braceMatcher.isLBraceToken(iterator, text, type)) {
+			braceMatcher.getCodeConstructStart(myFile, firstNonWsOffset)
+		} else null
+	}
+
+
+	private fun findCodeConstructStartLine(startLine: Int): Int {
+		val codeConstructStart = findCodeConstructStart(startLine)
+		return if (codeConstructStart != null) myEditor.document.getLineNumber(codeConstructStart) else startLine
+	}
+	*/
+	
 	private inner class IndentsCalculator {
 		val myComments: MutableMap<String, TokenSet> = HashMap()
 		val lineIndents = IntArray(document.lineCount) // negative value means the line is empty (or contains a comment) and indent
 		
 		// (denoted by absolute value) was deduced from enclosing non-empty lines
-		val myChars = document.charsSequence
+		val myChars: CharSequence
+		
+		init {
+			myChars = document.charsSequence
+		}
 		
 		/**
 		 * Calculates line indents for the [target document][.myDocument].

src/main/kotlin/com/chylex/intellij/coloredbrackets/indents/RainbowIndentsPassFactory.kt

@@ -1,22 +1,19 @@
 package com.chylex.intellij.coloredbrackets.indents
 
 import com.intellij.codeHighlighting.Pass
+import com.intellij.codeHighlighting.TextEditorHighlightingPass
 import com.intellij.codeHighlighting.TextEditorHighlightingPassFactory
 import com.intellij.codeHighlighting.TextEditorHighlightingPassFactoryRegistrar
 import com.intellij.codeHighlighting.TextEditorHighlightingPassRegistrar
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.impl.ImaginaryEditor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 
 class RainbowIndentsPassFactory :
 	TextEditorHighlightingPassFactoryRegistrar, TextEditorHighlightingPassFactory {
 	
-	override fun createHighlightingPass(file: PsiFile, editor: Editor): RainbowIndentsPass? {
-		return when (editor) {
-			is ImaginaryEditor -> null
-			else               -> RainbowIndentsPass(file.project, editor, file)
-		}
+	override fun createHighlightingPass(file: PsiFile, editor: Editor): TextEditorHighlightingPass {
+		return RainbowIndentsPass(file.project, editor, file)
 	}
 	
 	override fun registerHighlightingPassFactory(registrar: TextEditorHighlightingPassRegistrar, project: Project) {

src/main/kotlin/com/chylex/intellij/coloredbrackets/settings/RainbowConfigurable.kt

@@ -1,10 +1,8 @@
 package com.chylex.intellij.coloredbrackets.settings
 
 import com.chylex.intellij.coloredbrackets.settings.form.RainbowSettingsForm
-import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
 import com.intellij.openapi.options.ConfigurationException
 import com.intellij.openapi.options.SearchableConfigurable
-import com.intellij.openapi.project.ProjectManager
 import org.jetbrains.annotations.Nls
 import javax.swing.JComponent
 
@@ -17,7 +15,7 @@ class RainbowConfigurable : SearchableConfigurable {
 	}
 	
 	override fun isModified(): Boolean {
-		return settingsForm?.isModified ?: false
+		return settingsForm?.isModified ?: return false
 	}
 	
 	@Throws(ConfigurationException::class)
@@ -47,10 +45,6 @@ class RainbowConfigurable : SearchableConfigurable {
 		settings.doNOTRainbowifyBigFiles = settingsForm?.doNOTRainbowifyBigFiles() ?: true
 		settings.bigFilesLinesThreshold = settingsForm?.bigFilesLinesThreshold() ?: 1000
 		settings.rainbowifyPythonKeywords = settingsForm?.rainbowifyPythonKeywords() ?: false
-		
-		ProjectManager.getInstanceIfCreated()?.openProjects?.forEach {
-			DaemonCodeAnalyzer.getInstance(it).restart(this)
-		}
 	}
 	
 	override fun reset() {

src/main/kotlin/com/chylex/intellij/coloredbrackets/settings/RainbowSettings.kt

@@ -2,13 +2,12 @@ package com.chylex.intellij.coloredbrackets.settings
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
-import com.intellij.openapi.components.SettingsCategory
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
-import com.intellij.util.xmlb.XmlSerializerUtil
+import com.intellij.util.xmlb.XmlSerializerUtil.copyBean
 import org.jetbrains.annotations.Nullable
 
-@State(name = "ColoredBracketsSettings", storages = [Storage("colored_brackets.xml")], category = SettingsCategory.UI)
+@State(name = "ColoredBracketsSettings", storages = [Storage("colored_brackets.xml")])
 class RainbowSettings : PersistentStateComponent<RainbowSettings> {
 	/**
 	 * default value
@@ -38,7 +37,7 @@ class RainbowSettings : PersistentStateComponent<RainbowSettings> {
 	var rainbowifyTagNameInXML = false
 	var doNOTRainbowifyTemplateString = false
 	var doNOTRainbowifyBigFiles = true
-	var bigFilesLinesThreshold = 100_000
+	var bigFilesLinesThreshold = 1000
 	
 	var languageBlacklist: Set<String> = setOf("hocon", "mxml")
 	
@@ -51,7 +50,7 @@ class RainbowSettings : PersistentStateComponent<RainbowSettings> {
 	override fun getState() = this
 	
 	override fun loadState(state: RainbowSettings) {
-		XmlSerializerUtil.copyBean(state, this)
+		copyBean(state, this)
 	}
 	
 	companion object {

src/main/kotlin/com/chylex/intellij/coloredbrackets/settings/form/RainbowOptionsPanel.kt

@@ -39,7 +39,7 @@ class RainbowOptionsPanel(
 	private lateinit var colorLabel4: JLabel
 	private lateinit var colorLabel5: JLabel
 	
-	private val colorLabels = arrayOf(colorLabel1, colorLabel2, colorLabel3, colorLabel4, colorLabel5)
+	private val colorLabels: Array<JLabel>
 	
 	private lateinit var color1: ColorPanel
 	private lateinit var color2: ColorPanel
@@ -47,7 +47,7 @@ class RainbowOptionsPanel(
 	private lateinit var color4: ColorPanel
 	private lateinit var color5: ColorPanel
 	
-	private val colors = arrayOf(color1, color2, color3, color4, color5)
+	private val colors: Array<ColorPanel>
 	
 	private lateinit var gradientLabel: JLabel
 	
@@ -56,6 +56,9 @@ class RainbowOptionsPanel(
 		EventDispatcher.create(ColorAndFontSettingsListener::class.java)
 	
 	init {
+		colors = arrayOf(color1, color2, color3, color4, color5)
+		colorLabels = arrayOf(colorLabel1, colorLabel2, colorLabel3, colorLabel4, colorLabel5)
+		
 		val actionListener = ActionListener {
 			eventDispatcher.multicaster.settingsChanged()
 			options.stateChanged()
@@ -67,9 +70,7 @@ class RainbowOptionsPanel(
 		
 		options.addListener(object : ColorAndFontSettingsListener.Abstract() {
 			override fun settingsChanged() {
-				if (!schemesProvider.areSchemesLoaded()) {
-					return
-				}
+				if (!schemesProvider.areSchemesLoaded()) return
 				if (optionsTree.selectedValue != null) {
 					// update options after global state change
 					processListValueChanged()
@@ -235,9 +236,7 @@ class RainbowOptionsPanel(
 				}
 				
 				val pathInChild = findOption(childObject, matcher)
-				if (pathInChild != null) {
-					return pathInChild
-				}
+				if (pathInChild != null) return pathInChild
 			}
 			
 			return null

src/main/kotlin/com/chylex/intellij/coloredbrackets/util/Memoize.kt

@@ -23,7 +23,7 @@ private interface MemoizedCall<in F, out R> {
 
 private class MemoizedHandler<F, in K : MemoizedCall<F, R>, out R>(val f: F) {
 	private val m = Platform.newConcurrentMap<K, R>()
-	operator fun invoke(k: K): R = m[k] ?: m.putSafely(k, k(f))
+	operator fun invoke(k: K): R = m[k] ?: run { m.putSafely(k, k(f)) }
 }
 
 private data class MemoizeKey1<out A, R>(val a: A) : MemoizedCall<(A) -> R, R> {

src/main/kotlin/com/chylex/intellij/coloredbrackets/visitor/DefaultRainbowVisitor.kt

@@ -1,7 +1,7 @@
 package com.chylex.intellij.coloredbrackets.visitor
 
-import com.chylex.intellij.coloredbrackets.BracePairs.bracePairs
-import com.chylex.intellij.coloredbrackets.BracePairs.braceTypeSet
+import com.chylex.intellij.coloredbrackets.bracePairs
+import com.chylex.intellij.coloredbrackets.braceTypeSet
 import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
 import com.intellij.codeInsight.daemon.impl.HighlightVisitor
 import com.intellij.lang.BracePair
@@ -9,31 +9,28 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import com.intellij.psi.tree.IElementType
-import it.unimi.dsi.fastutil.objects.Object2ByteOpenHashMap
 
 class DefaultRainbowVisitor : RainbowHighlightVisitor() {
 	
 	override fun clone(): HighlightVisitor = DefaultRainbowVisitor()
 	
-	private var processor: Processor? = null
-	
-	override fun onBeforeAnalyze(file: PsiFile, updateWholeFile: Boolean) {
-		processor = Processor(RainbowSettings.instance)
-	}
-	
 	override fun visit(element: PsiElement) {
 		val type = (element as? LeafPsiElement)?.elementType ?: return
 		
-		val processor = processor!!
+		val settings = RainbowSettings.instance
+		val processor = Processor(settings)
 		val matching = processor.filterPairs(type, element) ?: return
 		
-		val pair = when (matching.size) {
-			1    -> matching[0]
-			else -> matching.find { processor.isValidBracket(element, it) } ?: return
+		val pair =
+			if (matching.size == 1) {
+				matching[0]
 			}
+			else {
+				matching.find { processor.isValidBracket(element, it) }
+			} ?: return
 		
 		val level = processor.getBracketLevel(element, pair)
-		if (processor.settings.isDoNOTRainbowifyTheFirstLevel) {
+		if (settings.isDoNOTRainbowifyTheFirstLevel) {
 			if (level >= 1) {
 				rainbowPairs(element, pair, level)
 			}
@@ -45,35 +42,13 @@ class DefaultRainbowVisitor : RainbowHighlightVisitor() {
 		}
 	}
 	
-	override fun onAfterAnalyze() {
-		processor = null
-	}
-	
 	private fun rainbowPairs(element: LeafPsiElement, pair: BracePair, level: Int) {
 		val startElement = element.takeIf { it.elementType == pair.leftBraceType }
 		val endElement = element.takeIf { it.elementType == pair.rightBraceType }
 		element.setHighlightInfo(element.parent, level, startElement, endElement)
 	}
 	
-	private class Processor(val settings: RainbowSettings) {
-		
-		private companion object {
-			private const val CACHE_MISS = (-1).toByte()
-		}
-		
-		private data class HasBracketsCacheKey(val element: PsiElement, val pair: BracePair) {
-			private val hashCode = (31 * System.identityHashCode(element)) + System.identityHashCode(pair)
-			
-			override fun equals(other: Any?): Boolean {
-				return other is HasBracketsCacheKey && element === other.element && pair === other.pair
-			}
-			
-			override fun hashCode(): Int {
-				return hashCode
-			}
-		}
-		
-		private val hasBracketsCache = Object2ByteOpenHashMap<HasBracketsCacheKey>().apply { defaultReturnValue(CACHE_MISS) }
+	private class Processor(private val settings: RainbowSettings) {
 		
 		fun getBracketLevel(element: LeafPsiElement, pair: BracePair): Int = iterateBracketParents(element.parent, pair, -1)
 		
@@ -84,19 +59,17 @@ class DefaultRainbowVisitor : RainbowHighlightVisitor() {
 			
 			var nextCount = count
 			if (!settings.cycleCountOnAllBrackets) {
-				if (element.hasBrackets(
-						pair,
-						{ it.elementType == pair.leftBraceType },
-						{ it.elementType == pair.rightBraceType })
+				if (element.haveBrackets(
+						{ it.elementType() == pair.leftBraceType },
+						{ it.elementType() == pair.rightBraceType })
 				) {
 					nextCount++
 				}
 			}
 			else {
-				if (element.hasBrackets(
-						pair,
-						{ element.language.braceTypeSet.contains(it.elementType) },
-						{ element.language.braceTypeSet.contains(it.elementType) })
+				if (element.haveBrackets(
+						{ element.language.braceTypeSet.contains(it.elementType()) },
+						{ element.language.braceTypeSet.contains(it.elementType()) })
 				) {
 					nextCount++
 				}
@@ -105,27 +78,18 @@ class DefaultRainbowVisitor : RainbowHighlightVisitor() {
 			return iterateBracketParents(element.parent, pair, nextCount)
 		}
 		
-		private inline fun PsiElement.hasBrackets(
-			pair: BracePair,
-			checkLeft: (LeafPsiElement) -> Boolean,
-			checkRight: (LeafPsiElement) -> Boolean,
+		private inline fun PsiElement.haveBrackets(
+			checkLeft: (PsiElement) -> Boolean,
+			checkRight: (PsiElement) -> Boolean,
 		): Boolean {
 			if (this is LeafPsiElement) {
 				return false
 			}
 			
-			val cacheKey = HasBracketsCacheKey(this, pair)
-			val cacheValue = hasBracketsCache.getByte(cacheKey)
-			if (cacheValue != CACHE_MISS) {
-				return cacheValue == 1.toByte()
-			}
-			
-			val hasBrackets = run {
 			var findLeftBracket = false
 			var findRightBracket = false
 			var left: PsiElement? = firstChild
 			var right: PsiElement? = lastChild
-				
 			while (left != right && (!findLeftBracket || !findRightBracket)) {
 				val needBreak = left == null || left.nextSibling == right
 				
@@ -147,17 +111,16 @@ class DefaultRainbowVisitor : RainbowHighlightVisitor() {
 				}
 			}
 			
-				// For https://github.com/izhangzhihao/intellij-rainbow-brackets/issues/830
-				if (settings.doNOTRainbowifyTemplateString && left?.prevSibling?.textMatches("$") == true) {
-					false
-				}
-				else {
-					findLeftBracket && findRightBracket
-				}
+			//For https://github.com/izhangzhihao/intellij-rainbow-brackets/issues/830
+			if (settings.doNOTRainbowifyTemplateString) {
+				if (left?.prevSibling?.textMatches("$") == true) return false
 			}
 			
-			hasBracketsCache.put(cacheKey, if (hasBrackets) 1.toByte() else 0.toByte())
-			return hasBrackets
+			return findLeftBracket && findRightBracket
+		}
+		
+		private fun PsiElement.elementType(): IElementType? {
+			return (this as? LeafPsiElement)?.elementType
 		}
 		
 		fun isValidBracket(element: LeafPsiElement, pair: BracePair): Boolean {
@@ -197,21 +160,24 @@ class DefaultRainbowVisitor : RainbowHighlightVisitor() {
 			val pairs = element.language.bracePairs ?: return null
 			val filterBraceType = pairs[type.toString()]
 			return when {
-				filterBraceType.isNullOrEmpty()                             -> null
-				
+				filterBraceType.isNullOrEmpty()                             -> {
+					null
+				}
 				// https://github.com/izhangzhihao/intellij-rainbow-brackets/issues/198
-				element.javaClass.simpleName == "OCMacroForeignLeafElement" -> null
+				element.javaClass.simpleName == "OCMacroForeignLeafElement" -> {
+					null
+				}
 				
-				settings.isDoNOTRainbowifyBracketsWithoutContent            -> filterBraceType
+				settings.isDoNOTRainbowifyBracketsWithoutContent            -> {
+					filterBraceType
 						.filterNot { it.leftBraceType == type && element.nextSibling?.elementType() == it.rightBraceType }
 						.filterNot { it.rightBraceType == type && element.prevSibling?.elementType() == it.leftBraceType }
-				
-				else                                                        -> filterBraceType
-			}
 				}
 				
-		private fun PsiElement.elementType(): IElementType? {
-			return (this as? LeafPsiElement)?.elementType
+				else                                                        -> {
+					filterBraceType
+				}
+			}
 		}
 	}
 }

src/main/kotlin/com/chylex/intellij/coloredbrackets/visitor/RainbowHighlightVisitor.kt

@@ -6,7 +6,9 @@ import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
 import com.chylex.intellij.coloredbrackets.util.memoizedFileExtension
 import com.intellij.codeInsight.daemon.impl.HighlightVisitor
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder
+import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.openapi.editor.colors.EditorColorsManager
+import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiDocumentManager
@@ -24,7 +26,8 @@ abstract class RainbowHighlightVisitor : HighlightVisitor {
 		return settings.isRainbowEnabled &&
 			checkForBigFile(file) &&
 			!settings.languageBlacklist.contains(file.fileType.name) &&
-			!settings.languageBlacklist.contains(memoizedFileExtension(file.name))
+			!settings.languageBlacklist.contains(memoizedFileExtension(file.name)) &&
+			fileIsNotHaskellOrIntelliJHaskellPluginNotEnabled(file.fileType.name)
 	}
 	
 	final override fun analyze(file: PsiFile, updateWholeFile: Boolean, holder: HighlightInfoHolder, action: Runnable): Boolean {
@@ -32,6 +35,7 @@ abstract class RainbowHighlightVisitor : HighlightVisitor {
 		onBeforeAnalyze(file, updateWholeFile)
 		try {
 			action.run()
+		} catch (e: Throwable) {
 		} finally {
 			onAfterAnalyze()
 		}
@@ -81,12 +85,22 @@ abstract class RainbowHighlightVisitor : HighlightVisitor {
 	}
 	
 	companion object {
+		private val isIntelliJHaskellEnabled: Boolean by lazy {
+			PluginManagerCore.getPlugin(
+				PluginId.getId("intellij.haskell")
+			)?.isEnabled ?: false
+		}
 		
 		fun checkForBigFile(file: PsiFile): Boolean =
 			!(RainbowSettings.instance.doNOTRainbowifyBigFiles &&
 				file.getLineCount() > RainbowSettings.instance.bigFilesLinesThreshold)
 		
-		private fun PsiElement.getLineCount(): Int {
+		private fun fileIsNotHaskellOrIntelliJHaskellPluginNotEnabled(fileType: String) =
+			fileType != "Haskell" || !isIntelliJHaskellEnabled
+	}
+}
+
+fun PsiElement.getLineCount(): Int {
 	try {
 		val doc = containingFile?.let { PsiDocumentManager.getInstance(project).getDocument(it) }
 		if (doc != null) {
@@ -103,6 +117,4 @@ abstract class RainbowHighlightVisitor : HighlightVisitor {
 	} catch (e: Throwable) {
 		return 0
 	}
-		}
-	}
 }

src/main/resources/META-INF/intellij-haskell-annotator.xml

@@ -0,0 +1,5 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <annotator language="Haskell" implementationClass="com.chylex.intellij.coloredbrackets.annotator.RainbowAnnotator" />
+  </extensions>
+</idea-plugin>

src/main/resources/META-INF/kotlin-brackets.xml

@@ -1,12 +1,12 @@
 <idea-plugin>
+  <extensions defaultExtensionNs="com.chylex.coloredbrackets">
+    <bracePairProvider language="kotlin"
+                       implementationClass="com.chylex.intellij.coloredbrackets.provider.KotlinBracePairProvider" />
+  </extensions>
   <extensions defaultExtensionNs="com.intellij">
     <annotator language="kotlin"
                implementationClass="com.chylex.intellij.coloredbrackets.annotator.KotlinLambdaExpressionArrowAnnotator" />
     <annotator language="kotlin"
                implementationClass="com.chylex.intellij.coloredbrackets.annotator.KotlinLabelAnnotator" />
   </extensions>
-  <extensions defaultExtensionNs="com.chylex.coloredbrackets">
-    <bracePairProvider language="kotlin"
-                       implementationClass="com.chylex.intellij.coloredbrackets.provider.KotlinBracePairProvider" />
-  </extensions>
 </idea-plugin>

src/main/resources/META-INF/plugin.xml

@@ -0,0 +1,82 @@
+<idea-plugin require-restart="true">
+  <id>com.chylex.coloredbrackets</id>
+  <name>Colored Brackets</name>
+  <vendor url="https://chylex.com">chylex</vendor>
+  
+  <description><![CDATA[
+      Fork of the <a href="https://github.com/izhangzhihao/intellij-rainbow-brackets">Rainbow Brackets</a> plugin by <a href="https://github.com/izhangzhihao">izhangzhihao</a>, based on version 6.26.
+  ]]></description>
+  
+  <change-notes><![CDATA[
+    <p>1.0.0</p>
+    <ul>
+      <li>Added support for CLion and Rider</li>
+      <li>Fixed service initialization warnings reported by 2024.2+</li>
+    </ul>
+  ]]></change-notes>
+  
+  <depends>com.intellij.modules.lang</depends>
+  <depends optional="true" config-file="kotlin-brackets.xml">org.jetbrains.kotlin</depends>
+  <depends optional="true" config-file="JSX.xml">JavaScript</depends>
+  <depends optional="true" config-file="dart-brackets.xml">Dart</depends>
+  <depends optional="true" config-file="groovy-brackets.xml">org.intellij.groovy</depends>
+  <!--<depends optional="true" config-file="csharp-annotator.xml">com.intellij.modules.rider</depends>-->
+  <depends optional="true" config-file="csharp-brackets.xml">com.intellij.modules.rider</depends>
+  <depends optional="true" config-file="intellij-haskell-annotator.xml">intellij.haskell</depends>
+  <depends optional="true" config-file="sql-brackets.xml">com.intellij.database</depends>
+  <depends optional="true" config-file="oc-brackets.xml">com.intellij.modules.clion</depends>
+  <depends optional="true" config-file="sh-brackets.xml">com.jetbrains.sh</depends>
+  <depends optional="true" config-file="php-brackets.xml">com.jetbrains.php</depends>
+  <depends optional="true" config-file="go-template-brackets.xml">org.jetbrains.plugins.go-template</depends>
+  <depends optional="true" config-file="jade-rainbow-visitor.xml">com.jetbrains.plugins.jade</depends>
+  <depends optional="true" config-file="python-brackets.xml">com.intellij.modules.python</depends>
+  
+  <extensionPoints>
+    <extensionPoint name="bracePairProvider" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
+      <with attribute="implementationClass"
+            implements="com.chylex.intellij.coloredbrackets.provider.BracePairProvider" />
+    </extensionPoint>
+  </extensionPoints>
+  
+  <extensions defaultExtensionNs="com.intellij">
+    <highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.DefaultRainbowVisitor" />
+    <highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.XmlRainbowVisitor" />
+    
+    <applicationConfigurable instance="com.chylex.intellij.coloredbrackets.settings.RainbowConfigurable" displayName="Colored Brackets" parentId="appearance" />
+    <applicationService
+            serviceImplementation="com.chylex.intellij.coloredbrackets.settings.RainbowSettings" />
+    <colorAndFontPanelFactory
+            implementation="com.chylex.intellij.coloredbrackets.settings.RainbowColorsPageFactory" />
+    <colorAndFontDescriptorProvider
+            implementation="com.chylex.intellij.coloredbrackets.settings.RainbowColorsPageFactory" />
+    
+    <additionalTextAttributes scheme="Default" file="colorSchemes/rainbow-color-default.xml" />
+    <additionalTextAttributes scheme="Darcula" file="colorSchemes/rainbow-color-default-darcula.xml" />
+    <highlightingPassFactory implementation="com.chylex.intellij.coloredbrackets.indents.RainbowIndentsPassFactory" />
+    <editorNotificationProvider implementation="com.chylex.intellij.coloredbrackets.RainbowifyBanner" />
+  </extensions>
+  
+  <applicationListeners>
+    <listener class="com.chylex.intellij.coloredbrackets.listener.RainbowColorsSchemeListener" topic="com.intellij.openapi.editor.colors.EditorColorsListener" />
+  </applicationListeners>
+  
+  <actions>
+    <action class="com.chylex.intellij.coloredbrackets.action.ScopeHighlightingAction"
+            id="Rainbow.ScopeHighlightingAction"
+            text="Highlight Current Scope"
+            description="Highlight current scope.">
+      <mouse-shortcut keymap="$default" keystroke="control button3" />
+      <mouse-shortcut keymap="Mac OS X" keystroke="meta button3" />
+      <mouse-shortcut keymap="Mac OS X 10.5+" keystroke="meta button3" />
+    </action>
+    <action class="com.chylex.intellij.coloredbrackets.action.ScopeOutsideHighlightingRestrainAction"
+            id="Rainbow.ScopeOutsideHighlightingRestrainAction"
+            text="Restrain Scope Highlighting"
+            description="Restrain outside of current scope highlighting.">
+      <mouse-shortcut keymap="$default" keystroke="alt button3" />
+      <mouse-shortcut keymap="Mac OS X" keystroke="alt button3" />
+      <mouse-shortcut keymap="Mac OS X 10.5+" keystroke="alt button3" />
+    </action>
+  </actions>
+
+</idea-plugin>

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowDartTest.kt

@@ -22,7 +22,10 @@ void main() {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),
 					angleLevel(0),

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowGroovyTest.kt

@@ -22,7 +22,10 @@ Map<String, Map<String, String>> convertObjectsToMapProperties(Map<String, Objec
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(1),

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowJavaScriptTest.kt

@@ -0,0 +1,247 @@
+package com.chylex.intellij.coloredbrackets
+
+import com.intellij.ide.plugins.PluginManagerCore
+import com.intellij.lang.ecmascript6.JSXHarmonyFileType
+import com.intellij.lang.javascript.JavaScriptFileType
+import com.intellij.lang.javascript.TypeScriptFileType
+import com.intellij.openapi.extensions.PluginId
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
+import io.kotest.matchers.shouldBe
+import org.intellij.lang.annotations.Language
+
+class RainbowJavaScriptTest : LightJavaCodeInsightFixtureTestCase() {
+	
+	fun testJavaScriptPluginEnabled() {
+		assertTrue(PluginManagerCore.getPlugin(PluginId.getId("JavaScript"))?.isEnabled!!)
+	}
+	
+	fun testIssue11() {
+		@Language("JavaScript") val code = """
+"use strict";
+
+const _ = require('lodash') || false
+const moment = require('moment')
+                            """.trimIndent()
+		
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					roundLevel(0),
+					roundLevel(0),
+					roundLevel(0),
+					roundLevel(0)
+				)
+			)
+	}
+	
+	fun testIssue12() {
+		@Language("JavaScript") val code = """
+"use strict";
+console.log(a > b)
+console.log(a == b)
+                            """.trimIndent()
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					roundLevel(0),
+					roundLevel(0),
+					roundLevel(0),
+					roundLevel(0)
+				)
+			)
+	}
+	
+	fun testIssue21() {
+		
+		@Language("JavaScript") val code = "open (\$" + "{f})\n" + "open (\$" + "{f} )"
+		
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					roundLevel(0),
+					roundLevel(0),
+					roundLevel(0),
+					roundLevel(0)
+				)
+			)
+	}
+	
+	fun testIssue23() {
+		@Language("JavaScript") val code = """
+"use strict";
+
+var a;
+
+if ((a.field_detail && a.is) ||
+    (a.field_detail && a.is) ||
+    (a.field_detail && a.is) ||
+    (a.field_detail && a.is) ||
+    (a.field_detail && a.is) ||
+    (a.field_detail && a.is) ||
+    (a.field_detail && a.is)
+) ;
+
+                            """.trimIndent()
+		
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					roundLevel(0),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(0)
+				)
+			)
+	}
+	
+	fun testIssue38() {
+		@Language("JavaScript") val code = """
+const element = ( <div> <h1>Hello, world!</h1> </div> );
+                            """.trimIndent()
+		
+		myFixture.configureByText(JSXHarmonyFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.filterNot { it == null }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					roundLevel(0),
+					
+					angleLevel(0),
+					angleLevel(0),
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(0),
+					angleLevel(0),
+					
+					roundLevel(0)
+				)
+			)
+	}
+	
+	fun `for somehow, it just don't work "testIssue39"`() {
+		@Language("JavaScript") val code = """
+    const html = '<div><div><div>Hello</div></div></div>'
+                                """.trimIndent()
+		
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.filterNot { it == null }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					angleLevel(0),
+					angleLevel(0),
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(0),
+					angleLevel(0)
+				)
+			)
+	}
+	
+	fun testIssue31() {
+		@Language("JavaScript") val code = """
+    "use strict";
+    const f = () => {}
+    const a = [1,2,3]
+    const s = `<ololo>`
+                                """.trimIndent()
+		
+		myFixture.configureByText(TypeScriptFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.filterNot { it == null }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					roundLevel(0),
+					roundLevel(0),
+					squigglyLevel(0),
+					squigglyLevel(0),
+					squareLevel(0),
+					squareLevel(0)
+					//, angleLevel(0)
+					//, angleLevel(0)
+				)
+			)
+	}
+	
+	fun testIssue427() {
+		@Language("TypeScript") val code = """let example: Array<Map<string,string>>;""".trimIndent()
+		
+		myFixture.configureByText(TypeScriptFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.filterNot { it == null }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					angleLevel(0),
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(0)
+				)
+			)
+	}
+	
+}

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowJavaTest.kt

@@ -35,7 +35,10 @@ public class Test<T> {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(0),
@@ -72,7 +75,10 @@ public class Test<T> {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf()
 			)
 	}
@@ -92,7 +98,10 @@ public class Test<T> {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					squigglyLevel(0),
 					roundLevel(0),
@@ -127,7 +136,10 @@ public class Test<T> {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(0),
@@ -154,7 +166,10 @@ public class Test<T> {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(0),
@@ -187,7 +202,10 @@ public class Test<T> {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(0),
@@ -221,7 +239,11 @@ public class Test<T> {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().size.shouldBe(0)
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.size
+			.shouldBe(0)
 	}
 	
 	fun testIssue391() {
@@ -240,7 +262,10 @@ public class Test {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),//{
 					

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowKotlinTest.kt

@@ -0,0 +1,190 @@
+package com.chylex.intellij.coloredbrackets
+
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
+import io.kotest.matchers.shouldBe
+import org.intellij.lang.annotations.Language
+import org.jetbrains.kotlin.idea.KotlinFileType
+
+class RainbowKotlinTest : LightJavaCodeInsightFixtureTestCase() {
+	fun testRainbowForKotlin() {
+		@Language("kotlin") val code =
+			"""
+fun <T> filter(l: List<T>, f: (T) -> Boolean): MutableList<T> {
+    val res = mutableListOf<T>()
+    l.forEach { if (f(it)) { res += it  } }
+    return res
+}
+                """.trimIndent()
+		myFixture.configureByText(KotlinFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					angleLevel(0),
+					angleLevel(0),
+					
+					roundLevel(0),
+					angleLevel(0),
+					angleLevel(0),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(0),
+					
+					angleLevel(0),
+					angleLevel(0),
+					
+					squigglyLevel(0),
+					
+					angleLevel(0),
+					angleLevel(0),
+					
+					roundLevel(0),
+					roundLevel(0),
+					squigglyLevel(1),
+					
+					roundLevel(0),
+					roundLevel(1),
+					roundLevel(1),
+					roundLevel(0),
+					
+					squigglyLevel(2),
+					squigglyLevel(2),
+					
+					squigglyLevel(1),
+					
+					squigglyLevel(0)
+				
+				)
+			)
+	}
+	
+	fun testRainbowArrowForKotlin() {
+		@Language("kotlin") val code =
+			"""
+val a: (Int) -> Unit = { aa ->
+    val b: (Int) -> Unit = { bb ->
+        val c: (Int) -> Unit  = { cc ->
+            val d: (Int) -> Unit = { dd ->
+            }
+        }
+    }
+}
+                """.trimIndent()
+		myFixture.configureByText(KotlinFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting
+			.filter { brackets.contains(it.text.toChar()) || it.text.contains("->") }
+			.filter { it?.forcedTextAttributesKey?.defaultAttributes != null }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					roundLevel(0),
+					roundLevel(0),
+					
+					squigglyLevel(0),
+					squigglyLevel(0),
+					
+					roundLevel(0),
+					roundLevel(0),
+					
+					squigglyLevel(1),
+					squigglyLevel(1),
+					
+					roundLevel(0),
+					roundLevel(0),
+					
+					squigglyLevel(2),
+					squigglyLevel(2),
+					
+					roundLevel(0),
+					roundLevel(0),
+					
+					squigglyLevel(3),
+					squigglyLevel(3),
+					
+					squigglyLevel(3),
+					
+					squigglyLevel(2),
+					
+					squigglyLevel(1),
+					
+					squigglyLevel(0)
+				)
+			)
+	}
+	
+	fun `ForSomeHowTheTestNotPassed "testRainbowLabelForKotlin"`() {
+		@Language("kotlin") val code =
+			"""
+class AA {
+    fun aa() {
+        arrayOf(1, 2, 3).forEach {
+                it.let dd@{
+                    if (it > 0) a@{
+                        return@dd
+                    }
+                }
+                return@forEach
+            }
+    }
+}
+                """.trimIndent()
+		myFixture.configureByText(KotlinFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		
+		doHighlighting
+			.filter { it.forcedTextAttributes != null && it.text.contains("@") }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					squigglyLevel(3),
+					squigglyLevel(4),
+					squigglyLevel(3),
+					squigglyLevel(2)
+				)
+			)
+	}
+	
+	fun testKotlinFunctionLiteralBracesAndArrow() {
+		@Language("kotlin") val code =
+			"""
+val a :Int = 1
+
+fun t() {
+    a?.let {
+    }
+}
+                """.trimIndent()
+		myFixture.configureByText(KotlinFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		
+		doHighlighting
+			.filter { brackets.contains(it.text.toChar()) }
+			.filter { it?.forcedTextAttributesKey?.defaultAttributes != null }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					roundLevel(0),
+					roundLevel(0),
+					squigglyLevel(0),
+					//squigglyLevel(1),
+					//squigglyLevel(1),
+					squigglyLevel(0)
+				)
+			)
+	}
+}

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowPHPTest.kt

@@ -1,5 +1,6 @@
 package com.chylex.intellij.coloredbrackets
 
+import com.intellij.codeInsight.daemon.impl.HighlightInfoType
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
 import com.jetbrains.php.lang.PhpFileType
@@ -27,7 +28,10 @@ function padZero(string data): string
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) && it.severity != HighlightInfoType.INJECTED_FRAGMENT_SEVERITY }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),
 					roundLevel(0),

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowRubyTest.kt

@@ -10,7 +10,7 @@ import org.jetbrains.plugins.ruby.ruby.lang.RubyFileType
 class RainbowRubyTest : LightJavaCodeInsightFixtureTestCase() {
 	
 	fun testRubyPluginEnabled() {
-		assertTrue(PluginManagerCore.isLoaded(PluginId("org.jetbrains.plugins.ruby")))
+		assertTrue(PluginManagerCore.getPlugin(PluginId.getId("org.jetbrains.plugins.ruby"))?.isEnabled!!)
 	}
 	
 	fun testRainbowForIssue53Part0() {
@@ -24,7 +24,10 @@ end
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),
 					roundLevel(1),
@@ -43,7 +46,10 @@ foobar(p1: "", p2: false, p3: 1)
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),
 					roundLevel(0)
@@ -65,7 +71,12 @@ end
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting
+			.filter { brackets.contains(it.text.toChar()) }
+			.filterNot { it?.forcedTextAttributesKey?.defaultAttributes == null }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),
 					squigglyLevel(0),
@@ -98,7 +109,12 @@ end
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting
+			.filter { brackets.contains(it.text.toChar()) }
+			.filterNot { it?.forcedTextAttributesKey?.defaultAttributes == null }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					squareLevel(0),
 					squareLevel(0),
@@ -119,7 +135,12 @@ end
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting
+			.filter { brackets.contains(it.text.toChar()) }
+			.filterNot { it?.forcedTextAttributesKey?.defaultAttributes == null }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					squareLevel(0),
 					squareLevel(1),

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowScalaTest.kt

@@ -6,9 +6,7 @@ import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
 import io.kotest.matchers.shouldBe
 import org.intellij.lang.annotations.Language
 import org.jetbrains.plugins.scala.ScalaFileType
-import org.junit.Ignore
 
-@Ignore("IDEA has broken modularization")
 class RainbowScalaTest : LightJavaCodeInsightFixtureTestCase() {
 	
 	override fun tearDown() {
@@ -38,7 +36,11 @@ import scala.annotation.tailrec
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.filter { it?.forcedTextAttributesKey != null }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					squareLevel(0),
 					squareLevel(0),
@@ -76,7 +78,11 @@ import scala.annotation.tailrec
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.filter { it?.forcedTextAttributesKey != null }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					
 					roundLevel(0),

src/test/kotlin/com/chylex/intellij/coloredbrackets/RainbowXMLTest.kt

@@ -0,0 +1,149 @@
+package com.chylex.intellij.coloredbrackets
+
+import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
+import com.intellij.ide.highlighter.XmlFileType
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
+import io.kotest.matchers.shouldBe
+import org.intellij.lang.annotations.Language
+
+class RainbowXMLTest : LightJavaCodeInsightFixtureTestCase() {
+	fun `disabled for non-determinist results of testRainbowTagNameForXML`() {
+		@Language("XML") val code =
+			"""
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE note SYSTEM>
+<idea-plugin>
+    <name>Rainbow Brackets</name>
+    <description>
+        <p>Supported languages:</p>
+        <p>Java, Scala, Clojure, Kotlin, Python, Haskell, Agda, Rust, JavaScript, TypeScript, Erlang, Go, Groovy, Ruby, Elixir, ObjectiveC, PHP, C#, HTML, XML, SQL, Apex language ...</p>
+        <br/>
+    </description>
+</idea-plugin>
+                """.trimIndent()
+		val rainbowSettings = RainbowSettings.instance
+		rainbowSettings.rainbowifyTagNameInXML = true
+		myFixture.configureByText(XmlFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					angleLevel(0),
+					angleLevel(0),
+					
+					angleLevel(0),
+					angleLevel(0),
+					
+					angleLevel(0),
+					angleLevel(0),//idea-plugin
+					angleLevel(0),
+					
+					angleLevel(1),
+					angleLevel(1),//name
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(1),//name
+					angleLevel(1),
+					
+					angleLevel(1),
+					angleLevel(1),//description
+					angleLevel(1),
+					
+					angleLevel(2),
+					angleLevel(2),//p
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(2),//p
+					angleLevel(2),
+					
+					angleLevel(2),
+					angleLevel(2),//p
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(2),//p
+					angleLevel(2),
+					
+					angleLevel(2),
+					angleLevel(2),//br
+					angleLevel(2),
+					
+					angleLevel(1),
+					angleLevel(1),//description
+					angleLevel(1),
+					
+					angleLevel(0),
+					angleLevel(0),//idea-plugin
+					angleLevel(0)
+				)
+			)
+	}
+	
+	fun testRainbowForXML() {
+		@Language("XML") val code =
+			"""
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE note SYSTEM>
+<idea-plugin>
+    <name>Rainbow Brackets</name>
+    <description>
+        <p>Supported languages:</p>
+        <p>Java, Scala, Clojure, Kotlin, Python, Haskell, Agda, Rust, JavaScript, TypeScript, Erlang, Go, Groovy, Ruby, Elixir, ObjectiveC, PHP, C#, HTML, XML, SQL, Apex language ...</p>
+        <br/>
+    </description>
+</idea-plugin>
+                """.trimIndent()
+		val rainbowSettings = RainbowSettings.instance
+		rainbowSettings.rainbowifyTagNameInXML = false
+		myFixture.configureByText(XmlFileType.INSTANCE, code)
+		PsiDocumentManager.getInstance(project).commitAllDocuments()
+		val doHighlighting = myFixture.doHighlighting()
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
+				arrayOf(
+					angleLevel(0),
+					angleLevel(0),
+					
+					angleLevel(0),
+					angleLevel(0),
+					
+					angleLevel(0),
+					angleLevel(0),
+					
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(1),
+					angleLevel(1),
+					
+					angleLevel(1),
+					angleLevel(1),
+					
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(2),
+					
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(2),
+					angleLevel(2),
+					
+					angleLevel(2),
+					angleLevel(2),
+					
+					angleLevel(1),
+					angleLevel(1),
+					
+					angleLevel(0),
+					angleLevel(0)
+				)
+			)
+	}
+}