Skip to content

KTNB-1041: Fix resource loading #1250

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
merged 2 commits into from
Jun 12, 2025
Merged

KTNB-1041: Fix resource loading #1250

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
452e926
KTNB-1041: Fix resource loading
ileasile Jun 12, 2025
4b54e93
KTNB-1041: Better diagnostic message
ileasile Jun 12, 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
9 changes: 8 additions & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,14 @@ internal val formatter = DataFrameFormatter(
internal fun getResources(vararg resource: String) = resource.joinToString(separator = "\n") { getResourceText(it) }

internal fun getResourceText(resource: String, vararg replacement: Pair<String, Any>): String {
val res = DataFrame::class.java.getResourceAsStream(resource) ?: error("Resource '$resource' not found")
/**
* The choice of loader is crucial here: it should always be a class loaded by the same class loader as the resource we load.
* I.e. [DataFrame] isn't a good fit because it might be loaded by Kotlin IDEA plugin (because Kotlin plugin
* loads DataFrame compiler plugin), and plugin's classloader knows nothing about the resources.
*/
val loader = HtmlContent::class.java
val res = loader.getResourceAsStream(resource)
?: error("Resource '$resource' not found. Load was attempted by $loader, loaded by ${loader.classLoader}")
var template = InputStreamReader(res).readText()
replacement.forEach {
template = template.replace(it.first, it.second.toString())
Expand Down