diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index ad272dc..f050cc4 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -9,7 +9,7 @@ Please search on the [issues](https://github.com/izhangzhihao/intellij-rainbow-b - [ ] If you are submitting a feature request, please do consider donating us on [Open Collective](https://opencollective.com/intellij-rainbow-brackets) Or by AliPay/WeChatPay. - [ ] This issue/feature request is not reported before. -## Your programming language(s) +## Your programming languages ## Expected Behavior * If you're describing a bug, tell us what should happen @@ -33,17 +33,18 @@ Please provide code snippet for reproduce bugs. * NOTE: If you are going to report a bug but WITHOUT your env information, your issue might be closed directly. ``` -IntelliJ IDEA 2020.2 (Ultimate Edition) -Build #IU-202.6397.94, built on July 27, 2020 +IntelliJ IDEA 2021.2 (Ultimate Edition) +Build #IU-212.4746.92, built on July 27, 2021 Licensed to IntelliJ Rainbow Brackets / Zhang Zhihao -Subscription is active until February 19, 2021 +Subscription is active until February 3, 2022. For non-commercial open source development only. -Runtime version: 11.0.7+10-b944.20 x86_64 +Runtime version: 11.0.11+9-b1504.13 x86_64 VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o. -macOS 10.15.5 -GC: ParNew, ConcurrentMarkSweep -Memory: 4029M -Cores: 8 -Registry: ide.tooltip.initialDelay=900, ide.balloon.shadow.size=0 -Non-Bundled Plugins: com.chrisrm.idea.MaterialThemeUI, izhangzhihao.rainbow.brackets +macOS 11.4 +GC: G1 Young Generation, G1 Old Generation +Memory: 4096M +Cores: 16 +Registry: ide.tooltip.initialDelay=900, ide.balloon.shadow.size=0, scala.erase.compiler.process.jdk.once=false +Non-Bundled Plugins: com.intellij.properties.bundle.editor (212.4746.57), com.markskelton.one-dark-theme (5.3.0), lermitage.intellij.extra.icons (1.59.0.203), org.nik.presentation-assistant (1.0.9), kotest-plugin-intellij (1.1.36-IC-2021.1), Pythonid (212.4746.96), org.intellij.scala (2021.2.15), izhangzhihao.rainbow.brackets (6.19), com.intellij.bigdatatools (212.4037.55) +Kotlin: 212-1.5.10-release-IJ4746.92 ``` diff --git a/.gitpod.yml b/.gitpod.yml index 5dbaac8..973669f 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,7 +2,3 @@ image: file: .gitpod.Dockerfile tasks: - init: gradle compileKotlin -vscode: - extensions: - - mathiasfrohlich.Kotlin@1.7.1:zRxka5i+6/G9r7KC3xmyXQ== - - fwcd.kotlin@0.2.11:moh8IDanzsIlhtK2IeiLmQ== diff --git a/build.gradle.kts b/build.gradle.kts index 72c9e27..a8e0537 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -82,7 +82,7 @@ dependencies { // exclude("gson") //} compileOnly(fileTree("libs")) - testImplementation("io.kotlintest:kotlintest:2.0.7") + testImplementation("io.kotest:kotest-assertions-core:4.6.1") } java { diff --git a/gradle.properties b/gradle.properties index 7b90694..8713c86 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ kotlinTargetVersion=1.4 version=6.19 publishChannels=Stable kotlin.stdlib.default.dependency=false -pluginVerifierIdeVersions=WS-2020.3, IIC-2021.1 +pluginVerifierIdeVersions=WS-2020.3, IIC-2021.1, IIU-2021.2 diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowDartTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowDartTest.kt index 50cd519..7d2f7e4 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowDartTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowDartTest.kt @@ -3,7 +3,7 @@ package com.github.izhangzhihao.rainbow.brackets import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import com.jetbrains.lang.dart.DartFileType -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe class RainbowDartTest : LightJavaCodeInsightFixtureTestCase() { fun testRainbowForDart() { diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowGroovyTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowGroovyTest.kt index d681e4c..a6fceec 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowGroovyTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowGroovyTest.kt @@ -2,7 +2,7 @@ package com.github.izhangzhihao.rainbow.brackets import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe import org.intellij.lang.annotations.Language import org.jetbrains.plugins.groovy.GroovyFileType diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowJavaScriptTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowJavaScriptTest.kt index 19a2b70..f025005 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowJavaScriptTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowJavaScriptTest.kt @@ -7,7 +7,7 @@ import com.intellij.lang.javascript.TypeScriptFileType import com.intellij.openapi.extensions.PluginId import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe import org.intellij.lang.annotations.Language class RainbowJavaScriptTest : LightJavaCodeInsightFixtureTestCase() { diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowJavaTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowJavaTest.kt index 11eba05..c2602a9 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowJavaTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowJavaTest.kt @@ -4,7 +4,7 @@ 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 -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe import org.intellij.lang.annotations.Language class RainbowJavaTest : LightJavaCodeInsightFixtureTestCase() { diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowKotlinTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowKotlinTest.kt index d4c4c08..1d660ae 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowKotlinTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowKotlinTest.kt @@ -2,7 +2,7 @@ package com.github.izhangzhihao.rainbow.brackets import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe import org.intellij.lang.annotations.Language import org.jetbrains.kotlin.idea.KotlinFileType diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowPHPTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowPHPTest.kt index 4186e9e..401eab2 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowPHPTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowPHPTest.kt @@ -3,7 +3,7 @@ package com.github.izhangzhihao.rainbow.brackets import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import com.jetbrains.php.lang.PhpFileType -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe class RainbowPHPTest : LightJavaCodeInsightFixtureTestCase() { fun testRainbowForPHP() { diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowRubyTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowRubyTest.kt index 8a0e415..55bb4a8 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowRubyTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowRubyTest.kt @@ -4,7 +4,7 @@ import com.intellij.ide.plugins.PluginManagerCore import com.intellij.openapi.extensions.PluginId import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe import org.jetbrains.plugins.ruby.ruby.lang.RubyFileType class RainbowRubyTest : LightJavaCodeInsightFixtureTestCase() { diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowScalaTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowScalaTest.kt index a1b8887..0030b7a 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowScalaTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowScalaTest.kt @@ -3,7 +3,7 @@ package com.github.izhangzhihao.rainbow.brackets import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe import org.intellij.lang.annotations.Language import org.jetbrains.plugins.scala.ScalaFileType diff --git a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowXMLTest.kt b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowXMLTest.kt index 2a65ebc..bd379fc 100644 --- a/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowXMLTest.kt +++ b/src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/RainbowXMLTest.kt @@ -4,7 +4,7 @@ import com.github.izhangzhihao.rainbow.brackets.settings.RainbowSettings import com.intellij.ide.highlighter.XmlFileType import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase -import io.kotlintest.matchers.shouldBe +import io.kotest.matchers.shouldBe import org.intellij.lang.annotations.Language class RainbowXMLTest : LightJavaCodeInsightFixtureTestCase() {