Set minimum IDEA version to 2025.3

.gitignore

@@ -2,6 +2,5 @@
 !/.idea/runConfigurations
 
 /.gradle/
-/.kotlin/
 /.intellijPlatform/
 /build/

base/build.gradle.kts

@@ -18,6 +18,7 @@ dependencies {
 		bundledPlugin("org.jetbrains.kotlin")
 		bundledPlugin("org.jetbrains.plugins.yaml")
 		
+		compatiblePlugin("Dart")
 		compatiblePlugin("PythonCore")
 		compatiblePlugin("com.jetbrains.php")
 		compatiblePlugin("com.jetbrains.plugins.jade")
@@ -26,8 +27,6 @@ dependencies {
 		compatiblePlugin("org.jetbrains.plugins.go-template")
 		compatiblePlugin("org.jetbrains.plugins.ruby")
 		
-		plugin("Dart:504.0.0") // https://plugins.jetbrains.com/plugin/6351-dart/versions/stable
-		
 		testFramework(TestFrameworkType.Platform)
 		testFramework(TestFrameworkType.Plugin.Java)
 		testFramework(TestFrameworkType.Plugin.JavaScript)
@@ -39,7 +38,3 @@ dependencies {
 		excludeCoroutines()
 	}
 }
-
-intellijPlatform {
-	buildSearchableOptions = true
-}

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

@@ -1,7 +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
@@ -57,9 +56,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)
 	
@@ -230,23 +226,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
-	}
 }

base/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>

base/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
 	}
+	
 }

base/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
 	}
+	
 }

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

@@ -46,7 +46,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()
 		

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

@@ -49,7 +49,7 @@ class RainbowConfigurable : SearchableConfigurable {
 		settings.rainbowifyPythonKeywords = settingsForm?.rainbowifyPythonKeywords() ?: false
 		
 		ProjectManager.getInstanceIfCreated()?.openProjects?.forEach {
-			DaemonCodeAnalyzer.getInstance(it).restart(this)
+			DaemonCodeAnalyzer.getInstance(it).restart()
 		}
 	}
 	

base/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),

base/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),

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

@@ -1,7 +1,7 @@
 package com.chylex.intellij.coloredbrackets
 
 import com.intellij.ide.plugins.PluginManagerCore
-import com.intellij.lang.javascript.JSXFileType
+import com.intellij.lang.ecmascript6.JSXHarmonyFileType
 import com.intellij.lang.javascript.JavaScriptFileType
 import com.intellij.lang.javascript.TypeScriptFileType
 import com.intellij.openapi.extensions.PluginId
@@ -13,7 +13,7 @@ import org.intellij.lang.annotations.Language
 class RainbowJavaScriptTest : LightJavaCodeInsightFixtureTestCase() {
 	
 	fun testJavaScriptPluginEnabled() {
-		assertTrue(PluginManagerCore.isLoaded(PluginId("JavaScript")))
+		assertTrue(PluginManagerCore.getPlugin(PluginId.getId("JavaScript"))?.isEnabled!!)
 	}
 	
 	fun testIssue11() {
@@ -24,11 +24,14 @@ const _ = require('lodash') || false
 const moment = require('moment')
                             """.trimIndent()
 		
-		myFixture.configureByText(JavaScriptFileType, code)
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
 		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),
@@ -44,11 +47,14 @@ const moment = require('moment')
 console.log(a > b)
 console.log(a == b)
                             """.trimIndent()
-		myFixture.configureByText(JavaScriptFileType, code)
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
 		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),
@@ -62,11 +68,14 @@ console.log(a == b)
 		
 		@Language("JavaScript") val code = "open (\$" + "{f})\n" + "open (\$" + "{f} )"
 		
-		myFixture.configureByText(JavaScriptFileType, code)
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
 		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),
@@ -93,11 +102,14 @@ if ((a.field_detail && a.is) ||
 
                             """.trimIndent()
 		
-		myFixture.configureByText(JavaScriptFileType, code)
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
 		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),
@@ -124,11 +136,15 @@ if ((a.field_detail && a.is) ||
 const element = ( <div> <h1>Hello, world!</h1> </div> );
                             """.trimIndent()
 		
-		myFixture.configureByText(JSXFileType, code)
+		myFixture.configureByText(JSXHarmonyFileType.INSTANCE, code)
 		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 }
+			.filterNot { it == null }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),
 					
@@ -146,16 +162,20 @@ const element = ( <div> <h1>Hello, world!</h1> </div> );
 			)
 	}
 	
-	fun testIssue39() {
+	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, code)
+		myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
 		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 }
