mirror of
https://github.com/chylex/IntelliJ-Rainbow-Brackets.git
synced 2026-06-14 16:02:29 +02:00
Compare commits
2 Commits
493f97d4d6
...
6628c25dd6
| Author | SHA1 | Date | |
|---|---|---|---|
|
6628c25dd6
|
|||
|
8fb43ce885
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,6 +2,5 @@
|
|||||||
!/.idea/runConfigurations
|
!/.idea/runConfigurations
|
||||||
|
|
||||||
/.gradle/
|
/.gradle/
|
||||||
/.kotlin/
|
|
||||||
/.intellijPlatform/
|
/.intellijPlatform/
|
||||||
/build/
|
/build/
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ dependencies {
|
|||||||
bundledPlugin("org.jetbrains.kotlin")
|
bundledPlugin("org.jetbrains.kotlin")
|
||||||
bundledPlugin("org.jetbrains.plugins.yaml")
|
bundledPlugin("org.jetbrains.plugins.yaml")
|
||||||
|
|
||||||
|
compatiblePlugin("Dart")
|
||||||
compatiblePlugin("PythonCore")
|
compatiblePlugin("PythonCore")
|
||||||
compatiblePlugin("com.jetbrains.php")
|
compatiblePlugin("com.jetbrains.php")
|
||||||
compatiblePlugin("com.jetbrains.plugins.jade")
|
compatiblePlugin("com.jetbrains.plugins.jade")
|
||||||
@@ -26,8 +27,6 @@ dependencies {
|
|||||||
compatiblePlugin("org.jetbrains.plugins.go-template")
|
compatiblePlugin("org.jetbrains.plugins.go-template")
|
||||||
compatiblePlugin("org.jetbrains.plugins.ruby")
|
compatiblePlugin("org.jetbrains.plugins.ruby")
|
||||||
|
|
||||||
plugin("Dart:504.0.0") // https://plugins.jetbrains.com/plugin/6351-dart/versions/stable
|
|
||||||
|
|
||||||
testFramework(TestFrameworkType.Platform)
|
testFramework(TestFrameworkType.Platform)
|
||||||
testFramework(TestFrameworkType.Plugin.Java)
|
testFramework(TestFrameworkType.Plugin.Java)
|
||||||
testFramework(TestFrameworkType.Plugin.JavaScript)
|
testFramework(TestFrameworkType.Plugin.JavaScript)
|
||||||
@@ -39,7 +38,3 @@ dependencies {
|
|||||||
excludeCoroutines()
|
excludeCoroutines()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
intellijPlatform {
|
|
||||||
buildSearchableOptions = true
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -22,29 +22,32 @@ void main() {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
angleLevel(0),
|
arrayOf(
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
squigglyLevel(0),
|
roundLevel(0),
|
||||||
angleLevel(0),
|
roundLevel(0),
|
||||||
angleLevel(0),
|
roundLevel(0),
|
||||||
squareLevel(0),
|
squigglyLevel(0),
|
||||||
squareLevel(0),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
squareLevel(0),
|
||||||
roundLevel(0),
|
squareLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
squigglyLevel(0)
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,36 +22,39 @@ Map<String, Map<String, String>> convertObjectsToMapProperties(Map<String, Objec
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(1),
|
.shouldBe(
|
||||||
angleLevel(1),
|
arrayOf(
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
|
angleLevel(1),
|
||||||
roundLevel(0),
|
angleLevel(1),
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
angleLevel(0),
|
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
|
angleLevel(0),
|
||||||
squigglyLevel(0),
|
angleLevel(0),
|
||||||
squigglyLevel(1),
|
roundLevel(0),
|
||||||
angleLevel(0),
|
|
||||||
angleLevel(0),
|
squigglyLevel(0),
|
||||||
|
squigglyLevel(1),
|
||||||
squareLevel(0),
|
angleLevel(0),
|
||||||
|
angleLevel(0),
|
||||||
squareLevel(0),
|
|
||||||
|
squareLevel(0),
|
||||||
squigglyLevel(1),
|
|
||||||
|
squareLevel(0),
|
||||||
angleLevel(0),
|
|
||||||
angleLevel(1),
|
squigglyLevel(1),
|
||||||
angleLevel(1),
|
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
|
angleLevel(1),
|
||||||
squigglyLevel(0)
|
angleLevel(1),
|
||||||
|
angleLevel(0),
|
||||||
|
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.chylex.intellij.coloredbrackets
|
package com.chylex.intellij.coloredbrackets
|
||||||
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
import com.intellij.ide.plugins.PluginManagerCore
|
||||||
import com.intellij.lang.javascript.JSXFileType
|
import com.intellij.lang.ecmascript6.JSXHarmonyFileType
|
||||||
import com.intellij.lang.javascript.JavaScriptFileType
|
import com.intellij.lang.javascript.JavaScriptFileType
|
||||||
import com.intellij.lang.javascript.TypeScriptFileType
|
import com.intellij.lang.javascript.TypeScriptFileType
|
||||||
import com.intellij.openapi.extensions.PluginId
|
import com.intellij.openapi.extensions.PluginId
|
||||||
@@ -24,18 +24,21 @@ const _ = require('lodash') || false
|
|||||||
const moment = require('moment')
|
const moment = require('moment')
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
|
|
||||||
myFixture.configureByText(JavaScriptFileType, code)
|
myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(0),
|
.shouldBe(
|
||||||
roundLevel(0),
|
arrayOf(
|
||||||
roundLevel(0)
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testIssue12() {
|
fun testIssue12() {
|
||||||
@@ -44,36 +47,42 @@ const moment = require('moment')
|
|||||||
console.log(a > b)
|
console.log(a > b)
|
||||||
console.log(a == b)
|
console.log(a == b)
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
myFixture.configureByText(JavaScriptFileType, code)
|
myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(0),
|
.shouldBe(
|
||||||
roundLevel(0),
|
arrayOf(
|
||||||
roundLevel(0)
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testIssue21() {
|
fun testIssue21() {
|
||||||
|
|
||||||
@Language("JavaScript") val code = "open (\$" + "{f})\n" + "open (\$" + "{f} )"
|
@Language("JavaScript") val code = "open (\$" + "{f})\n" + "open (\$" + "{f} )"
|
||||||
|
|
||||||
myFixture.configureByText(JavaScriptFileType, code)
|
myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(0),
|
.shouldBe(
|
||||||
roundLevel(0),
|
arrayOf(
|
||||||
roundLevel(0)
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testIssue23() {
|
fun testIssue23() {
|
||||||
@@ -93,30 +102,33 @@ if ((a.field_detail && a.is) ||
|
|||||||
|
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
|
|
||||||
myFixture.configureByText(JavaScriptFileType, code)
|
myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(1),
|
.shouldBe(
|
||||||
roundLevel(1),
|
arrayOf(
|
||||||
roundLevel(1),
|
roundLevel(0),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(0)
|
roundLevel(1),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testIssue38() {
|
fun testIssue38() {
|
||||||
@@ -124,26 +136,30 @@ if ((a.field_detail && a.is) ||
|
|||||||
const element = ( <div> <h1>Hello, world!</h1> </div> );
|
const element = ( <div> <h1>Hello, world!</h1> </div> );
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
|
|
||||||
myFixture.configureByText(JSXFileType, code)
|
myFixture.configureByText(JSXHarmonyFileType.INSTANCE, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.filterNot { it == null }
|
||||||
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
angleLevel(0),
|
arrayOf(
|
||||||
angleLevel(1),
|
roundLevel(0),
|
||||||
angleLevel(1),
|
|
||||||
angleLevel(1),
|
angleLevel(0),
|
||||||
angleLevel(1),
|
angleLevel(0),
|
||||||
angleLevel(0),
|
angleLevel(1),
|
||||||
angleLevel(0),
|
angleLevel(1),
|
||||||
|
angleLevel(1),
|
||||||
roundLevel(0)
|
angleLevel(1),
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(0),
|
||||||
|
|
||||||
|
roundLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun `for somehow, it just don't work "testIssue39"`() {
|
fun `for somehow, it just don't work "testIssue39"`() {
|
||||||
@@ -151,26 +167,30 @@ const element = ( <div> <h1>Hello, world!</h1> </div> );
|
|||||||
const html = '<div><div><div>Hello</div></div></div>'
|
const html = '<div><div><div>Hello</div></div></div>'
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
|
|
||||||
myFixture.configureByText(JavaScriptFileType, code)
|
myFixture.configureByText(JavaScriptFileType.INSTANCE, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.filterNot { it == null }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(1),
|
.shouldBe(
|
||||||
angleLevel(1),
|
arrayOf(
|
||||||
angleLevel(2),
|
angleLevel(0),
|
||||||
angleLevel(2),
|
angleLevel(0),
|
||||||
angleLevel(2),
|
angleLevel(1),
|
||||||
angleLevel(2),
|
angleLevel(1),
|
||||||
angleLevel(1),
|
angleLevel(2),
|
||||||
angleLevel(1),
|
angleLevel(2),
|
||||||
angleLevel(0),
|
angleLevel(2),
|
||||||
angleLevel(0)
|
angleLevel(2),
|
||||||
|
angleLevel(1),
|
||||||
|
angleLevel(1),
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testIssue31() {
|
fun testIssue31() {
|
||||||
@@ -181,39 +201,47 @@ const element = ( <div> <h1>Hello, world!</h1> </div> );
|
|||||||
const s = `<ololo>`
|
const s = `<ololo>`
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
|
|
||||||
myFixture.configureByText(TypeScriptFileType, code)
|
myFixture.configureByText(TypeScriptFileType.INSTANCE, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.filterNot { it == null }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
squigglyLevel(0),
|
.shouldBe(
|
||||||
squigglyLevel(0),
|
arrayOf(
|
||||||
squareLevel(0),
|
roundLevel(0),
|
||||||
squareLevel(0),
|
roundLevel(0),
|
||||||
angleLevel(0),
|
squigglyLevel(0),
|
||||||
angleLevel(0)
|
squigglyLevel(0),
|
||||||
|
squareLevel(0),
|
||||||
|
squareLevel(0)
|
||||||
|
//, angleLevel(0)
|
||||||
|
//, angleLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testIssue427() {
|
fun testIssue427() {
|
||||||
@Language("TypeScript") val code = """let example: Array<Map<string,string>>;""".trimIndent()
|
@Language("TypeScript") val code = """let example: Array<Map<string,string>>;""".trimIndent()
|
||||||
|
|
||||||
myFixture.configureByText(TypeScriptFileType, code)
|
myFixture.configureByText(TypeScriptFileType.INSTANCE, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.filterNot { it == null }
|
||||||
angleLevel(1),
|
.toTypedArray()
|
||||||
angleLevel(1),
|
.shouldBe(
|
||||||
angleLevel(0)
|
arrayOf(
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(1),
|
||||||
|
angleLevel(1),
|
||||||
|
angleLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,26 +35,29 @@ public class Test<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
squigglyLevel(0),
|
arrayOf(
|
||||||
roundLevel(0),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
angleLevel(0),
|
||||||
squigglyLevel(1),
|
squigglyLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
squigglyLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(0),
|
||||||
roundLevel(2),
|
roundLevel(0),
|
||||||
roundLevel(2),
|
roundLevel(0),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(0),
|
roundLevel(2),
|
||||||
squigglyLevel(1),
|
roundLevel(2),
|
||||||
squigglyLevel(0)
|
roundLevel(1),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testDisableRainbowForJava() {
|
fun testDisableRainbowForJava() {
|
||||||
@@ -72,9 +75,12 @@ public class Test<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf()
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
)
|
.toTypedArray()
|
||||||
|
.shouldBe(
|
||||||
|
arrayOf()
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testDisableRainbowAngleBracketsForJava() {
|
fun testDisableRainbowAngleBracketsForJava() {
|
||||||
@@ -92,24 +98,27 @@ public class Test<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
squigglyLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(0),
|
.shouldBe(
|
||||||
roundLevel(0),
|
arrayOf(
|
||||||
squigglyLevel(1),
|
squigglyLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
squigglyLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(0),
|
||||||
roundLevel(2),
|
roundLevel(0),
|
||||||
roundLevel(2),
|
roundLevel(0),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(0),
|
roundLevel(2),
|
||||||
squigglyLevel(1),
|
roundLevel(2),
|
||||||
squigglyLevel(0)
|
roundLevel(1),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testDisableRainbowRoundBracketsForJava() {
|
fun testDisableRainbowRoundBracketsForJava() {
|
||||||
@@ -127,16 +136,19 @@ public class Test<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
squigglyLevel(0),
|
arrayOf(
|
||||||
squigglyLevel(1),
|
angleLevel(0),
|
||||||
squigglyLevel(1),
|
angleLevel(0),
|
||||||
squigglyLevel(0)
|
squigglyLevel(0),
|
||||||
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testDisableRainbowSquigglyBracketsForJava() {
|
fun testDisableRainbowSquigglyBracketsForJava() {
|
||||||
@@ -154,22 +166,25 @@ public class Test<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
roundLevel(0),
|
arrayOf(
|
||||||
roundLevel(0),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(1),
|
roundLevel(0),
|
||||||
roundLevel(2),
|
roundLevel(0),
|
||||||
roundLevel(2),
|
roundLevel(0),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(0)
|
roundLevel(2),
|
||||||
|
roundLevel(2),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testDoNOTRainbowifyBracketsWithoutContentForJava() {
|
fun testDoNOTRainbowifyBracketsWithoutContentForJava() {
|
||||||
@@ -187,22 +202,25 @@ public class Test<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
squigglyLevel(0),
|
arrayOf(
|
||||||
squigglyLevel(1),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
angleLevel(0),
|
||||||
roundLevel(0),
|
squigglyLevel(0),
|
||||||
roundLevel(0),
|
squigglyLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(0),
|
||||||
roundLevel(1),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
squigglyLevel(1),
|
roundLevel(1),
|
||||||
squigglyLevel(0)
|
roundLevel(1),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testDoNOTRainbowifyBracketsWhenJavaInBlacklist() {
|
fun testDoNOTRainbowifyBracketsWhenJavaInBlacklist() {
|
||||||
@@ -221,7 +239,11 @@ public class Test<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().size.shouldBe(0)
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
|
.toTypedArray()
|
||||||
|
.size
|
||||||
|
.shouldBe(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testIssue391() {
|
fun testIssue391() {
|
||||||
@@ -240,28 +262,31 @@ public class Test {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),//{
|
.toTypedArray()
|
||||||
|
.shouldBe(
|
||||||
roundLevel(1),//(
|
arrayOf(
|
||||||
roundLevel(1),//)
|
roundLevel(0),//{
|
||||||
|
|
||||||
roundLevel(1),//{
|
roundLevel(1),//(
|
||||||
|
roundLevel(1),//)
|
||||||
roundLevel(2),
|
|
||||||
roundLevel(2),
|
roundLevel(1),//{
|
||||||
roundLevel(2),
|
|
||||||
roundLevel(3),
|
roundLevel(2),
|
||||||
roundLevel(4),
|
roundLevel(2),
|
||||||
roundLevel(4),
|
roundLevel(2),
|
||||||
roundLevel(3),
|
roundLevel(3),
|
||||||
roundLevel(2),
|
roundLevel(4),
|
||||||
|
roundLevel(4),
|
||||||
roundLevel(1),//}
|
roundLevel(3),
|
||||||
|
roundLevel(2),
|
||||||
roundLevel(0)//}
|
|
||||||
|
roundLevel(1),//}
|
||||||
|
|
||||||
|
roundLevel(0)//}
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,44 +20,47 @@ fun <T> filter(l: List<T>, f: (T) -> Boolean): MutableList<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
|
arrayOf(
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(0),
|
||||||
|
|
||||||
|
roundLevel(0),
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(0),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(0),
|
||||||
|
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(0),
|
||||||
|
|
||||||
|
squigglyLevel(0),
|
||||||
|
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(0),
|
||||||
|
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(1),
|
||||||
|
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(0),
|
||||||
|
|
||||||
|
squigglyLevel(2),
|
||||||
|
squigglyLevel(2),
|
||||||
|
|
||||||
|
squigglyLevel(1),
|
||||||
|
|
||||||
|
squigglyLevel(0)
|
||||||
|
|
||||||
roundLevel(0),
|
)
|
||||||
angleLevel(0),
|
|
||||||
angleLevel(0),
|
|
||||||
roundLevel(1),
|
|
||||||
roundLevel(1),
|
|
||||||
roundLevel(0),
|
|
||||||
|
|
||||||
angleLevel(0),
|
|
||||||
angleLevel(0),
|
|
||||||
|
|
||||||
squigglyLevel(0),
|
|
||||||
|
|
||||||
angleLevel(0),
|
|
||||||
angleLevel(0),
|
|
||||||
|
|
||||||
roundLevel(0),
|
|
||||||
roundLevel(0),
|
|
||||||
squigglyLevel(1),
|
|
||||||
|
|
||||||
roundLevel(0),
|
|
||||||
roundLevel(1),
|
|
||||||
roundLevel(1),
|
|
||||||
roundLevel(0),
|
|
||||||
|
|
||||||
squigglyLevel(2),
|
|
||||||
squigglyLevel(2),
|
|
||||||
|
|
||||||
squigglyLevel(1),
|
|
||||||
|
|
||||||
squigglyLevel(0)
|
|
||||||
|
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testRainbowArrowForKotlin() {
|
fun testRainbowArrowForKotlin() {
|
||||||
@@ -65,7 +68,7 @@ fun <T> filter(l: List<T>, f: (T) -> Boolean): MutableList<T> {
|
|||||||
"""
|
"""
|
||||||
val a: (Int) -> Unit = { aa ->
|
val a: (Int) -> Unit = { aa ->
|
||||||
val b: (Int) -> Unit = { bb ->
|
val b: (Int) -> Unit = { bb ->
|
||||||
val c: (Int) -> Unit = { cc ->
|
val c: (Int) -> Unit = { cc ->
|
||||||
val d: (Int) -> Unit = { dd ->
|
val d: (Int) -> Unit = { dd ->
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -76,33 +79,46 @@ val a: (Int) -> Unit = { aa ->
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.filter { brackets.contains(it.text.toChar()) || it.text.contains("->") }
|
||||||
roundLevel(0),
|
.filter { it?.forcedTextAttributesKey?.defaultAttributes != null }
|
||||||
roundLevel(0),
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
squigglyLevel(0),
|
.toTypedArray()
|
||||||
|
.shouldBe(
|
||||||
roundLevel(0),
|
arrayOf(
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
squigglyLevel(1),
|
roundLevel(0),
|
||||||
|
|
||||||
roundLevel(0),
|
squigglyLevel(0),
|
||||||
roundLevel(0),
|
squigglyLevel(0),
|
||||||
squigglyLevel(2),
|
|
||||||
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
|
||||||
squigglyLevel(3),
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(1),
|
||||||
squigglyLevel(3),
|
|
||||||
|
roundLevel(0),
|
||||||
squigglyLevel(2),
|
roundLevel(0),
|
||||||
|
|
||||||
squigglyLevel(1),
|
squigglyLevel(2),
|
||||||
|
squigglyLevel(2),
|
||||||
squigglyLevel(0)
|
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
|
||||||
|
squigglyLevel(3),
|
||||||
|
squigglyLevel(3),
|
||||||
|
|
||||||
|
squigglyLevel(3),
|
||||||
|
|
||||||
|
squigglyLevel(2),
|
||||||
|
|
||||||
|
squigglyLevel(1),
|
||||||
|
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun `ForSomeHowTheTestNotPassed "testRainbowLabelForKotlin"`() {
|
fun `ForSomeHowTheTestNotPassed "testRainbowLabelForKotlin"`() {
|
||||||
@@ -126,14 +142,18 @@ class AA {
|
|||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
|
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.filter { it.forcedTextAttributes != null && it.text.contains("@") }
|
||||||
squigglyLevel(3),
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
squigglyLevel(4),
|
.toTypedArray()
|
||||||
squigglyLevel(3),
|
.shouldBe(
|
||||||
squigglyLevel(2)
|
arrayOf(
|
||||||
|
squigglyLevel(3),
|
||||||
|
squigglyLevel(4),
|
||||||
|
squigglyLevel(3),
|
||||||
|
squigglyLevel(2)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testKotlinFunctionLiteralBracesAndArrow() {
|
fun testKotlinFunctionLiteralBracesAndArrow() {
|
||||||
@@ -151,15 +171,20 @@ fun t() {
|
|||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
|
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.filter { brackets.contains(it.text.toChar()) }
|
||||||
roundLevel(0),
|
.filter { it?.forcedTextAttributesKey?.defaultAttributes != null }
|
||||||
roundLevel(0),
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
squigglyLevel(0),
|
.toTypedArray()
|
||||||
squigglyLevel(1),
|
.shouldBe(
|
||||||
squigglyLevel(1),
|
arrayOf(
|
||||||
squigglyLevel(0)
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(0),
|
||||||
|
//squigglyLevel(1),
|
||||||
|
//squigglyLevel(1),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.chylex.intellij.coloredbrackets
|
package com.chylex.intellij.coloredbrackets
|
||||||
|
|
||||||
|
import com.intellij.codeInsight.daemon.impl.HighlightInfoType
|
||||||
import com.intellij.psi.PsiDocumentManager
|
import com.intellij.psi.PsiDocumentManager
|
||||||
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
|
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
|
||||||
import com.jetbrains.php.lang.PhpFileType
|
import com.jetbrains.php.lang.PhpFileType
|
||||||
@@ -27,26 +28,29 @@ function padZero(string data): string
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) && it.severity != HighlightInfoType.INJECTED_FRAGMENT_SEVERITY }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(0),
|
.shouldBe(
|
||||||
|
arrayOf(
|
||||||
squigglyLevel(0),
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
roundLevel(1),
|
|
||||||
roundLevel(1),
|
squigglyLevel(0),
|
||||||
|
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(1),
|
roundLevel(1),
|
||||||
|
|
||||||
squigglyLevel(1),
|
roundLevel(1),
|
||||||
roundLevel(2),
|
roundLevel(1),
|
||||||
roundLevel(2),
|
|
||||||
squigglyLevel(1),
|
squigglyLevel(1),
|
||||||
|
roundLevel(2),
|
||||||
squigglyLevel(0)
|
roundLevel(2),
|
||||||
|
squigglyLevel(1),
|
||||||
|
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,15 +23,18 @@ end
|
|||||||
myFixture.configureByText(RubyFileType.RUBY, code)
|
myFixture.configureByText(RubyFileType.RUBY, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty());
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(1),
|
.shouldBe(
|
||||||
roundLevel(1),
|
arrayOf(
|
||||||
roundLevel(0)
|
roundLevel(0),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(1),
|
||||||
|
roundLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testRainbowForIssue53Part1() {
|
fun testRainbowForIssue53Part1() {
|
||||||
@@ -42,13 +45,16 @@ foobar(p1: "", p2: false, p3: 1)
|
|||||||
myFixture.configureByText(RubyFileType.RUBY, code)
|
myFixture.configureByText(RubyFileType.RUBY, code)
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty());
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(0)
|
.shouldBe(
|
||||||
|
arrayOf(
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testRainbowForIssue53Part2() {
|
fun testRainbowForIssue53Part2() {
|
||||||
@@ -65,20 +71,25 @@ end
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.filter { brackets.contains(it.text.toChar()) }
|
||||||
roundLevel(0),
|
.filterNot { it?.forcedTextAttributesKey?.defaultAttributes == null }
|
||||||
squigglyLevel(0),
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
squigglyLevel(1),
|
.toTypedArray()
|
||||||
squigglyLevel(1),
|
.shouldBe(
|
||||||
squigglyLevel(1),
|
arrayOf(
|
||||||
squigglyLevel(1),
|
roundLevel(0),
|
||||||
squigglyLevel(0),
|
squigglyLevel(0),
|
||||||
roundLevel(0),
|
squigglyLevel(1),
|
||||||
squigglyLevel(0),
|
squigglyLevel(1),
|
||||||
squigglyLevel(0)
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(0),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testRainbowForIssue53Part3() {
|
fun testRainbowForIssue53Part3() {
|
||||||
@@ -98,14 +109,19 @@ end
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.filter { brackets.contains(it.text.toChar()) }
|
||||||
squareLevel(0),
|
.filterNot { it?.forcedTextAttributesKey?.defaultAttributes == null }
|
||||||
squareLevel(0),
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
squareLevel(0),
|
.toTypedArray()
|
||||||
squareLevel(0)
|
.shouldBe(
|
||||||
|
arrayOf(
|
||||||
|
squareLevel(0),
|
||||||
|
squareLevel(0),
|
||||||
|
squareLevel(0),
|
||||||
|
squareLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testRainbowForIssue53Part4() {
|
fun testRainbowForIssue53Part4() {
|
||||||
@@ -119,15 +135,20 @@ end
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.filter { brackets.contains(it.text.toChar()) }
|
||||||
squareLevel(0),
|
.filterNot { it?.forcedTextAttributesKey?.defaultAttributes == null }
|
||||||
squareLevel(1),
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
squareLevel(2),
|
.toTypedArray()
|
||||||
squareLevel(2),
|
.shouldBe(
|
||||||
squareLevel(1),
|
arrayOf(
|
||||||
squareLevel(0)
|
squareLevel(0),
|
||||||
|
squareLevel(1),
|
||||||
|
squareLevel(2),
|
||||||
|
squareLevel(2),
|
||||||
|
squareLevel(1),
|
||||||
|
squareLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,7 @@ import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
|
|||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
import org.intellij.lang.annotations.Language
|
import org.intellij.lang.annotations.Language
|
||||||
import org.jetbrains.plugins.scala.ScalaFileType
|
import org.jetbrains.plugins.scala.ScalaFileType
|
||||||
import org.junit.Ignore
|
|
||||||
|
|
||||||
@Ignore("IDEA has broken modularization")
|
|
||||||
class RainbowScalaTest : LightJavaCodeInsightFixtureTestCase() {
|
class RainbowScalaTest : LightJavaCodeInsightFixtureTestCase() {
|
||||||
|
|
||||||
override fun tearDown() {
|
override fun tearDown() {
|
||||||
@@ -38,24 +36,28 @@ import scala.annotation.tailrec
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.filter { it?.forcedTextAttributesKey != null }
|
||||||
squareLevel(0),
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
squareLevel(0),
|
.toTypedArray()
|
||||||
|
.shouldBe(
|
||||||
roundLevel(0),
|
arrayOf(
|
||||||
roundLevel(0),
|
squareLevel(0),
|
||||||
|
squareLevel(0),
|
||||||
squigglyLevel(0),
|
|
||||||
squigglyLevel(1),
|
roundLevel(0),
|
||||||
squareLevel(0),
|
roundLevel(0),
|
||||||
squareLevel(0),
|
|
||||||
roundLevel(0),
|
squigglyLevel(0),
|
||||||
roundLevel(0),
|
squigglyLevel(1),
|
||||||
squigglyLevel(1),
|
squareLevel(0),
|
||||||
squigglyLevel(0)
|
squareLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testDisableRainbowSquareBracketsForScala() {
|
fun testDisableRainbowSquareBracketsForScala() {
|
||||||
@@ -76,19 +78,23 @@ import scala.annotation.tailrec
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
arrayOf(
|
.filter { it?.forcedTextAttributesKey != null }
|
||||||
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
roundLevel(0),
|
.toTypedArray()
|
||||||
roundLevel(0),
|
.shouldBe(
|
||||||
|
arrayOf(
|
||||||
squigglyLevel(0),
|
|
||||||
squigglyLevel(1),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
roundLevel(0),
|
||||||
roundLevel(0),
|
|
||||||
squigglyLevel(1),
|
squigglyLevel(0),
|
||||||
squigglyLevel(0)
|
squigglyLevel(1),
|
||||||
|
roundLevel(0),
|
||||||
|
roundLevel(0),
|
||||||
|
squigglyLevel(1),
|
||||||
|
squigglyLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,56 +28,59 @@ class RainbowXMLTest : LightJavaCodeInsightFixtureTestCase() {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
|
arrayOf(
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
|
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
angleLevel(0),//idea-plugin
|
angleLevel(0),
|
||||||
angleLevel(0),
|
|
||||||
|
angleLevel(0),
|
||||||
angleLevel(1),
|
angleLevel(0),//idea-plugin
|
||||||
angleLevel(1),//name
|
angleLevel(0),
|
||||||
angleLevel(1),
|
|
||||||
angleLevel(1),
|
angleLevel(1),
|
||||||
angleLevel(1),//name
|
angleLevel(1),//name
|
||||||
angleLevel(1),
|
angleLevel(1),
|
||||||
|
angleLevel(1),
|
||||||
angleLevel(1),
|
angleLevel(1),//name
|
||||||
angleLevel(1),//description
|
angleLevel(1),
|
||||||
angleLevel(1),
|
|
||||||
|
angleLevel(1),
|
||||||
angleLevel(2),
|
angleLevel(1),//description
|
||||||
angleLevel(2),//p
|
angleLevel(1),
|
||||||
angleLevel(2),
|
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
angleLevel(2),//p
|
angleLevel(2),//p
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
|
angleLevel(2),
|
||||||
angleLevel(2),
|
angleLevel(2),//p
|
||||||
angleLevel(2),//p
|
angleLevel(2),
|
||||||
angleLevel(2),
|
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
angleLevel(2),//p
|
angleLevel(2),//p
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
|
angleLevel(2),
|
||||||
angleLevel(2),
|
angleLevel(2),//p
|
||||||
angleLevel(2),//br
|
angleLevel(2),
|
||||||
angleLevel(2),
|
|
||||||
|
angleLevel(2),
|
||||||
angleLevel(1),
|
angleLevel(2),//br
|
||||||
angleLevel(1),//description
|
angleLevel(2),
|
||||||
angleLevel(1),
|
|
||||||
|
angleLevel(1),
|
||||||
angleLevel(0),
|
angleLevel(1),//description
|
||||||
angleLevel(0),//idea-plugin
|
angleLevel(1),
|
||||||
angleLevel(0)
|
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(0),//idea-plugin
|
||||||
|
angleLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun testRainbowForXML() {
|
fun testRainbowForXML() {
|
||||||
@@ -100,44 +103,47 @@ class RainbowXMLTest : LightJavaCodeInsightFixtureTestCase() {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
doHighlighting.getBrackets().shouldBe(
|
doHighlighting
|
||||||
arrayOf(
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
angleLevel(0),
|
.toTypedArray()
|
||||||
angleLevel(0),
|
.shouldBe(
|
||||||
|
arrayOf(
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
|
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
angleLevel(0),
|
angleLevel(0),
|
||||||
|
|
||||||
angleLevel(1),
|
angleLevel(0),
|
||||||
angleLevel(1),
|
angleLevel(0),
|
||||||
angleLevel(1),
|
|
||||||
angleLevel(1),
|
angleLevel(1),
|
||||||
|
angleLevel(1),
|
||||||
angleLevel(1),
|
angleLevel(1),
|
||||||
angleLevel(1),
|
angleLevel(1),
|
||||||
|
|
||||||
angleLevel(2),
|
angleLevel(1),
|
||||||
angleLevel(2),
|
angleLevel(1),
|
||||||
angleLevel(2),
|
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
|
angleLevel(2),
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
angleLevel(2),
|
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
|
angleLevel(2),
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
angleLevel(2),
|
angleLevel(2),
|
||||||
|
|
||||||
angleLevel(1),
|
angleLevel(2),
|
||||||
angleLevel(1),
|
angleLevel(2),
|
||||||
|
|
||||||
angleLevel(0),
|
angleLevel(1),
|
||||||
angleLevel(0)
|
angleLevel(1),
|
||||||
|
|
||||||
|
angleLevel(0),
|
||||||
|
angleLevel(0)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,11 @@ public class Test<T> {
|
|||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val doHighlighting = myFixture.doHighlighting()
|
val doHighlighting = myFixture.doHighlighting()
|
||||||
assertFalse(doHighlighting.isEmpty())
|
assertFalse(doHighlighting.isEmpty())
|
||||||
val highlightSize = doHighlighting.getBrackets().size
|
val highlightSize = doHighlighting.filter { brackets.contains(it.text.toChar()) }
|
||||||
|
.filter { it.forcedTextAttributesKey.defaultAttributes.foregroundColor != null }
|
||||||
|
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
||||||
|
.toTypedArray()
|
||||||
|
.size
|
||||||
assert(highlightSize == 16)
|
assert(highlightSize == 16)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,8 @@
|
|||||||
package com.chylex.intellij.coloredbrackets
|
package com.chylex.intellij.coloredbrackets
|
||||||
|
|
||||||
import com.chylex.intellij.coloredbrackets.visitor.RainbowHighlightVisitor
|
val brackets = RainbowHighlighter.getBrackets()
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
|
||||||
import java.awt.Color
|
|
||||||
|
|
||||||
fun List<HighlightInfo>.getBrackets(): Array<Color> {
|
fun CharSequence.toChar() = elementAt(0)
|
||||||
return this
|
|
||||||
.filter { it.toolId?.let { id -> id is Class<*> && RainbowHighlightVisitor::class.java.isAssignableFrom(id) } == true }
|
|
||||||
.map { it.forcedTextAttributesKey.defaultAttributes.foregroundColor }
|
|
||||||
.toTypedArray()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun roundLevel(level: Int) = RainbowHighlighter.getRainbowColor(RainbowHighlighter.NAME_ROUND_BRACKETS, level)
|
fun roundLevel(level: Int) = RainbowHighlighter.getRainbowColor(RainbowHighlighter.NAME_ROUND_BRACKETS, level)
|
||||||
|
|
||||||
|
|||||||
@@ -27,10 +27,6 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
intellijPlatform {
|
intellijPlatform {
|
||||||
sandboxContainer.set(layout.buildDirectory.map { it.dir("idea-sandbox") })
|
|
||||||
|
|
||||||
buildSearchableOptions = false
|
|
||||||
|
|
||||||
pluginConfiguration {
|
pluginConfiguration {
|
||||||
ideaVersion {
|
ideaVersion {
|
||||||
sinceBuild.set("253")
|
sinceBuild.set("253")
|
||||||
@@ -50,9 +46,14 @@ allprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
subprojects {
|
||||||
|
intellijPlatform {
|
||||||
|
buildSearchableOptions = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
idea {
|
idea {
|
||||||
module {
|
module {
|
||||||
excludeDirs.add(file(".kotlin"))
|
|
||||||
excludeDirs.add(file("build"))
|
excludeDirs.add(file("build"))
|
||||||
excludeDirs.add(file("gradle"))
|
excludeDirs.add(file("gradle"))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ val ideaVersion: String by project
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation(project(":base"))
|
implementation(project(":base"))
|
||||||
|
|
||||||
runtimeOnly(project(":rider")) // Support for CLion Nova.
|
|
||||||
|
|
||||||
intellijPlatform {
|
intellijPlatform {
|
||||||
clion(ideaVersion)
|
clion(ideaVersion)
|
||||||
|
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,9 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
retries=0
|
|
||||||
retryBackOffMs=500
|
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
15
gradlew
vendored
15
gradlew
vendored
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015 the original authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -15,8 +15,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -57,7 +55,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -86,7 +84,7 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -114,6 +112,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -171,6 +170,7 @@ fi
|
|||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if "$cygwin" || "$msys" ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
@@ -203,14 +203,15 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# and any embedded shellness will be escaped.
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# treated as '${Hostname}' itself on the command line.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
54
gradlew.bat
vendored
54
gradlew.bat
vendored
@@ -13,8 +13,6 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -23,8 +21,8 @@
|
|||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem Set local scope for the variables, and ensure extensions are enabled
|
@rem Set local scope for the variables with windows NT shell
|
||||||
setlocal EnableExtensions
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
@@ -45,13 +43,13 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation.
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
goto fail
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
:findJavaFromJavaHome
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
@@ -59,24 +57,36 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation.
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
goto fail
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||||
@rem which allows us to clear the local environment before executing the java command
|
|
||||||
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
|
||||||
|
|
||||||
:exitWithErrorLevel
|
:end
|
||||||
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
@rem End local scope for the variables with windows NT shell
|
||||||
"%COMSPEC%" /c exit %ERRORLEVEL%
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ rootProject.name = "ColoredBrackets"
|
|||||||
pluginManagement {
|
pluginManagement {
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "2.2.20"
|
kotlin("jvm") version "2.2.20"
|
||||||
id("org.jetbrains.intellij.platform") version "2.16.0"
|
id("org.jetbrains.intellij.platform") version "2.11.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user