Skip to content

fix(compiler-plugin): fix K2 story discovery and update test harness for Kotlin 2.3 #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JSMonk merged 1 commit into from
Oct 12, 2026
Merged

fix(compiler-plugin): fix K2 story discovery and update test harness for Kotlin 2.3 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android-compileSdk = "36"
android-minSdk = "26"
androidx-activityCompose = "1.12.2"
assertj = "3.27.2"
kotlinCompileTesting = "0.11.0"
kotlinCompileTesting = "0.12.1"
junitVersion = "4.13.2"
storytale = "0.0.3+dev8"

Expand Down
8 changes: 3 additions & 5 deletions modules/compiler-plugin/src/kotlin/StorytaleLoweringExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.IrStatement
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.ir.declarations.IrDeclaration
import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.ir.declarations.IrProperty
Expand Down Expand Up @@ -74,7 +73,7 @@ private class AddCodeSnippetToStoriesLowering(context: IrPluginContext) : BodyLo
}

private fun IrDeclaration.getFileSourceCode(): CharSequence? {
return (file.metadata as FirMetadataSource).fir.source.text
return (file.metadata as? FirMetadataSource)?.fir?.source?.text
}
}
}
Expand Down Expand Up @@ -134,11 +133,10 @@ private class MentionAllStoriesGettersInsideMainFunctionLowering(
)
}

// In K2, delegate backing field origin may not be PROPERTY_DELEGATE; match factory type directly
private fun IrProperty.isStory(factoryType: IrType) = isTopLevel &&
isDelegated &&
backingField?.let {
it.origin == IrDeclarationOrigin.PROPERTY_DELEGATE && it.type == factoryType
} ?: false
backingField?.type == factoryType

private fun IrSimpleFunction.isGeneratedMainViewController() = isTopLevel &&
visibility.isPublicAPI &&
Expand Down
Loading