+			.filterNot { it == null }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(0),
@@ -181,20 +201,24 @@ const element = ( <div> <h1>Hello, world!</h1> </div> );
     const s = `<ololo>`
                                 """.trimIndent()
 		
-		myFixture.configureByText(TypeScriptFileType, code)
+		myFixture.configureByText(TypeScriptFileType.INSTANCE, code)
 		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 }
+			.filterNot { it == null }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),
 					roundLevel(0),
 					squigglyLevel(0),
 					squigglyLevel(0),
 					squareLevel(0),
-				squareLevel(0),
-				angleLevel(0),
-				angleLevel(0)
+					squareLevel(0)
+					//, angleLevel(0)
+					//, angleLevel(0)
 				)
 			)
 	}
@@ -202,11 +226,15 @@ const element = ( <div> <h1>Hello, world!</h1> </div> );
 	fun testIssue427() {
 		@Language("TypeScript") val code = """let example: Array<Map<string,string>>;""".trimIndent()
 		
-		myFixture.configureByText(TypeScriptFileType, code)
+		myFixture.configureByText(TypeScriptFileType.INSTANCE, code)
 		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 }
+			.filterNot { it == null }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(1),

base/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),//{
 					

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

@@ -20,7 +20,10 @@ fun <T> filter(l: List<T>, f: (T) -> Boolean): MutableList<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),
@@ -76,22 +79,35 @@ val a: (Int) -> Unit = { aa ->
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		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),
@@ -105,6 +121,41 @@ val a: (Int) -> Unit = { aa ->
 			)
 	}
 	
+	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 =
 			"""
@@ -120,13 +171,18 @@ fun t() {
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
 		
-		doHighlighting.getBrackets().shouldBe(
+		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(1),
+					//squigglyLevel(1),
 					squigglyLevel(0)
 				)
 			)

base/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),

base/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() {
@@ -23,8 +23,11 @@ end
 		myFixture.configureByText(RubyFileType.RUBY, code)
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty());
-		doHighlighting.getBrackets().shouldBe(
+		assertFalse(doHighlighting.isEmpty())
+		doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					roundLevel(0),
 					roundLevel(1),
@@ -42,8 +45,11 @@ foobar(p1: "", p2: false, p3: 1)
 		myFixture.configureByText(RubyFileType.RUBY, code)
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
-		assertFalse(doHighlighting.isEmpty());
-		doHighlighting.getBrackets().shouldBe(
+		assertFalse(doHighlighting.isEmpty())
+		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),

base/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),

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

@@ -28,7 +28,10 @@ class RainbowXMLTest : LightJavaCodeInsightFixtureTestCase() {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(0),
@@ -100,7 +103,10 @@ class RainbowXMLTest : LightJavaCodeInsightFixtureTestCase() {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		doHighlighting.getBrackets().shouldBe(
+		doHighlighting
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.shouldBe(
 				arrayOf(
 					angleLevel(0),
 					angleLevel(0),

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

@@ -25,7 +25,11 @@ public class Test<T> {
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		val doHighlighting = myFixture.doHighlighting()
 		assertFalse(doHighlighting.isEmpty())
-		val highlightSize = doHighlighting.getBrackets().size
+		val highlightSize = doHighlighting.filter { brackets.contains(it.text.toChar()) }
+			.filter { it.forcedTextAttributesKey.defaultAttributes.foregroundColor != null }
+			.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
+			.toTypedArray()
+			.size
 		assert(highlightSize == 16)
 	}
 	

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

@@ -1,15 +1,8 @@
 package com.chylex.intellij.coloredbrackets
 
-import com.chylex.intellij.coloredbrackets.visitor.RainbowHighlightVisitor
-import com.intellij.codeInsight.daemon.impl.HighlightInfo
-import java.awt.Color
+val brackets = RainbowHighlighter.getBrackets()
 
-fun List<HighlightInfo>.getBrackets(): Array<Color> {
-	return this
-		.filter { it.toolId?.let { id -> id is Class<*> && RainbowHighlightVisitor::class.java.isAssignableFrom(id) } == true }
-		.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
-		.toTypedArray()
-}
+fun CharSequence.toChar() = elementAt(0)
 
 fun roundLevel(level: Int) = RainbowHighlighter.getRainbowColor(RainbowHighlighter.NAME_ROUND_BRACKETS, level)
 

build.gradle.kts

@@ -27,10 +27,6 @@ allprojects {
 	}
 	
 	intellijPlatform {
-		sandboxContainer.set(layout.buildDirectory.map { it.dir("idea-sandbox") })
-		
-		buildSearchableOptions = false
-		
 		pluginConfiguration {
 			ideaVersion {
 				sinceBuild.set("253")
@@ -50,9 +46,14 @@ allprojects {
 	}
 }
 
+subprojects {
+	intellijPlatform {
+		buildSearchableOptions = false
+	}
+}
+
 idea {
 	module {
-		excludeDirs.add(file(".kotlin"))
 		excludeDirs.add(file("build"))
 		excludeDirs.add(file("gradle"))
 	}

clion/build.gradle.kts

@@ -3,8 +3,6 @@ val ideaVersion: String by project
 dependencies {
 	implementation(project(":base"))
 	
-	runtimeOnly(project(":rider")) // Support for CLion Nova.
-	
 	intellijPlatform {
 		clion(ideaVersion)
 		

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.14.3-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

settings.gradle.kts

@@ -3,7 +3,7 @@ rootProject.name = "ColoredBrackets"
 pluginManagement {
 	plugins {
 		kotlin("jvm") version "2.2.20"
-		id("org.jetbrains.intellij.platform") version "2.16.0"
+		id("org.jetbrains.intellij.platform") version "2.11.0"
 	}
 }