Skip to content

Commit 1d80f39

Browse files
committed
Update generated sources with recent changes
1 parent f29da1e commit 1d80f39

File tree

17 files changed

+21
-1555
lines changed

17 files changed

+21
-1555
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/CodeWithConverter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jetbrains.kotlinx.dataframe.codeGen
22

3-
import org.jetbrains.kotlinx.jupyter.api.Code
4-
import org.jetbrains.kotlinx.jupyter.api.VariableName
3+
public typealias Code = String
4+
public typealias VariableName = String
55

66
/**
77
* Class representing generated code declarations for a [Marker].

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ReplCodeGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.jetbrains.dataframe.impl.codeGen
22

33
import org.jetbrains.kotlinx.dataframe.AnyFrame
44
import org.jetbrains.kotlinx.dataframe.AnyRow
5+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
56
import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
67
import org.jetbrains.kotlinx.dataframe.impl.codeGen.ReplCodeGeneratorImpl
7-
import org.jetbrains.kotlinx.jupyter.api.Code
88
import kotlin.reflect.KClass
99
import kotlin.reflect.KProperty
1010

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
1919
import org.jetbrains.kotlinx.dataframe.api.ColumnSelectionDsl
2020
import org.jetbrains.kotlinx.dataframe.api.DataSchemaEnum
2121
import org.jetbrains.kotlinx.dataframe.codeGen.BaseField
22+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
2223
import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
2324
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
2425
import org.jetbrains.kotlinx.dataframe.codeGen.ExtensionsCodeGenerator
@@ -33,7 +34,6 @@ import org.jetbrains.kotlinx.dataframe.codeGen.toNullable
3334
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
3435
import org.jetbrains.kotlinx.dataframe.impl.toSnakeCase
3536
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
36-
import org.jetbrains.kotlinx.jupyter.api.Code
3737

3838
private fun renderNullability(nullable: Boolean) = if (nullable) "?" else ""
3939

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/ReplCodeGeneratorImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
99
import org.jetbrains.kotlinx.dataframe.DataRow
1010
import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
1111
import org.jetbrains.kotlinx.dataframe.api.schema
12+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
1213
import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
1314
import org.jetbrains.kotlinx.dataframe.codeGen.Marker
1415
import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
1516
import org.jetbrains.kotlinx.dataframe.codeGen.MarkersExtractor
1617
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
17-
import org.jetbrains.kotlinx.jupyter.api.Code
1818
import kotlin.reflect.KClass
1919
import kotlin.reflect.KProperty
2020
import kotlin.reflect.KType

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaReader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import org.jetbrains.dataframe.impl.codeGen.CodeGenerator
44
import org.jetbrains.kotlinx.dataframe.AnyFrame
55
import org.jetbrains.kotlinx.dataframe.DataFrame
66
import org.jetbrains.kotlinx.dataframe.api.schema
7+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
78
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
89
import org.jetbrains.kotlinx.dataframe.io.SupportedCodeGenerationFormat
910
import org.jetbrains.kotlinx.dataframe.io.SupportedDataFrameFormat
@@ -12,7 +13,6 @@ import org.jetbrains.kotlinx.dataframe.io.guessFormat
1213
import org.jetbrains.kotlinx.dataframe.io.read
1314
import org.jetbrains.kotlinx.dataframe.io.readCodeForGeneration
1415
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
15-
import org.jetbrains.kotlinx.jupyter.api.Code
1616
import java.net.URL
1717

1818
/**

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/guess.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import org.jetbrains.kotlinx.dataframe.annotations.ImportDataSchema
1111
import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
1212
import org.jetbrains.kotlinx.dataframe.annotations.OptInRefine
1313
import org.jetbrains.kotlinx.dataframe.api.single
14+
import org.jetbrains.kotlinx.dataframe.codeGen.Code
1415
import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
15-
import org.jetbrains.kotlinx.jupyter.api.Code
1616
import java.io.BufferedInputStream
1717
import java.io.File
1818
import java.io.FileNotFoundException

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/CellRenderer.kt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
package org.jetbrains.kotlinx.dataframe.jupyter
22

33
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
4-
import org.jetbrains.kotlinx.dataframe.io.internallyRenderable
54
import org.jetbrains.kotlinx.dataframe.io.renderValueForHtml
65
import org.jetbrains.kotlinx.dataframe.io.tooltipLimit
7-
import org.jetbrains.kotlinx.jupyter.api.MimeTypedResult
8-
import org.jetbrains.kotlinx.jupyter.api.Notebook
9-
import org.jetbrains.kotlinx.jupyter.api.Renderable
10-
import org.jetbrains.kotlinx.jupyter.api.libraries.ExecutionHost
116

127
public data class RenderedContent(
138
val truncatedContent: String,
@@ -68,23 +63,3 @@ public object DefaultCellRenderer : CellRenderer {
6863
return renderValueForHtml(value, tooltipLimit, configuration.decimalFormat).truncatedContent
6964
}
7065
}
71-
72-
internal class JupyterCellRenderer(
73-
private val notebook: Notebook,
74-
private val host: ExecutionHost,
75-
) : ChainedCellRenderer(DefaultCellRenderer) {
76-
override fun maybeContent(value: Any?, configuration: DisplayConfiguration): RenderedContent? {
77-
val renderersProcessor = notebook.renderersProcessor
78-
if (internallyRenderable(value)) return null
79-
val renderedVal = renderersProcessor.renderValue(host, value)
80-
val finalVal = if (renderedVal is Renderable) renderedVal.render(notebook) else renderedVal
81-
if (finalVal is MimeTypedResult && "text/html" in finalVal) return RenderedContent.media(
82-
finalVal["text/html"] ?: ""
83-
)
84-
return renderValueForHtml(finalVal, configuration.cellContentLimit, configuration.decimalFormat)
85-
}
86-
87-
override fun maybeTooltip(value: Any?, configuration: DisplayConfiguration): String? {
88-
return null
89-
}
90-
}

0 commit comments

Comments
 (0)