Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7d1f2bb
Update IntelliJ to 252.18003.27
rickclephas May 29, 2025
8a65810
Add KtDiagnosticsContainer supertype to diagnostic container
rickclephas May 29, 2025
f344d8f
Delay initialization of diagnostic messages map
rickclephas May 29, 2025
8c951c6
Migrate RemoveAnnotationFix to ModCommand API
rickclephas May 29, 2025
01d94a0
Update API dump for IDEA plugin
rickclephas May 29, 2025
2c47e25
Update GHA workflow for IDEA 2025.2
rickclephas May 29, 2025
ea3608a
Merge branch 'feature/kotlin-2.2.0' into feature/idea-2025.2
rickclephas May 30, 2025
ac452d8
Add IDEA version suffix
rickclephas May 30, 2025
07913da
Merge branch 'feature/kotlin-2.2.0' into feature/idea-2025.2
rickclephas Jun 6, 2025
ac52ac6
Update IntelliJ to 252.19874.12
rickclephas Jun 6, 2025
b9a1d8e
Add IDEA version suffix
rickclephas Jun 6, 2025
62ef5c5
Merge branch 'master' into feature/idea-2025.2
rickclephas Aug 4, 2025
09e1394
Update IntelliJ to 2025.2
rickclephas Aug 4, 2025
2e1e69f
containingDeclarations now stores symbols
rickclephas Jul 16, 2025
c602dca
Add IDEA version suffix
rickclephas Aug 4, 2025
a1d9097
Merge branch 'idea/2025.2' into feature/idea-2025.2
rickclephas Aug 4, 2025
3bc5ead
Merge pull request #218 from rickclephas/feature/idea-2025.2
rickclephas Aug 4, 2025
33ccb62
Merge branch 'master' into feature/idea-2025.3
rickclephas Sep 21, 2025
3dcd9c4
Update IntelliJ Platform Gradle Plugin to 2.9.0
rickclephas Sep 21, 2025
4f97a58
Update IntelliJ to 253.20558.43
rickclephas Sep 21, 2025
47fff7d
IntellijIdeaCommunity and IntellijIdeaUltimate are now IntellijIdea
rickclephas Sep 21, 2025
d9489c5
KT-55300 add pluginId to CompilerPluginRegistrar
rickclephas Sep 21, 2025
c7c6116
Merge branch 'master' into feature/idea-2025.3
rickclephas Sep 21, 2025
90a6dec
Add IDEA version suffix
rickclephas Sep 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/run-idea-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ide: [ IC, IU, AI ]
build: [ 251 ]
ide: [ IU, AI ]
build: [ 252 ]
name: ${{ format('{0}-{1}', matrix.ide, matrix.build) }}
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {

allprojects {
group = "com.rickclephas.kmp"
version = "1.0.0-ALPHA-47"
version = "1.0.0-ALPHA-47-idea-2025.3-EAP-20558.43"
}

apiValidation {
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlin = "2.2.20"
kotlin-idea = "2.2.0-ij251-78"
kotlin-idea = "2.3.0-dev-7984"
kotlinx-coroutines = "1.10.1"
kotlinx-binary-compatibility-validator = "0.16.3"
ksp = "2.2.20-2.0.2"
Expand Down Expand Up @@ -37,7 +37,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa

[plugins]
gradle-plugin-publish = { id = "com.gradle.plugin-publish", version = "1.2.0" }
intellij-platform = { id = "org.jetbrains.intellij.platform", version = "2.6.0" }
intellij-platform = { id = "org.jetbrains.intellij.platform", version = "2.9.0" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-binary-compatibility-validator" }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
@OptIn(ExperimentalCompilerApi::class)
public class KmpNativeCoroutinesCompilerPluginRegistrar: CompilerPluginRegistrar() {

override val pluginId: String = "com.rickclephas.kmp.nativecoroutines"
override val supportsK2: Boolean = true

override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
public final class com/rickclephas/kmp/nativecoroutines/idea/compiler/extensions/KmpNativeCoroutinesCompilerPluginProvider : org/jetbrains/kotlin/idea/fir/extensions/KotlinBundledFirCompilerPluginProvider {
public fun <init> ()V
public fun provideBundledPluginJar (Lcom/intellij/openapi/project/Project;Ljava/nio/file/Path;)Ljava/nio/file/Path;
public fun provideBundledPluginJar (Ljava/nio/file/Path;)Ljava/nio/file/Path;
}

public final class com/rickclephas/kmp/nativecoroutines/idea/compiler/extensions/KmpNativeCoroutinesStorageComponentContainerContributor : org/jetbrains/kotlin/extensions/StorageComponentContainerContributor {
Expand Down
18 changes: 6 additions & 12 deletions kmp-nativecoroutines-idea-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ kotlin {

dependencies {
intellijPlatform {
intellijIdeaCommunity("2025.1")
intellijIdea("253.20558.43")

bundledPlugins("org.jetbrains.kotlin", "com.intellij.gradle")

Expand All @@ -52,8 +52,8 @@ intellijPlatform {
""".trimIndent()

ideaVersion {
sinceBuild = "251"
untilBuild = "251.*"
sinceBuild = "253"
untilBuild = "253.*"
}

vendor {
Expand Down Expand Up @@ -90,8 +90,7 @@ intellijPlatform {
recommended()
select {
types = listOf(
IntelliJPlatformType.IntellijIdeaCommunity,
IntelliJPlatformType.IntellijIdeaUltimate,
IntelliJPlatformType.IntellijIdea,
IntelliJPlatformType.AndroidStudio,
)
}
Expand All @@ -100,17 +99,12 @@ intellijPlatform {
}
}

val runIntelliJCommunity by intellijPlatformTesting.runIde.registering {
type = IntelliJPlatformType.IntellijIdeaCommunity
}

val runIntelliJUltimate by intellijPlatformTesting.runIde.registering {
type = IntelliJPlatformType.IntellijIdeaUltimate
val runIntelliJ by intellijPlatformTesting.runIde.registering {
type = IntelliJPlatformType.IntellijIdea
}

val runAndroidStudio by intellijPlatformTesting.runIde.registering {
type = IntelliJPlatformType.AndroidStudio
version = "2024.3.2.11"
}

tasks.withType(RunIdeTask::class) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ internal class RemoveAnnotationFixFactory(
val diagnosticFactory = diagnosticFactories.firstOrNull { it == diagnostic.factory } ?: return null
val annotationEntry = diagnosticFactory.cast(diagnostic).psiElement as? KtAnnotationEntry ?: return null
val annotationName = annotationEntry.shortName?.identifierOrNullIfSpecial ?: return null
return RemoveAnnotationFix("Remove @$annotationName annotation", annotationEntry)
return RemoveAnnotationFix("Remove @$annotationName annotation", annotationEntry).asIntention()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ internal class RemoveAnnotationFixFactory(
if (diagnosticFactories.none { it.name == diagnostic.factoryName }) return@IntentionBased emptyList()
val annotationEntry = diagnostic.psi as? KtAnnotationEntry ?: return@IntentionBased emptyList()
val annotationName = annotationEntry.shortName?.identifierOrNullIfSpecial ?: return@IntentionBased emptyList()
listOf(RemoveAnnotationFix("Remove @$annotationName annotation", annotationEntry))
listOf(RemoveAnnotationFix("Remove @$annotationName annotation", annotationEntry).asIntention())
}
}
Loading