diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1a2e38..fd34bf4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,12 +48,12 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/wrapper-validation-action@v1.0.4 - # Setup Java 11 environment for the next steps + # Setup Java 17 environment for the next steps - name: Setup Java uses: actions/setup-java@v3 with: distribution: zulu - java-version: 11 + java-version: 17 # Set environment variables - name: Export Properties @@ -108,7 +108,7 @@ jobs: # Run Qodana inspections - name: Qodana - Code Inspection - uses: JetBrains/qodana-action@v2022.2.1 + uses: JetBrains/qodana-action@v2022.3.4 # Prepare plugin archive content for creating artifact - name: Prepare Plugin Artifact diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb8f261..7d57e0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,12 +23,12 @@ jobs: with: ref: ${{ github.event.release.tag_name }} - # Setup Java 11 environment for the next steps + # Setup Java 17 environment for the next steps - name: Setup Java uses: actions/setup-java@v3 with: distribution: zulu - java-version: 11 + java-version: 17 # Set environment variables - name: Export Properties diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 1e4456d..0eb49b5 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -35,12 +35,12 @@ jobs: - name: Fetch Sources uses: actions/checkout@v3 - # Setup Java 11 environment for the next steps + # Setup Java 17 environment for the next steps - name: Setup Java uses: actions/setup-java@v3 with: distribution: zulu - java-version: 11 + java-version: 17 # Run IDEA prepared for UI testing - name: Run IDE diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dd4594..f4430eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ # intellij-kdl Changelog ## [Unreleased] +### Added +- 2023.1 and 2023.2 compatibility +- Minimal required version is now 2022.3 ## [1.0.1] -### Added +### Added - 2022.3 compatibility ## [1.0.0] diff --git a/build.gradle.kts b/build.gradle.kts index d745ad9..36fd367 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { id("org.jetbrains.intellij") version "1.9.0" id("org.jetbrains.changelog") version "1.3.1" id("org.jetbrains.qodana") version "0.1.13" - id("org.jetbrains.grammarkit") version "2021.2.2" + id("org.jetbrains.grammarkit") version "2022.3.1" id("org.ajoberstar.grgit") version "5.0.0" } @@ -25,7 +25,7 @@ repositories { kotlin { jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } @@ -114,21 +114,21 @@ sourceSets { } val generateKdlLexer = task("generateKdlLexer") { - source.set("src/main/grammars/KdlLexer.flex") + sourceFile.set(file("src/main/grammars/KdlLexer.flex")) targetDir.set("src/genparser/dev/kdl/lang/lexer") targetClass.set("KdlLexer") purgeOldFiles.set(true) } val generateKdlStringLexer = task("generateKdlStringLexer") { - source.set("src/main/grammars/KdlStringLexer.flex") + sourceFile.set(file("src/main/grammars/KdlStringLexer.flex")) targetDir.set("src/genparser/dev/kdl/lang/escape") targetClass.set("KdlStringLexer") purgeOldFiles.set(true) } val generateKdlParser = task("generateKdlParser") { - source.set("src/main/grammars/KdlParser.bnf") + sourceFile.set(file("src/main/grammars/KdlParser.bnf")) targetRoot.set("src/genparser") pathToParser.set("dev/kdl/lang/parser/KdlParser.java") pathToPsiRoot.set("dev/kdl/lang/psi") diff --git a/gradle.properties b/gradle.properties index 3ec97b2..b69d47f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ pluginGroup=dev.kdl pluginName=intellij-kdl -pluginVersion=1.0.1 +pluginVersion=2.0.0 -pluginSinceBuild=213 -pluginUntilBuild=223.* +pluginSinceBuild=223 +pluginUntilBuild=232.* platformType=IC -platformVersion=2021.3.3 +platformVersion=2022.3 -platformPlugins=PsiViewer:213-SNAPSHOT +platformPlugins=PsiViewer:2022.3 gradleVersion=7.5.1 diff --git a/src/main/kotlin/dev/kdl/lang/formatter/KdlBlock.kt b/src/main/kotlin/dev/kdl/lang/formatter/KdlBlock.kt index 5e5d7d4..f40c424 100644 --- a/src/main/kotlin/dev/kdl/lang/formatter/KdlBlock.kt +++ b/src/main/kotlin/dev/kdl/lang/formatter/KdlBlock.kt @@ -8,7 +8,7 @@ import dev.kdl.lang.children import dev.kdl.lang.parser.KdlParserDefinition.Companion.WHITESPACES import dev.kdl.lang.psi.ext.KdlElementTypes.* -class KdlBlock constructor( +class KdlBlock( node: ASTNode, wrap: Wrap?, private val indent: Indent, diff --git a/src/main/kotlin/dev/kdl/lang/highlighter/KdlSyntaxHighlighterLexer.kt b/src/main/kotlin/dev/kdl/lang/highlighter/KdlSyntaxHighlighterLexer.kt index 0d82319..7ea7f5f 100644 --- a/src/main/kotlin/dev/kdl/lang/highlighter/KdlSyntaxHighlighterLexer.kt +++ b/src/main/kotlin/dev/kdl/lang/highlighter/KdlSyntaxHighlighterLexer.kt @@ -1,4 +1,4 @@ -package dev.kdl.lang.highlighter; +package dev.kdl.lang.highlighter import com.intellij.lexer.LayeredLexer import com.intellij.psi.tree.IElementType diff --git a/src/main/kotlin/dev/kdl/lang/psi/KdlElementFactory.kt b/src/main/kotlin/dev/kdl/lang/psi/KdlElementFactory.kt index 909a64d..b4a296c 100644 --- a/src/main/kotlin/dev/kdl/lang/psi/KdlElementFactory.kt +++ b/src/main/kotlin/dev/kdl/lang/psi/KdlElementFactory.kt @@ -23,7 +23,7 @@ object KdlElementFactory { .string!! } - fun createFile(project: Project, text: String): KdlPsiFile { + private fun createFile(project: Project, text: String): KdlPsiFile { return PsiFileFactory.getInstance(project) .createFileFromText("dummy.kdl", KdlFileType, text) as KdlPsiFile }