mirror of
https://github.com/chylex/IntelliJ-Rainbow-Brackets.git
synced 2025-11-03 08:31:31 +01:00
Compare commits
1 Commits
main
...
201b6e1f3a
| Author | SHA1 | Date | |
|---|---|---|---|
201b6e1f3a
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,5 +2,4 @@
|
||||
!/.idea/runConfigurations
|
||||
|
||||
/.gradle/
|
||||
/.intellijPlatform/
|
||||
/build/
|
||||
|
||||
24
.idea/runConfigurations/Run_CLion.xml
generated
24
.idea/runConfigurations/Run_CLion.xml
generated
@@ -1,24 +0,0 @@
|
||||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="Run CLion" type="GradleRunConfiguration" factoryName="Gradle">
|
||||
<ExternalSystemSettings>
|
||||
<option name="executionName" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="externalSystemIdString" value="GRADLE" />
|
||||
<option name="scriptParameters" value="" />
|
||||
<option name="taskDescriptions">
|
||||
<list />
|
||||
</option>
|
||||
<option name="taskNames">
|
||||
<list>
|
||||
<option value=":clion:runIde" />
|
||||
</list>
|
||||
</option>
|
||||
<option name="vmOptions" />
|
||||
</ExternalSystemSettings>
|
||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
||||
<DebugAllEnabled>false</DebugAllEnabled>
|
||||
<RunAsTest>false</RunAsTest>
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
||||
24
.idea/runConfigurations/Run_IDEA.xml
generated
24
.idea/runConfigurations/Run_IDEA.xml
generated
@@ -1,24 +0,0 @@
|
||||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="Run IDEA" type="GradleRunConfiguration" factoryName="Gradle">
|
||||
<ExternalSystemSettings>
|
||||
<option name="executionName" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="externalSystemIdString" value="GRADLE" />
|
||||
<option name="scriptParameters" value="" />
|
||||
<option name="taskDescriptions">
|
||||
<list />
|
||||
</option>
|
||||
<option name="taskNames">
|
||||
<list>
|
||||
<option value=":runIde" />
|
||||
</list>
|
||||
</option>
|
||||
<option name="vmOptions" />
|
||||
</ExternalSystemSettings>
|
||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
||||
<DebugAllEnabled>false</DebugAllEnabled>
|
||||
<RunAsTest>false</RunAsTest>
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
||||
24
.idea/runConfigurations/Run_Rider.xml
generated
24
.idea/runConfigurations/Run_Rider.xml
generated
@@ -1,24 +0,0 @@
|
||||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="Run Rider" type="GradleRunConfiguration" factoryName="Gradle">
|
||||
<ExternalSystemSettings>
|
||||
<option name="executionName" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="externalSystemIdString" value="GRADLE" />
|
||||
<option name="scriptParameters" value="" />
|
||||
<option name="taskDescriptions">
|
||||
<list />
|
||||
</option>
|
||||
<option name="taskNames">
|
||||
<list>
|
||||
<option value=":rider:runIde" />
|
||||
</list>
|
||||
</option>
|
||||
<option name="vmOptions" />
|
||||
</ExternalSystemSettings>
|
||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
||||
<DebugAllEnabled>false</DebugAllEnabled>
|
||||
<RunAsTest>false</RunAsTest>
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
||||
24
.idea/vcs.xml
generated
Normal file
24
.idea/vcs.xml
generated
Normal file
@@ -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>
|
||||
@@ -1,12 +1,3 @@
|
||||
# Colored Brackets
|
||||
|
||||
This is a fork of the [🌈Rainbow Brackets](https://github.com/izhangzhihao/intellij-rainbow-brackets) plugin by [izhangzhihao](https://github.com/izhangzhihao), based on version 6.26.
|
||||
|
||||
## Key Changes
|
||||
|
||||
- Support for C# (Rider)
|
||||
- Support for C++ (Rider, CLion, CLion Nova)
|
||||
- Support for Settings Sync
|
||||
- Improved highlighting performance
|
||||
- Increased default setting for maximum line count from 1K to 100K
|
||||
- Fixed service initialization warnings reported by 2024.2+
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
val ideaVersion: String by project
|
||||
|
||||
dependencies {
|
||||
intellijPlatform {
|
||||
@Suppress("DEPRECATION")
|
||||
intellijIdeaUltimate(ideaVersion)
|
||||
}
|
||||
}
|
||||
123
build.gradle.kts
123
build.gradle.kts
@@ -1,96 +1,53 @@
|
||||
@file:Suppress("ConvertLambdaToReference")
|
||||
|
||||
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
plugins {
|
||||
kotlin("jvm")
|
||||
id("org.jetbrains.intellij.platform")
|
||||
kotlin("jvm") version "1.9.21"
|
||||
id("org.jetbrains.intellij") version "1.17.4"
|
||||
}
|
||||
|
||||
group = "com.chylex.intellij.coloredbrackets"
|
||||
version = "1.3.0"
|
||||
version = "0.0.1"
|
||||
|
||||
val ideaVersion = "2023.3"
|
||||
|
||||
allprojects {
|
||||
apply(plugin = "org.jetbrains.kotlin.jvm")
|
||||
apply(plugin = "org.jetbrains.intellij.platform")
|
||||
|
||||
ext {
|
||||
set("ideaVersion", ideaVersion)
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
||||
intellijPlatform {
|
||||
defaultRepositories()
|
||||
}
|
||||
}
|
||||
|
||||
intellijPlatform {
|
||||
pluginConfiguration {
|
||||
ideaVersion {
|
||||
sinceBuild.set("233")
|
||||
untilBuild.set(provider { null })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
jvmToolchain(17)
|
||||
|
||||
compilerOptions {
|
||||
freeCompilerArgs = listOf(
|
||||
"-X" + "jvm-default=all",
|
||||
)
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
subprojects {
|
||||
intellijPlatform {
|
||||
buildSearchableOptions = false
|
||||
}
|
||||
intellij {
|
||||
type.set("IU")
|
||||
version.set("2023.3")
|
||||
updateSinceUntilBuild.set(false)
|
||||
|
||||
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
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
idea {
|
||||
module {
|
||||
excludeDirs.add(file("build"))
|
||||
excludeDirs.add(file("gradle"))
|
||||
}
|
||||
kotlin {
|
||||
jvmToolchain(17)
|
||||
}
|
||||
|
||||
dependencies {
|
||||
project(":api")
|
||||
|
||||
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")
|
||||
|
||||
plugin("Dart", "233.11799.172") // https://plugins.jetbrains.com/plugin/6351-dart/versions/stable
|
||||
plugin("PythonCore", "233.11799.300") // https://plugins.jetbrains.com/plugin/631-python/versions
|
||||
plugin("com.jetbrains.php", "233.11799.300") // https://plugins.jetbrains.com/plugin/6610-php/versions
|
||||
plugin("com.jetbrains.sh", "233.11799.165") // https://plugins.jetbrains.com/plugin/13122-shell-script/versions
|
||||
plugin("org.intellij.scala", "2023.3.19") // https://plugins.jetbrains.com/plugin/1347-scala/versions
|
||||
plugin("org.jetbrains.plugins.go-template", "233.11799.172") // https://plugins.jetbrains.com/plugin/10581-go-template/versions
|
||||
plugin("org.jetbrains.plugins.ruby", "233.11799.300") // https://plugins.jetbrains.com/plugin/1293-ruby/versions
|
||||
|
||||
testFramework(TestFrameworkType.Plugin.Java)
|
||||
|
||||
pluginComposedModule(implementation(project(":api")))
|
||||
pluginComposedModule(implementation(project(":clion")))
|
||||
pluginComposedModule(implementation(project(":rider")))
|
||||
}
|
||||
compileOnly(fileTree("libs"))
|
||||
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("io.kotest:kotest-assertions-core:5.8.0") {
|
||||
@@ -98,6 +55,16 @@ dependencies {
|
||||
}
|
||||
}
|
||||
|
||||
tasks.patchPluginXml {
|
||||
sinceBuild.set("233")
|
||||
}
|
||||
|
||||
tasks.test {
|
||||
useJUnit()
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile> {
|
||||
kotlinOptions.freeCompilerArgs = listOf(
|
||||
"-Xjvm-default=all"
|
||||
)
|
||||
}
|
||||
|
||||
1
clion/.gitignore
vendored
1
clion/.gitignore
vendored
@@ -1 +0,0 @@
|
||||
/build/
|
||||
@@ -1,12 +0,0 @@
|
||||
val ideaVersion: String by project
|
||||
|
||||
dependencies {
|
||||
implementation(project(":api"))
|
||||
|
||||
intellijPlatform {
|
||||
clion(ideaVersion)
|
||||
|
||||
bundledPlugin("com.intellij.clion")
|
||||
// bundledPlugin("org.jetbrains.plugins.clion.radler") // Only in 2024.1 or newer. Worked around by only including the .xml file, and taking the implementation from Rider.
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.jetbrains.cidr.lang.parser.OCLexerTokenTypes
|
||||
|
||||
class OCBracePairProvider : BracePairProvider {
|
||||
override fun pairs(): List<BracePair> = listOf(BracePair(OCLexerTokenTypes.LT, OCLexerTokenTypes.GT, false))
|
||||
}
|
||||
@@ -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>
|
||||
@@ -1,2 +1 @@
|
||||
kotlin.stdlib.default.dependency=false
|
||||
org.gradle.jvmargs=-Xmx1G
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
BIN
libs/clion.jar
Normal file
BIN
libs/clion.jar
Normal file
Binary file not shown.
BIN
libs/rider.jar
Normal file
BIN
libs/rider.jar
Normal file
Binary file not shown.
1
rider/.gitignore
vendored
1
rider/.gitignore
vendored
@@ -1 +0,0 @@
|
||||
/build/
|
||||
@@ -1,11 +0,0 @@
|
||||
val ideaVersion: String by project
|
||||
|
||||
dependencies {
|
||||
implementation(project(":api"))
|
||||
|
||||
intellijPlatform {
|
||||
rider(ideaVersion) {
|
||||
useInstaller = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.jetbrains.rider.languages.fileTypes.csharp.kotoparser.lexer.CSharpTokenType
|
||||
|
||||
class CSharpBracePairProvider : BracePairProvider {
|
||||
override fun pairs(): List<BracePair> = listOf(
|
||||
BracePair(CSharpTokenType.LPARENTH, CSharpTokenType.RPARENTH, false),
|
||||
BracePair(CSharpTokenType.LBRACE, CSharpTokenType.RBRACE, false),
|
||||
BracePair(CSharpTokenType.LBRACKET, CSharpTokenType.RBRACKET, false),
|
||||
BracePair(CSharpTokenType.LT, CSharpTokenType.GT, false),
|
||||
)
|
||||
}
|
||||
@@ -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),
|
||||
)
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
package com.chylex.intellij.coloredbrackets.visitor
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightVisitor
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiFile
|
||||
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#") {
|
||||
|
||||
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 clone(): HighlightVisitor = CSharpRainbowVisitor()
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
@@ -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()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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>
|
||||
@@ -1,5 +0,0 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<annotator language="C#" implementationClass="com.chylex.intellij.coloredbrackets.annotator.RainbowAnnotator" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
@@ -1,10 +0,0 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="C#"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.CSharpBracePairProvider" />
|
||||
</extensions>
|
||||
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.CSharpRainbowVisitor" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
@@ -1,12 +1 @@
|
||||
rootProject.name = "ColoredBrackets"
|
||||
|
||||
pluginManagement {
|
||||
plugins {
|
||||
kotlin("jvm") version "1.9.21"
|
||||
id("org.jetbrains.intellij.platform") version "2.9.0"
|
||||
}
|
||||
}
|
||||
|
||||
include("api")
|
||||
include("clion")
|
||||
include("rider")
|
||||
|
||||
@@ -1,217 +0,0 @@
|
||||
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.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 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 matching = processor.filterPairs(type, element) ?: return
|
||||
|
||||
val pair = when (matching.size) {
|
||||
1 -> matching[0]
|
||||
else -> matching.find { processor.isValidBracket(element, it) } ?: return
|
||||
}
|
||||
|
||||
val level = processor.getBracketLevel(element, pair)
|
||||
if (processor.settings.isDoNOTRainbowifyTheFirstLevel) {
|
||||
if (level >= 1) {
|
||||
rainbowPairs(element, pair, level)
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (level >= 0) {
|
||||
rainbowPairs(element, pair, level)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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) }
|
||||
|
||||
fun getBracketLevel(element: LeafPsiElement, pair: BracePair): Int = iterateBracketParents(element.parent, pair, -1)
|
||||
|
||||
private tailrec fun iterateBracketParents(element: PsiElement?, pair: BracePair, count: Int): Int {
|
||||
if (element == null || element is PsiFile) {
|
||||
return count
|
||||
}
|
||||
|
||||
var nextCount = count
|
||||
if (!settings.cycleCountOnAllBrackets) {
|
||||
if (element.hasBrackets(
|
||||
pair,
|
||||
{ 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) })
|
||||
) {
|
||||
nextCount++
|
||||
}
|
||||
}
|
||||
|
||||
return iterateBracketParents(element.parent, pair, nextCount)
|
||||
}
|
||||
|
||||
private inline fun PsiElement.hasBrackets(
|
||||
pair: BracePair,
|
||||
checkLeft: (LeafPsiElement) -> Boolean,
|
||||
checkRight: (LeafPsiElement) -> 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
|
||||
|
||||
if (left is LeafPsiElement && checkLeft(left)) {
|
||||
findLeftBracket = true
|
||||
}
|
||||
else {
|
||||
left = left?.nextSibling
|
||||
}
|
||||
if (right is LeafPsiElement && checkRight(right)) {
|
||||
findRightBracket = true
|
||||
}
|
||||
else {
|
||||
right = right?.prevSibling
|
||||
}
|
||||
|
||||
if (needBreak) {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// For https://github.com/izhangzhihao/intellij-rainbow-brackets/issues/830
|
||||
if (settings.doNOTRainbowifyTemplateString && left?.prevSibling?.textMatches("$") == true) {
|
||||
false
|
||||
}
|
||||
else {
|
||||
findLeftBracket && findRightBracket
|
||||
}
|
||||
}
|
||||
|
||||
hasBracketsCache.put(cacheKey, if (hasBrackets) 1.toByte() else 0.toByte())
|
||||
return hasBrackets
|
||||
}
|
||||
|
||||
fun isValidBracket(element: LeafPsiElement, pair: BracePair): Boolean {
|
||||
val pairType = when (element.elementType) {
|
||||
pair.leftBraceType -> pair.rightBraceType
|
||||
pair.rightBraceType -> pair.leftBraceType
|
||||
else -> return false
|
||||
}
|
||||
|
||||
return if (pairType == pair.leftBraceType) {
|
||||
checkBracePair(element, element.parent.firstChild, pairType, PsiElement::getNextSibling)
|
||||
}
|
||||
else {
|
||||
checkBracePair(element, element.parent.lastChild, pairType, PsiElement::getPrevSibling)
|
||||
}
|
||||
}
|
||||
|
||||
private fun checkBracePair(
|
||||
brace: PsiElement,
|
||||
start: PsiElement,
|
||||
type: IElementType,
|
||||
next: PsiElement.() -> PsiElement?,
|
||||
): Boolean {
|
||||
var element: PsiElement? = start
|
||||
while (element != null && element != brace) {
|
||||
if (element is LeafPsiElement && element.elementType == type) {
|
||||
return true
|
||||
}
|
||||
|
||||
element = element.next()
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
fun filterPairs(type: IElementType, element: LeafPsiElement): List<BracePair>? {
|
||||
val pairs = element.language.bracePairs ?: return null
|
||||
val filterBraceType = pairs[type.toString()]
|
||||
return when {
|
||||
filterBraceType.isNullOrEmpty() -> null
|
||||
|
||||
// https://github.com/izhangzhihao/intellij-rainbow-brackets/issues/198
|
||||
element.javaClass.simpleName == "OCMacroForeignLeafElement" -> null
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.provider.BracePairProvider
|
||||
import com.chylex.intellij.coloredbrackets.util.memoize
|
||||
import com.github.izhangzhihao.rainbow.brackets.provider.BracePairProvider
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.memoize
|
||||
import com.intellij.codeInsight.highlighting.BraceMatchingUtil
|
||||
import com.intellij.lang.BracePair
|
||||
import com.intellij.lang.CompositeLanguage
|
||||
@@ -11,12 +11,11 @@ import com.intellij.lang.LanguageExtension
|
||||
import com.intellij.lang.PairedBraceMatcher
|
||||
import com.intellij.psi.tree.IElementType
|
||||
|
||||
@Suppress("ConvertLambdaToReference")
|
||||
object BracePairs {
|
||||
|
||||
private val providers = LanguageExtension<BracePairProvider>("com.chylex.coloredbrackets.bracePairProvider")
|
||||
|
||||
val bracePairs = lazy {
|
||||
private val bracePairs =
|
||||
Language.getRegisteredLanguages()
|
||||
.map { language ->
|
||||
if (language is CompositeLanguage) {
|
||||
@@ -69,18 +68,19 @@ object BracePairs {
|
||||
}
|
||||
}
|
||||
|
||||
language.id to braceMap
|
||||
language.displayName to braceMap
|
||||
}
|
||||
.toMap()
|
||||
}
|
||||
|
||||
private fun getBraceTypeSetOf(language: Language): Set<IElementType> = language.bracePairs?.values?.flatten()?.map { listOf(it.leftBraceType, it.rightBraceType) }?.flatten()?.toSet() ?: emptySet()
|
||||
fun getBracePairs(language: Language): MutableMap<String, MutableList<BracePair>>? = bracePairs[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)
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.chylex.intellij.coloredbrackets.util.create
|
||||
import com.chylex.intellij.coloredbrackets.util.memoize
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.memoize
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfoType
|
||||
import com.intellij.lang.annotation.HighlightSeverity
|
||||
@@ -40,21 +39,16 @@ object RainbowHighlighter {
|
||||
private val squigglyBrackets: CharArray = charArrayOf('{', '}')
|
||||
private val angleBrackets: CharArray = charArrayOf('<', '>')
|
||||
|
||||
private val settings
|
||||
get() = RainbowSettings.instance
|
||||
private val settings = RainbowSettings.instance
|
||||
|
||||
private val roundBracketsRainbowColorKeys = lazy {
|
||||
private val roundBracketsRainbowColorKeys: Array<TextAttributesKey> =
|
||||
createRainbowAttributesKeys(KEY_ROUND_BRACKETS, settings.numberOfColors)
|
||||
}
|
||||
private val squareBracketsRainbowColorKeys = lazy {
|
||||
private val squareBracketsRainbowColorKeys: Array<TextAttributesKey> =
|
||||
createRainbowAttributesKeys(KEY_SQUARE_BRACKETS, settings.numberOfColors)
|
||||
}
|
||||
private val squigglyBracketsRainbowColorKeys = lazy {
|
||||
private val squigglyBracketsRainbowColorKeys: Array<TextAttributesKey> =
|
||||
createRainbowAttributesKeys(KEY_SQUIGGLY_BRACKETS, settings.numberOfColors)
|
||||
}
|
||||
private val angleBracketsRainbowColorKeys = lazy {
|
||||
private val angleBracketsRainbowColorKeys: Array<TextAttributesKey> =
|
||||
createRainbowAttributesKeys(KEY_ANGLE_BRACKETS, settings.numberOfColors)
|
||||
}
|
||||
|
||||
private val rainbowElement: HighlightInfoType = HighlightInfoType
|
||||
.HighlightInfoTypeImpl(HighlightSeverity.INFORMATION, DefaultLanguageHighlighterColors.CONSTANT)
|
||||
@@ -74,10 +68,10 @@ object RainbowHighlighter {
|
||||
|
||||
fun getRainbowAttributesKeys(rainbowName: String): Array<TextAttributesKey> {
|
||||
return when (rainbowName) {
|
||||
NAME_ROUND_BRACKETS -> roundBracketsRainbowColorKeys.value
|
||||
NAME_SQUARE_BRACKETS -> squareBracketsRainbowColorKeys.value
|
||||
NAME_SQUIGGLY_BRACKETS -> squigglyBracketsRainbowColorKeys.value
|
||||
NAME_ANGLE_BRACKETS -> angleBracketsRainbowColorKeys.value
|
||||
NAME_ROUND_BRACKETS -> roundBracketsRainbowColorKeys
|
||||
NAME_SQUARE_BRACKETS -> squareBracketsRainbowColorKeys
|
||||
NAME_SQUIGGLY_BRACKETS -> squigglyBracketsRainbowColorKeys
|
||||
NAME_ANGLE_BRACKETS -> angleBracketsRainbowColorKeys
|
||||
else -> throw IllegalArgumentException("Unknown rainbow name: $rainbowName")
|
||||
}
|
||||
}
|
||||
@@ -138,7 +132,7 @@ object RainbowHighlighter {
|
||||
}
|
||||
|
||||
private fun genByOption(option: String, rainbowName: String, level: Int) =
|
||||
create(
|
||||
com.github.izhangzhihao.rainbow.brackets.util.create(
|
||||
"$rainbowName-$level",
|
||||
TextAttributes(randomColor(option), null, null, null, 0)
|
||||
)
|
||||
@@ -184,6 +178,7 @@ object RainbowHighlighter {
|
||||
.create()
|
||||
}
|
||||
|
||||
|
||||
private val KEY_HTML_CODE: TextAttributesKey by lazy { TextAttributesKey.createTextAttributesKey("HTML_CODE") }
|
||||
private val KEY_KOTLIN_LABEL: TextAttributesKey by lazy { TextAttributesKey.createTextAttributesKey("KOTLIN_LABEL") }
|
||||
private val KEY_MATCHED_BRACE_ATTRIBUTES: TextAttributesKey by lazy {
|
||||
@@ -193,6 +188,7 @@ object RainbowHighlighter {
|
||||
TextAttributesKey.createTextAttributesKey("KOTLIN_FUNCTION_LITERAL_BRACES_AND_ARROW")
|
||||
}
|
||||
|
||||
|
||||
fun fixHighlighting(scheme: EditorColorsScheme = EditorColorsManager.getInstance().globalScheme) {
|
||||
// html code
|
||||
scheme.setInherited(KEY_HTML_CODE, !settings.isRainbowifyHTMLInsideJS)
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.intellij.openapi.util.Key
|
||||
import com.intellij.psi.PsiElement
|
||||
@@ -1,45 +1,38 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowConfigurable
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.chylex.intellij.coloredbrackets.util.memoizedFileExtension
|
||||
import com.chylex.intellij.coloredbrackets.util.toPsiFile
|
||||
import com.chylex.intellij.coloredbrackets.visitor.RainbowHighlightVisitor.Companion.checkForBigFile
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowConfigurable
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.memoizedFileExtension
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.toPsiFile
|
||||
import com.github.izhangzhihao.rainbow.brackets.visitor.RainbowHighlightVisitor.Companion.checkForBigFile
|
||||
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? {
|
||||
val settings = RainbowSettings.instance
|
||||
override fun createNotificationPanel(file: VirtualFile, fileEditor: FileEditor, project: Project): EditorNotificationPanel? {
|
||||
|
||||
if (!settings.isRainbowEnabled) {
|
||||
if (settings.suppressDisabledCheck) {
|
||||
return null
|
||||
}
|
||||
if (!RainbowSettings.instance.isRainbowEnabled) {
|
||||
if (RainbowSettings.instance.suppressDisabledCheck) return null
|
||||
return EditorNotificationPanel().apply {
|
||||
text("Colored Brackets is now disabled")
|
||||
icon(AllIcons.General.GearPlain)
|
||||
createComponentActionLabel("got it, don't show again") {
|
||||
settings.suppressDisabledCheck = true
|
||||
RainbowSettings.instance.suppressDisabledCheck = true
|
||||
EditorNotifications.getInstance(project).updateAllNotifications()
|
||||
}
|
||||
|
||||
createComponentActionLabel("enable Colored Brackets") {
|
||||
settings.isRainbowEnabled = true
|
||||
RainbowSettings.instance.isRainbowEnabled = true
|
||||
EditorNotifications.getInstance(project).updateAllNotifications()
|
||||
}
|
||||
}
|
||||
@@ -47,14 +40,12 @@ class RainbowifyBanner : EditorNotificationProvider {
|
||||
|
||||
val psiFile = file.toPsiFile(project)
|
||||
if (psiFile != null && !checkForBigFile(psiFile)) {
|
||||
if (settings.suppressBigFileCheck) {
|
||||
return null
|
||||
}
|
||||
if (RainbowSettings.instance.suppressBigFileCheck) return null
|
||||
return EditorNotificationPanel().apply {
|
||||
text("Rainbowify is disabled for files > " + settings.bigFilesLinesThreshold + " lines")
|
||||
text("Rainbowify is disabled for files > " + RainbowSettings.instance.bigFilesLinesThreshold + " lines")
|
||||
icon(AllIcons.General.InspectionsEye)
|
||||
createComponentActionLabel("got it, don't show again") {
|
||||
settings.suppressBigFileCheck = true
|
||||
RainbowSettings.instance.suppressBigFileCheck = true
|
||||
EditorNotifications.getInstance(project).updateAllNotifications()
|
||||
}
|
||||
|
||||
@@ -66,18 +57,16 @@ class RainbowifyBanner : EditorNotificationProvider {
|
||||
}
|
||||
|
||||
if (
|
||||
settings.languageBlacklist.contains(file.fileType.name) ||
|
||||
settings.languageBlacklist.contains(memoizedFileExtension(file.name))
|
||||
RainbowSettings.instance.languageBlacklist.contains(file.fileType.name) ||
|
||||
RainbowSettings.instance.languageBlacklist.contains(memoizedFileExtension(file.name))
|
||||
) {
|
||||
if (settings.suppressBlackListCheck) {
|
||||
return null
|
||||
}
|
||||
if (RainbowSettings.instance.suppressBlackListCheck) return null
|
||||
return EditorNotificationPanel().apply {
|
||||
text("Rainbowify is disabled because the language/file extension is in the black list")
|
||||
icon(AllIcons.General.InspectionsEye)
|
||||
|
||||
createComponentActionLabel("got it, don't show again") {
|
||||
settings.suppressBlackListCheck = true
|
||||
RainbowSettings.instance.suppressBlackListCheck = true
|
||||
EditorNotifications.getInstance(project).updateAllNotifications()
|
||||
}
|
||||
|
||||
@@ -91,10 +80,14 @@ class RainbowifyBanner : EditorNotificationProvider {
|
||||
return null
|
||||
}
|
||||
|
||||
private fun EditorNotificationPanel.createComponentActionLabel(labelText: String, callback: (HyperlinkLabel) -> Unit) {
|
||||
val label: Ref<HyperlinkLabel> = Ref.create()
|
||||
label.set(createActionLabel(labelText) {
|
||||
callback(label.get())
|
||||
})
|
||||
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())
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,17 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
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
|
||||
import com.github.izhangzhihao.rainbow.brackets.color.Luminosity
|
||||
import com.github.izhangzhihao.rainbow.brackets.color.fromString
|
||||
import java.awt.Color
|
||||
|
||||
val mapper: ObjectMapper by lazy { jacksonObjectMapper() }
|
||||
|
||||
fun randomColor(options: String): Color {
|
||||
val ops: Map<String, String> = mapper.readValue(options)
|
||||
return randomColor(
|
||||
return com.github.izhangzhihao.rainbow.brackets.color.randomColor(
|
||||
fromString(ops.getOrDefault("hue", "random")),
|
||||
Luminosity.valueOf(ops.getOrDefault("luminosity", "random"))
|
||||
)
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.chylex.intellij.coloredbrackets.action
|
||||
package com.github.izhangzhihao.rainbow.brackets.action
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowInfo
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowInfo
|
||||
import com.intellij.codeInsight.highlighting.HighlightManager
|
||||
import com.intellij.openapi.actionSystem.ActionUpdateThread
|
||||
import com.intellij.openapi.actionSystem.AnAction
|
||||
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||
import com.intellij.openapi.actionSystem.CommonDataKeys
|
||||
@@ -18,12 +17,9 @@ import java.awt.event.FocusListener
|
||||
import java.awt.event.KeyAdapter
|
||||
import java.awt.event.KeyEvent
|
||||
|
||||
|
||||
abstract class AbstractScopeHighlightingAction : AnAction() {
|
||||
|
||||
final override fun getActionUpdateThread(): ActionUpdateThread {
|
||||
return ActionUpdateThread.BGT
|
||||
}
|
||||
|
||||
final override fun update(e: AnActionEvent) {
|
||||
e.presentation.isEnabledAndVisible = e.editor.let { it != null && it !is TextComponentEditor }
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.chylex.intellij.coloredbrackets.action
|
||||
package com.github.izhangzhihao.rainbow.brackets.action
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowInfo
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.chylex.intellij.coloredbrackets.util.alphaBlend
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowInfo
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.alphaBlend
|
||||
import com.intellij.codeInsight.highlighting.HighlightManager
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import com.intellij.openapi.editor.colors.EditorColorsManager
|
||||
@@ -12,6 +12,7 @@ import com.intellij.openapi.editor.markup.TextAttributes
|
||||
import java.awt.Font
|
||||
import java.util.LinkedList
|
||||
|
||||
|
||||
class ScopeHighlightingAction : AbstractScopeHighlightingAction() {
|
||||
|
||||
override fun Editor.addHighlighter(
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.chylex.intellij.coloredbrackets.action
|
||||
package com.github.izhangzhihao.rainbow.brackets.action
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowInfo
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.chylex.intellij.coloredbrackets.util.alphaBlend
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowInfo
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.alphaBlend
|
||||
import com.intellij.codeInsight.highlighting.HighlightManager
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import com.intellij.openapi.editor.colors.EditorColorsManager
|
||||
@@ -26,8 +26,6 @@ class ScopeOutsideHighlightingRestrainAction : AbstractScopeHighlightingAction()
|
||||
val highlighters = LinkedList<RangeHighlighter>()
|
||||
|
||||
val startOffset = rainbowInfo.startOffset
|
||||
val hideByAnyKey = RainbowSettings.instance.pressAnyKeyToRemoveTheHighlightingEffects
|
||||
|
||||
if (startOffset > 0) {
|
||||
highlightManager.addRangeHighlight(
|
||||
this,
|
||||
@@ -35,7 +33,7 @@ class ScopeOutsideHighlightingRestrainAction : AbstractScopeHighlightingAction()
|
||||
startOffset,
|
||||
attributes, //create("ScopeOutsideHighlightingRestrainAction", attributes),
|
||||
false, //hideByTextChange
|
||||
hideByAnyKey, //hideByAnyKey
|
||||
RainbowSettings.instance.pressAnyKeyToRemoveTheHighlightingEffects, //hideByAnyKey
|
||||
highlighters
|
||||
)
|
||||
}
|
||||
@@ -49,7 +47,7 @@ class ScopeOutsideHighlightingRestrainAction : AbstractScopeHighlightingAction()
|
||||
lastOffset,
|
||||
attributes, //create("ScopeOutsideHighlightingRestrainAction", attributes),
|
||||
false, //hideByTextChange
|
||||
hideByAnyKey, //hideByAnyKey
|
||||
RainbowSettings.instance.pressAnyKeyToRemoveTheHighlightingEffects, //hideByAnyKey
|
||||
highlighters
|
||||
)
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.chylex.intellij.coloredbrackets.annotator
|
||||
package com.github.izhangzhihao.rainbow.brackets.annotator
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowHighlighter
|
||||
import com.chylex.intellij.coloredbrackets.RainbowInfo
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowInfo
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.intellij.lang.annotation.AnnotationHolder
|
||||
import com.intellij.lang.annotation.Annotator
|
||||
import com.intellij.lang.annotation.HighlightSeverity
|
||||
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.psi.KtLabeledExpression
|
||||
import org.jetbrains.kotlin.psi.KtLambdaExpression
|
||||
import java.awt.Font
|
||||
|
||||
|
||||
class KotlinLabelAnnotator : Annotator {
|
||||
override fun annotate(element: PsiElement, holder: AnnotationHolder) {
|
||||
if (!RainbowSettings.instance.isRainbowifyKotlinLabel) {
|
||||
@@ -47,13 +48,13 @@ class KotlinLabelAnnotator : Annotator {
|
||||
refElement = when (refElement) {
|
||||
is KtBlockExpression,
|
||||
is KtFunctionLiteral,
|
||||
-> refElement
|
||||
-> refElement
|
||||
|
||||
is KtFunction -> refElement.lastChild.takeIf { it is KtBlockExpression }
|
||||
is KtClass -> refElement.lastChild.takeIf { it is KtClassBody }
|
||||
is KtCallExpression,
|
||||
is KtLambdaExpression,
|
||||
-> PsiTreeUtil.findChildOfType(refElement, KtFunctionLiteral::class.java)
|
||||
-> PsiTreeUtil.findChildOfType(refElement, KtFunctionLiteral::class.java)
|
||||
|
||||
else -> null
|
||||
}
|
||||
@@ -65,11 +66,11 @@ class KotlinLabelAnnotator : Annotator {
|
||||
when (it) {
|
||||
is KtBlockExpression,
|
||||
is KtFunctionLiteral,
|
||||
-> it
|
||||
-> it
|
||||
|
||||
is KtCallExpression,
|
||||
is KtLambdaExpression,
|
||||
-> PsiTreeUtil.findChildOfType(it, KtFunctionLiteral::class.java)
|
||||
-> PsiTreeUtil.findChildOfType(it, KtFunctionLiteral::class.java)
|
||||
|
||||
else -> null
|
||||
}
|
||||
@@ -85,7 +86,7 @@ class KotlinLabelAnnotator : Annotator {
|
||||
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
|
||||
.range(target)
|
||||
.textAttributes(
|
||||
com.chylex.intellij.coloredbrackets.util.create(
|
||||
com.github.izhangzhihao.rainbow.brackets.util.create(
|
||||
"rainbow-kotlin-label",
|
||||
TextAttributes(it, null, null, EffectType.BOXED, Font.PLAIN)
|
||||
)
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.chylex.intellij.coloredbrackets.annotator
|
||||
package com.github.izhangzhihao.rainbow.brackets.annotator
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowInfo
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowInfo
|
||||
import com.intellij.lang.annotation.AnnotationHolder
|
||||
import com.intellij.lang.annotation.Annotator
|
||||
import com.intellij.lang.annotation.HighlightSeverity
|
||||
@@ -11,14 +11,15 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement
|
||||
import org.jetbrains.kotlin.lexer.KtTokens
|
||||
import java.awt.Font
|
||||
|
||||
|
||||
class KotlinLambdaExpressionArrowAnnotator : Annotator {
|
||||
override fun annotate(element: PsiElement, holder: AnnotationHolder) {
|
||||
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(
|
||||
com.github.izhangzhihao.rainbow.brackets.util.create(
|
||||
"rainbow-kotlin-arrow",
|
||||
TextAttributes(it, null, null, EffectType.BOXED, Font.PLAIN)
|
||||
)
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.chylex.intellij.coloredbrackets.annotator
|
||||
package com.github.izhangzhihao.rainbow.brackets.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.github.izhangzhihao.rainbow.brackets.RainbowHighlighter.NAME_ANGLE_BRACKETS
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter.NAME_ROUND_BRACKETS
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter.NAME_SQUARE_BRACKETS
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter.NAME_SQUIGGLY_BRACKETS
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter.getRainbowColorByLevel
|
||||
import com.github.izhangzhihao.rainbow.brackets.annotator.RainbowUtils.annotateUtil
|
||||
import com.github.izhangzhihao.rainbow.brackets.annotator.RainbowUtils.settings
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.intellij.lang.annotation.AnnotationHolder
|
||||
import com.intellij.lang.annotation.Annotator
|
||||
import com.intellij.lang.annotation.HighlightSeverity
|
||||
@@ -18,7 +18,6 @@ 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)
|
||||
@@ -36,13 +35,13 @@ class RainbowAnnotator : Annotator {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
object RainbowUtils {
|
||||
|
||||
private val leftBracketsSet = setOf("(", "[", "{", "<")
|
||||
private val rightBracketsSet = setOf(")", "]", "}", ">")
|
||||
|
||||
val settings
|
||||
get() = RainbowSettings.instance
|
||||
val settings = RainbowSettings.instance
|
||||
|
||||
private tailrec fun iterateChildren(
|
||||
LEFT: String,
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.color
|
||||
package com.github.izhangzhihao.rainbow.brackets.color
|
||||
|
||||
import kotlin.math.floor
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
package com.chylex.intellij.coloredbrackets.color
|
||||
package com.github.izhangzhihao.rainbow.brackets.color
|
||||
|
||||
|
||||
sealed class Hue
|
||||
object RandomHue : Hue()
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.color
|
||||
package com.github.izhangzhihao.rainbow.brackets.color
|
||||
|
||||
enum class Luminosity {
|
||||
random,
|
||||
@@ -1,8 +1,9 @@
|
||||
package com.chylex.intellij.coloredbrackets.color
|
||||
package com.github.izhangzhihao.rainbow.brackets.color
|
||||
|
||||
import kotlin.math.floor
|
||||
import kotlin.random.Random
|
||||
|
||||
|
||||
/**
|
||||
* Generate a single random color with specified (or random) hue and luminosity.
|
||||
*/
|
||||
@@ -71,6 +72,7 @@ private fun toColor(hueValue: Int, saturation: Int, brightness: Int): java.awt.C
|
||||
return java.awt.Color(rgb.first, rgb.second, rgb.third)
|
||||
}
|
||||
|
||||
|
||||
private fun HSVtoRGB(hueValue: Int, saturation: Int, brightness: Int): Triple<Int, Int, Int> {
|
||||
// This doesn't work for the values of 0 and 360
|
||||
// Here's the hacky fix
|
||||
@@ -1,13 +1,12 @@
|
||||
package com.chylex.intellij.coloredbrackets.indents
|
||||
package com.github.izhangzhihao.rainbow.brackets.indents
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowInfo
|
||||
import com.chylex.intellij.coloredbrackets.util.alphaBlend
|
||||
import com.chylex.intellij.coloredbrackets.util.endOffset
|
||||
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.github.izhangzhihao.rainbow.brackets.RainbowInfo
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.alphaBlend
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.endOffset
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.findNextSibling
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.findPrevSibling
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.lineNumber
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.startOffset
|
||||
import com.intellij.openapi.editor.Document
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import com.intellij.openapi.editor.SoftWrap
|
||||
@@ -166,28 +165,24 @@ class RainbowIndentGuideRenderer : CustomHighlighterRenderer {
|
||||
val virtualFile = editor.virtualFile?.takeIf { it.isValid } ?: return null
|
||||
val document = editor.document
|
||||
val project = editor.project ?: return null
|
||||
|
||||
return ReadAction.compute<RainbowInfo, Throwable> {
|
||||
val psiFile = PsiManager.getInstance(project).findFile(virtualFile) ?: return@compute null
|
||||
var element = try {
|
||||
psiFile.findElementAt(highlighter.endOffset)?.parent ?: return@compute null
|
||||
} catch (_: Throwable) {
|
||||
return@compute null
|
||||
}
|
||||
|
||||
var rainbowInfo = RainbowInfo.RAINBOW_INFO_KEY[element]
|
||||
if (rainbowInfo == null && psiFile is XmlFile && element !is XmlTag) {
|
||||
element = PsiTreeUtil.findFirstParent(element, true, XML_TAG_PARENT_CONDITION) ?: return@compute null
|
||||
rainbowInfo = RainbowInfo.RAINBOW_INFO_KEY[element] ?: return@compute null
|
||||
}
|
||||
|
||||
if (!element.isValid || !checkBoundary(document, element, highlighter)) {
|
||||
null
|
||||
}
|
||||
else {
|
||||
rainbowInfo
|
||||
}
|
||||
val psiFile = PsiManager.getInstance(project).findFile(virtualFile) ?: return null
|
||||
var element = try {
|
||||
psiFile.findElementAt(highlighter.endOffset)?.parent ?: return null
|
||||
} catch (e: Throwable) {
|
||||
return null
|
||||
}
|
||||
|
||||
var rainbowInfo = RainbowInfo.RAINBOW_INFO_KEY[element]
|
||||
if (rainbowInfo == null && psiFile is XmlFile && element !is XmlTag) {
|
||||
element = PsiTreeUtil.findFirstParent(element, true, XML_TAG_PARENT_CONDITION) ?: return null
|
||||
rainbowInfo = RainbowInfo.RAINBOW_INFO_KEY[element] ?: return null
|
||||
}
|
||||
|
||||
if (!element.isValid || !checkBoundary(document, element, highlighter)) {
|
||||
return null
|
||||
}
|
||||
|
||||
return rainbowInfo
|
||||
}
|
||||
|
||||
/***
|
||||
@@ -1,13 +1,15 @@
|
||||
package com.chylex.intellij.coloredbrackets.indents
|
||||
package com.github.izhangzhihao.rainbow.brackets.indents
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.intellij.codeHighlighting.TextEditorHighlightingPass
|
||||
import com.intellij.codeInsight.highlighting.BraceMatchingUtil
|
||||
import com.intellij.codeInsight.highlighting.CodeBlockSupportHandler
|
||||
import com.intellij.ide.actions.ToggleZenModeAction
|
||||
import com.intellij.lang.Language
|
||||
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 +24,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 +36,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>()
|
||||
@@ -148,8 +152,8 @@ class RainbowIndentsPass internal constructor(
|
||||
calculator.calculate()
|
||||
val lineIndents = calculator.lineIndents
|
||||
|
||||
val lines = IntArrayList()
|
||||
val indents = IntArrayList()
|
||||
val lines = IntStack()
|
||||
val indents = IntStack()
|
||||
|
||||
lines.push(0)
|
||||
indents.push(0)
|
||||
@@ -158,10 +162,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])) {
|
||||
@@ -181,10 +185,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))
|
||||
}
|
||||
@@ -204,12 +208,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 myComments: MutableMap<Language, 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].
|
||||
@@ -287,7 +317,7 @@ class RainbowIndentsPass internal constructor(
|
||||
return false
|
||||
}
|
||||
val language = tokenType.language
|
||||
var comments: TokenSet? = myComments[language.id]
|
||||
var comments: TokenSet? = myComments[language]
|
||||
if (comments == null) {
|
||||
val definition = LanguageParserDefinitions.INSTANCE.forLanguage(language)
|
||||
if (definition != null) {
|
||||
@@ -297,7 +327,7 @@ class RainbowIndentsPass internal constructor(
|
||||
return false
|
||||
}
|
||||
else {
|
||||
myComments[language.id] = comments
|
||||
myComments[language] = comments
|
||||
}
|
||||
}
|
||||
return comments.contains(tokenType)
|
||||
@@ -1,22 +1,19 @@
|
||||
package com.chylex.intellij.coloredbrackets.indents
|
||||
package com.github.izhangzhihao.rainbow.brackets.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) {
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.chylex.intellij.coloredbrackets.listener
|
||||
package com.github.izhangzhihao.rainbow.brackets.listener
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowHighlighter
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter
|
||||
import com.intellij.openapi.editor.colors.EditorColorsListener
|
||||
import com.intellij.openapi.editor.colors.EditorColorsScheme
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.jetbrains.rider.ideaInterop.fileTypes.csharp.lexer.CSharpTokenType.GT
|
||||
import com.jetbrains.rider.ideaInterop.fileTypes.csharp.lexer.CSharpTokenType.LBRACE
|
||||
import com.jetbrains.rider.ideaInterop.fileTypes.csharp.lexer.CSharpTokenType.LBRACKET
|
||||
import com.jetbrains.rider.ideaInterop.fileTypes.csharp.lexer.CSharpTokenType.LT
|
||||
import com.jetbrains.rider.ideaInterop.fileTypes.csharp.lexer.CSharpTokenType.RBRACE
|
||||
import com.jetbrains.rider.ideaInterop.fileTypes.csharp.lexer.CSharpTokenType.RBRACKET
|
||||
|
||||
class CSharpBracePairProvider : BracePairProvider {
|
||||
override fun pairs(): List<BracePair> = listOf(
|
||||
//BracePair(LPARENTH, RPARENTH, false),
|
||||
BracePair(LBRACE, RBRACE, false),
|
||||
BracePair(LBRACKET, RBRACKET, false),
|
||||
BracePair(LT, GT, false),
|
||||
)
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.jetbrains.lang.dart.DartTokenTypes.GT
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.goide.template.GoTemplateTypes.LDOUBLE_BRACE
|
||||
import com.goide.template.GoTemplateTypes.LPAREN
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes.mGT
|
||||
@@ -1,9 +1,10 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import org.jetbrains.kotlin.lexer.KtTokens.GT
|
||||
import org.jetbrains.kotlin.lexer.KtTokens.LT
|
||||
|
||||
|
||||
class KotlinBracePairProvider : BracePairProvider {
|
||||
override fun pairs(): List<BracePair> = listOf(BracePair(LT, GT, false))
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.jetbrains.cidr.lang.parser.OCTokenTypes
|
||||
|
||||
class OCBracePairProvider : BracePairProvider {
|
||||
override fun pairs(): List<BracePair> = listOf(BracePair(OCTokenTypes.LT, OCTokenTypes.GT, false))
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.jetbrains.php.lang.lexer.PhpTokenTypes
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.intellij.sh.ShTypes
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.intellij.sql.psi.SqlCommonKeywords.SQL_CASE
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.provider
|
||||
package com.github.izhangzhihao.rainbow.brackets.provider
|
||||
|
||||
import com.intellij.lang.BracePair
|
||||
import com.intellij.lang.javascript.JSTokenTypes.GT
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.chylex.intellij.coloredbrackets.settings
|
||||
package com.github.izhangzhihao.rainbow.brackets.settings
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowHighlighter
|
||||
import com.chylex.intellij.coloredbrackets.settings.form.RainbowOptionsPanel
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.form.RainbowOptionsPanel
|
||||
import com.intellij.application.options.colors.ColorAndFontOptions
|
||||
import com.intellij.application.options.colors.ColorAndFontPanelFactory
|
||||
import com.intellij.application.options.colors.ColorAndFontSettingsListener
|
||||
@@ -14,6 +14,7 @@ import com.intellij.openapi.options.colors.ColorDescriptor
|
||||
import com.intellij.psi.codeStyle.DisplayPriority
|
||||
import com.intellij.psi.codeStyle.DisplayPrioritySortable
|
||||
|
||||
|
||||
class RainbowColorsPageFactory : ColorAndFontPanelFactory, ColorAndFontDescriptorsProvider, DisplayPrioritySortable {
|
||||
|
||||
override fun getDisplayName(): String = RAINBOW_BRACKETS_GROUP
|
||||
@@ -1,10 +1,8 @@
|
||||
package com.chylex.intellij.coloredbrackets.settings
|
||||
package com.github.izhangzhihao.rainbow.brackets.settings
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.form.RainbowSettingsForm
|
||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.form.RainbowSettingsForm
|
||||
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
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
}
|
||||
|
||||
override fun reset() {
|
||||
@@ -67,6 +61,6 @@ class RainbowConfigurable : SearchableConfigurable {
|
||||
override fun getId(): String = ID
|
||||
|
||||
companion object {
|
||||
const val ID = "com.chylex.coloredbrackets.settings"
|
||||
const val ID = "preferences.rainbow.brackets"
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
package com.chylex.intellij.coloredbrackets.settings
|
||||
package com.github.izhangzhihao.rainbow.brackets.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 = "RainbowSettings", storages = [(Storage("rainbow_brackets.xml"))])
|
||||
class RainbowSettings : PersistentStateComponent<RainbowSettings> {
|
||||
/**
|
||||
* default value
|
||||
@@ -38,7 +38,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 +51,7 @@ class RainbowSettings : PersistentStateComponent<RainbowSettings> {
|
||||
override fun getState() = this
|
||||
|
||||
override fun loadState(state: RainbowSettings) {
|
||||
XmlSerializerUtil.copyBean(state, this)
|
||||
copyBean(state, this)
|
||||
}
|
||||
|
||||
companion object {
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.chylex.intellij.coloredbrackets.settings.form.RainbowOptionsPanel">
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.github.izhangzhihao.rainbow.brackets.settings.form.RainbowOptionsPanel">
|
||||
<grid id="d747" binding="rootPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||
<constraints>
|
||||
<xy x="20" y="20" width="500" height="400"/>
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.chylex.intellij.coloredbrackets.settings.form
|
||||
package com.github.izhangzhihao.rainbow.brackets.settings.form
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowHighlighter
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.intellij.application.options.colors.ColorAndFontOptions
|
||||
import com.intellij.application.options.colors.ColorAndFontSettingsListener
|
||||
import com.intellij.application.options.colors.OptionsPanel
|
||||
@@ -22,6 +22,7 @@ import javax.swing.tree.DefaultTreeModel
|
||||
import javax.swing.tree.TreePath
|
||||
import javax.swing.tree.TreeSelectionModel
|
||||
|
||||
|
||||
class RainbowOptionsPanel(
|
||||
private val options: ColorAndFontOptions,
|
||||
private val schemesProvider: SchemesPanel,
|
||||
@@ -171,6 +172,7 @@ class RainbowOptionsPanel(
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
override fun applyChangesToScheme() {
|
||||
val scheme = options.selectedScheme
|
||||
val (rainbowName, descriptions) = optionsTree.selectedDescriptions ?: return
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.chylex.intellij.coloredbrackets.settings.form.RainbowSettingsForm">
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.github.izhangzhihao.rainbow.brackets.settings.form.RainbowSettingsForm">
|
||||
<grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.chylex.intellij.coloredbrackets.settings.form
|
||||
package com.github.izhangzhihao.rainbow.brackets.settings.form
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import javax.swing.JCheckBox
|
||||
import javax.swing.JComponent
|
||||
import javax.swing.JPanel
|
||||
@@ -8,7 +8,6 @@ import javax.swing.JTextField
|
||||
|
||||
class RainbowSettingsForm {
|
||||
private var panel: JPanel? = null
|
||||
|
||||
@Suppress("unused")
|
||||
private var appearancePanel: JPanel? = null
|
||||
private var enableRainbow: JCheckBox? = null
|
||||
@@ -1,7 +1,8 @@
|
||||
package com.chylex.intellij.coloredbrackets.util
|
||||
package com.github.izhangzhihao.rainbow.brackets.util
|
||||
|
||||
import java.awt.Color
|
||||
|
||||
|
||||
fun Color.alphaBlend(background: Color, alpha: Float): Color {
|
||||
require(alpha in 0.0..1.0) { "alpha(0.0 <= alpha <= 1.0): $alpha" }
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package com.chylex.intellij.coloredbrackets.util
|
||||
package com.github.izhangzhihao.rainbow.brackets.util
|
||||
|
||||
import com.intellij.openapi.editor.Document
|
||||
|
||||
fun Document.lineNumber(offset: Int): Int? = if (offset in 0 until textLength) getLineNumber(offset) else null
|
||||
fun Document.lineNumber(offset: Int): Int? = if (offset in 0 until textLength) getLineNumber(offset) else null
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.util
|
||||
package com.github.izhangzhihao.rainbow.brackets.util
|
||||
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
|
||||
@@ -17,13 +17,14 @@ fun <A, B, C, R> ((A, B, C) -> R).memoize(): (A, B, C) -> R = object : (A, B, C)
|
||||
override fun invoke(a: A, b: B, c: C) = m(MemoizeKey3(a, b, c))
|
||||
}
|
||||
|
||||
|
||||
private interface MemoizedCall<in F, out R> {
|
||||
operator fun invoke(f: F): 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> {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.util
|
||||
package com.github.izhangzhihao.rainbow.brackets.util
|
||||
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.vfs.VirtualFile
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.util
|
||||
package com.github.izhangzhihao.rainbow.brackets.util
|
||||
|
||||
import com.intellij.psi.PsiElement
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.chylex.intellij.coloredbrackets.util
|
||||
package com.github.izhangzhihao.rainbow.brackets.util
|
||||
|
||||
|
||||
fun fileExtension(fileName: String) = fileName.substring(fileName.lastIndexOf(".") + 1)
|
||||
|
||||
val memoizedFileExtension = { fileName: String -> fileExtension(fileName) }.memoize()
|
||||
val memoizedFileExtension = { fileName: String -> fileExtension(fileName) }.memoize()
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.util
|
||||
package com.github.izhangzhihao.rainbow.brackets.util
|
||||
|
||||
import com.intellij.openapi.editor.colors.TextAttributesKey
|
||||
import com.intellij.openapi.editor.markup.TextAttributes
|
||||
@@ -0,0 +1,134 @@
|
||||
package com.github.izhangzhihao.rainbow.brackets.visitor
|
||||
|
||||
import com.github.izhangzhihao.rainbow.brackets.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.ideaInterop.fileTypes.csharp.lexer.CSharpTokenType.LPARENTH
|
||||
import com.jetbrains.rider.ideaInterop.fileTypes.csharp.lexer.CSharpTokenType.RPARENTH
|
||||
import com.jetbrains.rider.ideaInterop.fileTypes.csharp.psi.CSharpDummyNode
|
||||
|
||||
|
||||
class CSharpRainbowVisitor : RainbowHighlightVisitor() {
|
||||
|
||||
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(
|
||||
LPARENTH to BracePair(LPARENTH, RPARENTH, true),
|
||||
RPARENTH to BracePair(LPARENTH, 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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,181 @@
|
||||
package com.github.izhangzhihao.rainbow.brackets.visitor
|
||||
|
||||
import com.github.izhangzhihao.rainbow.brackets.bracePairs
|
||||
import com.github.izhangzhihao.rainbow.brackets.braceTypeSet
|
||||
import com.github.izhangzhihao.rainbow.brackets.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
|
||||
|
||||
|
||||
class DefaultRainbowVisitor : RainbowHighlightVisitor() {
|
||||
|
||||
override fun clone(): HighlightVisitor = DefaultRainbowVisitor()
|
||||
|
||||
override fun visit(element: PsiElement) {
|
||||
val type = (element as? LeafPsiElement)?.elementType ?: return
|
||||
val matching = filterPairs(type, element) ?: return
|
||||
|
||||
val pair =
|
||||
if (matching.size == 1) {
|
||||
matching[0]
|
||||
}
|
||||
else {
|
||||
matching.find { element.isValidBracket(it) }
|
||||
} ?: return
|
||||
|
||||
val level = element.getBracketLevel(pair)
|
||||
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 {
|
||||
|
||||
private fun LeafPsiElement.getBracketLevel(pair: BracePair): Int = iterateBracketParents(parent, pair, -1)
|
||||
|
||||
private tailrec fun iterateBracketParents(element: PsiElement?, pair: BracePair, count: Int): Int {
|
||||
if (element == null || element is PsiFile) {
|
||||
return count
|
||||
}
|
||||
|
||||
var nextCount = count
|
||||
if (!RainbowSettings.instance.cycleCountOnAllBrackets) {
|
||||
if (element.haveBrackets(
|
||||
{ it.elementType() == pair.leftBraceType },
|
||||
{ it.elementType() == pair.rightBraceType })
|
||||
) {
|
||||
nextCount++
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (element.haveBrackets(
|
||||
{ element.language.braceTypeSet.contains(it.elementType()) },
|
||||
{ element.language.braceTypeSet.contains(it.elementType()) })
|
||||
) {
|
||||
nextCount++
|
||||
}
|
||||
}
|
||||
|
||||
return iterateBracketParents(element.parent, pair, nextCount)
|
||||
}
|
||||
|
||||
private inline fun PsiElement.haveBrackets(
|
||||
checkLeft: (PsiElement) -> Boolean,
|
||||
checkRight: (PsiElement) -> Boolean,
|
||||
): Boolean {
|
||||
if (this is LeafPsiElement) {
|
||||
return false
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
if (left is LeafPsiElement && checkLeft(left)) {
|
||||
findLeftBracket = true
|
||||
}
|
||||
else {
|
||||
left = left?.nextSibling
|
||||
}
|
||||
if (right is LeafPsiElement && checkRight(right)) {
|
||||
findRightBracket = true
|
||||
}
|
||||
else {
|
||||
right = right?.prevSibling
|
||||
}
|
||||
|
||||
if (needBreak) {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
//For https://github.com/izhangzhihao/intellij-rainbow-brackets/issues/830
|
||||
if (RainbowSettings.instance.doNOTRainbowifyTemplateString) {
|
||||
if (left?.prevSibling?.textMatches("$") == true) return false
|
||||
}
|
||||
|
||||
return findLeftBracket && findRightBracket
|
||||
}
|
||||
|
||||
private fun PsiElement.elementType(): IElementType? {
|
||||
return (this as? LeafPsiElement)?.elementType
|
||||
}
|
||||
|
||||
private fun LeafPsiElement.isValidBracket(pair: BracePair): Boolean {
|
||||
val pairType = when (elementType) {
|
||||
pair.leftBraceType -> pair.rightBraceType
|
||||
pair.rightBraceType -> pair.leftBraceType
|
||||
else -> return false
|
||||
}
|
||||
|
||||
return if (pairType == pair.leftBraceType) {
|
||||
checkBracePair(this, parent.firstChild, pairType, PsiElement::getNextSibling)
|
||||
}
|
||||
else {
|
||||
checkBracePair(this, parent.lastChild, pairType, PsiElement::getPrevSibling)
|
||||
}
|
||||
}
|
||||
|
||||
private fun checkBracePair(
|
||||
brace: PsiElement,
|
||||
start: PsiElement,
|
||||
type: IElementType,
|
||||
next: PsiElement.() -> PsiElement?,
|
||||
): Boolean {
|
||||
var element: PsiElement? = start
|
||||
while (element != null && element != brace) {
|
||||
if (element is LeafPsiElement && element.elementType == type) {
|
||||
return true
|
||||
}
|
||||
|
||||
element = element.next()
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
private fun filterPairs(type: IElementType, element: LeafPsiElement): List<BracePair>? {
|
||||
val pairs = element.language.bracePairs ?: return null
|
||||
val filterBraceType = pairs[type.toString()]
|
||||
return when {
|
||||
filterBraceType.isNullOrEmpty() -> {
|
||||
null
|
||||
}
|
||||
// https://github.com/izhangzhihao/intellij-rainbow-brackets/issues/198
|
||||
element.javaClass.simpleName == "OCMacroForeignLeafElement" -> {
|
||||
null
|
||||
}
|
||||
|
||||
RainbowSettings.instance.isDoNOTRainbowifyBracketsWithoutContent -> {
|
||||
filterBraceType
|
||||
.filterNot { it.leftBraceType == type && element.nextSibling?.elementType() == it.rightBraceType }
|
||||
.filterNot { it.rightBraceType == type && element.prevSibling?.elementType() == it.leftBraceType }
|
||||
}
|
||||
|
||||
else -> {
|
||||
filterBraceType
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.chylex.intellij.coloredbrackets.visitor
|
||||
package com.github.izhangzhihao.rainbow.brackets.visitor
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.chylex.intellij.coloredbrackets.visitor.XmlRainbowVisitor.Companion.iterateXmlTagParents
|
||||
import com.chylex.intellij.coloredbrackets.visitor.XmlRainbowVisitor.Companion.xmlParent
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.visitor.XmlRainbowVisitor.Companion.iterateXmlTagParents
|
||||
import com.github.izhangzhihao.rainbow.brackets.visitor.XmlRainbowVisitor.Companion.xmlParent
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightVisitor
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiFile
|
||||
@@ -10,6 +10,7 @@ import com.intellij.psi.xml.XmlTag
|
||||
import com.intellij.psi.xml.XmlToken
|
||||
import com.intellij.psi.xml.XmlTokenType
|
||||
|
||||
|
||||
class PugRainbowVisitor : RainbowHighlightVisitor() {
|
||||
|
||||
override fun suitableForFile(file: PsiFile)
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.chylex.intellij.coloredbrackets.visitor
|
||||
package com.github.izhangzhihao.rainbow.brackets.visitor
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightVisitor
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiFile
|
||||
@@ -23,6 +23,7 @@ import com.jetbrains.python.PyTokenTypes.WITH_KEYWORD
|
||||
import com.jetbrains.python.PyTokenTypes.YIELD_KEYWORD
|
||||
import com.jetbrains.python.psi.PyStatement
|
||||
|
||||
|
||||
class PythonRainbowVisitor : RainbowHighlightVisitor() {
|
||||
|
||||
override fun suitableForFile(file: PsiFile)
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.chylex.intellij.coloredbrackets.visitor
|
||||
package com.github.izhangzhihao.rainbow.brackets.visitor
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.RainbowHighlighter.getHighlightInfo
|
||||
import com.chylex.intellij.coloredbrackets.RainbowInfo
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.chylex.intellij.coloredbrackets.util.memoizedFileExtension
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowHighlighter.getHighlightInfo
|
||||
import com.github.izhangzhihao.rainbow.brackets.RainbowInfo
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.util.memoizedFileExtension
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightVisitor
|
||||
import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder
|
||||
import com.intellij.ide.plugins.PluginManagerCore
|
||||
@@ -16,17 +16,16 @@ import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiFile
|
||||
import java.awt.Color
|
||||
|
||||
|
||||
abstract class RainbowHighlightVisitor : HighlightVisitor {
|
||||
|
||||
private var highlightInfoHolder: HighlightInfoHolder? = null
|
||||
|
||||
override fun suitableForFile(file: PsiFile): Boolean {
|
||||
val settings = RainbowSettings.instance
|
||||
|
||||
return settings.isRainbowEnabled &&
|
||||
return RainbowSettings.instance.isRainbowEnabled &&
|
||||
checkForBigFile(file) &&
|
||||
!settings.languageBlacklist.contains(file.fileType.name) &&
|
||||
!settings.languageBlacklist.contains(memoizedFileExtension(file.name)) &&
|
||||
!RainbowSettings.instance.languageBlacklist.contains(file.fileType.name) &&
|
||||
!RainbowSettings.instance.languageBlacklist.contains(memoizedFileExtension(file.name)) &&
|
||||
fileIsNotHaskellOrIntelliJHaskellPluginNotEnabled(file.fileType.name)
|
||||
}
|
||||
|
||||
@@ -35,6 +34,7 @@ abstract class RainbowHighlightVisitor : HighlightVisitor {
|
||||
onBeforeAnalyze(file, updateWholeFile)
|
||||
try {
|
||||
action.run()
|
||||
} catch (e: Throwable) {
|
||||
} finally {
|
||||
onAfterAnalyze()
|
||||
}
|
||||
@@ -96,24 +96,24 @@ abstract class RainbowHighlightVisitor : HighlightVisitor {
|
||||
|
||||
private fun fileIsNotHaskellOrIntelliJHaskellPluginNotEnabled(fileType: String) =
|
||||
fileType != "Haskell" || !isIntelliJHaskellEnabled
|
||||
|
||||
private fun PsiElement.getLineCount(): Int {
|
||||
try {
|
||||
val doc = containingFile?.let { PsiDocumentManager.getInstance(project).getDocument(it) }
|
||||
if (doc != null) {
|
||||
val spaceRange = textRange ?: TextRange.EMPTY_RANGE
|
||||
|
||||
if (spaceRange.endOffset <= doc.textLength && spaceRange.startOffset < spaceRange.endOffset) {
|
||||
val startLine = doc.getLineNumber(spaceRange.startOffset)
|
||||
val endLine = doc.getLineNumber(spaceRange.endOffset - 1)
|
||||
|
||||
return endLine - startLine + 1
|
||||
}
|
||||
}
|
||||
return StringUtil.getLineBreakCount(text ?: "") + 1
|
||||
} catch (e: Throwable) {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun PsiElement.getLineCount(): Int {
|
||||
try {
|
||||
val doc = containingFile?.let { PsiDocumentManager.getInstance(project).getDocument(it) }
|
||||
if (doc != null) {
|
||||
val spaceRange = textRange ?: TextRange.EMPTY_RANGE
|
||||
|
||||
if (spaceRange.endOffset <= doc.textLength && spaceRange.startOffset < spaceRange.endOffset) {
|
||||
val startLine = doc.getLineNumber(spaceRange.startOffset)
|
||||
val endLine = doc.getLineNumber(spaceRange.endOffset - 1)
|
||||
|
||||
return endLine - startLine + 1
|
||||
}
|
||||
}
|
||||
return StringUtil.getLineBreakCount(text ?: "") + 1
|
||||
} catch (e: Throwable) {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets.visitor
|
||||
package com.github.izhangzhihao.rainbow.brackets.visitor
|
||||
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightVisitor
|
||||
import com.intellij.lang.javascript.DialectDetector
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.chylex.intellij.coloredbrackets.visitor
|
||||
package com.github.izhangzhihao.rainbow.brackets.visitor
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightVisitor
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiFile
|
||||
@@ -9,6 +9,7 @@ import com.intellij.psi.xml.XmlTag
|
||||
import com.intellij.psi.xml.XmlToken
|
||||
import com.intellij.psi.xml.XmlTokenType
|
||||
|
||||
|
||||
open class XmlRainbowVisitor : RainbowHighlightVisitor() {
|
||||
|
||||
override fun suitableForFile(file: PsiFile)
|
||||
@@ -1,9 +1,9 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.ReactJSXRainbowVisitor" />
|
||||
<highlightVisitor implementation="com.github.izhangzhihao.rainbow.brackets.visitor.ReactJSXRainbowVisitor" />
|
||||
</extensions>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="JavaScript"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.TSBracePairProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.TSBracePairProvider" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
5
src/main/resources/META-INF/csharp-annotator.xml
Normal file
5
src/main/resources/META-INF/csharp-annotator.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<annotator language="C#" implementationClass="com.github.izhangzhihao.rainbow.brackets.annotator.RainbowAnnotator" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
10
src/main/resources/META-INF/csharp-brackets.xml
Normal file
10
src/main/resources/META-INF/csharp-brackets.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="C#"
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.CSharpBracePairProvider" />
|
||||
</extensions>
|
||||
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<highlightVisitor implementation="com.github.izhangzhihao.rainbow.brackets.visitor.CSharpRainbowVisitor" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
@@ -1,6 +1,6 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="Dart"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.DartBracePairProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.DartBracePairProvider" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="GoTemplate"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.GoTemplateProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.GoTemplateProvider" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="Groovy"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.GroovyBracePairProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.GroovyBracePairProvider" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<annotator language="Haskell" implementationClass="com.chylex.intellij.coloredbrackets.annotator.RainbowAnnotator" />
|
||||
<annotator language="Haskell" implementationClass="com.github.izhangzhihao.rainbow.brackets.annotator.RainbowAnnotator" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.PugRainbowVisitor" />
|
||||
<highlightVisitor implementation="com.github.izhangzhihao.rainbow.brackets.visitor.PugRainbowVisitor" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="kotlin"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.KotlinBracePairProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.KotlinBracePairProvider" />
|
||||
</extensions>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<annotator language="kotlin"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.annotator.KotlinLambdaExpressionArrowAnnotator" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.annotator.KotlinLambdaExpressionArrowAnnotator" />
|
||||
<annotator language="kotlin"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.annotator.KotlinLabelAnnotator" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.annotator.KotlinLabelAnnotator" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="ObjectiveC"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.OCBracePairProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.OCBracePairProvider" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
@@ -1,6 +1,6 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="PHP"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.PHPBracePairProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.PHPBracePairProvider" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -4,41 +4,13 @@
|
||||
<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>Support for C# (Rider)</li>
|
||||
<li>Support for C++ (Rider, CLion, CLion Nova)</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>
|
||||
<li>Fixed service initialization warnings reported by 2024.2+</li>
|
||||
</ul>
|
||||
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>.
|
||||
]]></description>
|
||||
|
||||
<change-notes><![CDATA[
|
||||
<b>Version 1.3.0</b>
|
||||
<p>6.26</p>
|
||||
<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 IJ 2024.2.</li>
|
||||
<li>Original version the fork is based on.</li>
|
||||
</ul>
|
||||
]]></change-notes>
|
||||
|
||||
@@ -47,8 +19,7 @@
|
||||
<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="cpp-nova-brackets.xml">org.jetbrains.plugins.clion.radler</depends>
|
||||
<depends optional="true" config-file="cpp-rider-brackets.xml">com.intellij.modules.rider</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>
|
||||
@@ -62,34 +33,34 @@
|
||||
<extensionPoints>
|
||||
<extensionPoint name="bracePairProvider" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
|
||||
<with attribute="implementationClass"
|
||||
implements="com.chylex.intellij.coloredbrackets.provider.BracePairProvider" />
|
||||
implements="com.github.izhangzhihao.rainbow.brackets.provider.BracePairProvider" />
|
||||
</extensionPoint>
|
||||
</extensionPoints>
|
||||
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.DefaultRainbowVisitor" />
|
||||
<highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.XmlRainbowVisitor" />
|
||||
<highlightVisitor implementation="com.github.izhangzhihao.rainbow.brackets.visitor.DefaultRainbowVisitor" />
|
||||
<highlightVisitor implementation="com.github.izhangzhihao.rainbow.brackets.visitor.XmlRainbowVisitor" />
|
||||
|
||||
<applicationConfigurable instance="com.chylex.intellij.coloredbrackets.settings.RainbowConfigurable" displayName="Colored Brackets" parentId="appearance" />
|
||||
<applicationConfigurable instance="com.github.izhangzhihao.rainbow.brackets.settings.RainbowConfigurable" displayName="Colored Brackets" parentId="appearance" />
|
||||
<applicationService
|
||||
serviceImplementation="com.chylex.intellij.coloredbrackets.settings.RainbowSettings" />
|
||||
serviceImplementation="com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings" />
|
||||
<colorAndFontPanelFactory
|
||||
implementation="com.chylex.intellij.coloredbrackets.settings.RainbowColorsPageFactory" />
|
||||
implementation="com.github.izhangzhihao.rainbow.brackets.settings.RainbowColorsPageFactory" />
|
||||
<colorAndFontDescriptorProvider
|
||||
implementation="com.chylex.intellij.coloredbrackets.settings.RainbowColorsPageFactory" />
|
||||
implementation="com.github.izhangzhihao.rainbow.brackets.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" />
|
||||
<highlightingPassFactory implementation="com.github.izhangzhihao.rainbow.brackets.indents.RainbowIndentsPassFactory" />
|
||||
<editorNotificationProvider implementation="com.github.izhangzhihao.rainbow.brackets.RainbowifyBanner" />
|
||||
</extensions>
|
||||
|
||||
<applicationListeners>
|
||||
<listener class="com.chylex.intellij.coloredbrackets.listener.RainbowColorsSchemeListener" topic="com.intellij.openapi.editor.colors.EditorColorsListener" />
|
||||
<listener class="com.github.izhangzhihao.rainbow.brackets.listener.RainbowColorsSchemeListener" topic="com.intellij.openapi.editor.colors.EditorColorsListener" />
|
||||
</applicationListeners>
|
||||
|
||||
<actions>
|
||||
<action class="com.chylex.intellij.coloredbrackets.action.ScopeHighlightingAction"
|
||||
<action class="com.github.izhangzhihao.rainbow.brackets.action.ScopeHighlightingAction"
|
||||
id="Rainbow.ScopeHighlightingAction"
|
||||
text="Highlight Current Scope"
|
||||
description="Highlight current scope.">
|
||||
@@ -97,7 +68,7 @@
|
||||
<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"
|
||||
<action class="com.github.izhangzhihao.rainbow.brackets.action.ScopeOutsideHighlightingRestrainAction"
|
||||
id="Rainbow.ScopeOutsideHighlightingRestrainAction"
|
||||
text="Restrain Scope Highlighting"
|
||||
description="Restrain outside of current scope highlighting.">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<highlightVisitor implementation="com.chylex.intellij.coloredbrackets.visitor.PythonRainbowVisitor" />
|
||||
<highlightVisitor implementation="com.github.izhangzhihao.rainbow.brackets.visitor.PythonRainbowVisitor" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="Shell Script"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.SHBracePairProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.SHBracePairProvider" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.chylex.coloredbrackets">
|
||||
<bracePairProvider language="SQL"
|
||||
implementationClass="com.chylex.intellij.coloredbrackets.provider.SqlBracePairProvider" />
|
||||
implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.SqlBracePairProvider" />
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.intellij.psi.PsiDocumentManager
|
||||
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.intellij.psi.PsiDocumentManager
|
||||
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.intellij.ide.plugins.PluginManagerCore
|
||||
import com.intellij.lang.ecmascript6.JSXHarmonyFileType
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.chylex.intellij.coloredbrackets.settings.RainbowSettings
|
||||
import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings
|
||||
import com.intellij.ide.highlighter.JavaFileType
|
||||
import com.intellij.psi.PsiDocumentManager
|
||||
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.intellij.psi.PsiDocumentManager
|
||||
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
|
||||
@@ -57,6 +57,7 @@ fun <T> filter(l: List<T>, f: (T) -> Boolean): MutableList<T> {
|
||||
|
||||
squigglyLevel(1),
|
||||
|
||||
|
||||
squigglyLevel(0)
|
||||
|
||||
)
|
||||
@@ -98,6 +99,7 @@ val a: (Int) -> Unit = { aa ->
|
||||
squigglyLevel(1),
|
||||
squigglyLevel(1),
|
||||
|
||||
|
||||
roundLevel(0),
|
||||
roundLevel(0),
|
||||
|
||||
@@ -110,10 +112,12 @@ val a: (Int) -> Unit = { aa ->
|
||||
squigglyLevel(3),
|
||||
squigglyLevel(3),
|
||||
|
||||
|
||||
squigglyLevel(3),
|
||||
|
||||
squigglyLevel(2),
|
||||
|
||||
|
||||
squigglyLevel(1),
|
||||
|
||||
squigglyLevel(0)
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.chylex.intellij.coloredbrackets
|
||||
package com.github.izhangzhihao.rainbow.brackets
|
||||
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfoType
|
||||
import com.intellij.psi.PsiDocumentManager
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user