Skip to content

Rename private properties with names matching library classes #737

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 1 commit into from
Jun 18, 2024
Merged

Rename private properties with names matching library classes #737

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
52 changes: 26 additions & 26 deletions ...sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,26 +107,26 @@ internal interface TypeRenderingStrategy {

internal object FullyQualifiedNames : TypeRenderingStrategy {

private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.qualifiedName!!
private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.qualifiedName!!
private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.qualifiedName!!
private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.qualifiedName!!
private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.qualifiedName!!
private val dataRow = DataRow::class.qualifiedName!!
private val columnsContainer = ColumnsContainer::class.qualifiedName!!
private val dataFrame = DataFrame::class.qualifiedName!!
private val dataColumn = DataColumn::class.qualifiedName!!
private val columnGroup = ColumnGroup::class.qualifiedName!!

override fun renderRowTypeName(markerName: String) = "$DataRow<$markerName>"
override fun renderRowTypeName(markerName: String) = "$dataRow<$markerName>"

override fun renderColumnsContainerTypeName(markerName: String) = "$ColumnsContainer<$markerName>"
override fun renderColumnsContainerTypeName(markerName: String) = "$columnsContainer<$markerName>"

override fun BaseField.renderColumnType(): Code =
when (val fieldType = fieldType) {
is FieldType.ValueFieldType ->
"$DataColumn<${fieldType.typeFqName}>"
"$dataColumn<${fieldType.typeFqName}>"

is FieldType.GroupFieldType ->
"$ColumnGroup<${fieldType.markerName}>"
"$columnGroup<${fieldType.markerName}>"

is FieldType.FrameFieldType ->
"$DataColumn<$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}>"
"$dataColumn<$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}>"
}

override fun BaseField.renderAccessorFieldType(): Code =
Expand All @@ -135,10 +135,10 @@ internal object FullyQualifiedNames : TypeRenderingStrategy {
fieldType.typeFqName

is FieldType.GroupFieldType ->
"$DataRow<${fieldType.markerName}>"
"$dataRow<${fieldType.markerName}>"

is FieldType.FrameFieldType ->
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
}

override fun BaseField.renderFieldType(): Code =
Expand All @@ -150,33 +150,33 @@ internal object FullyQualifiedNames : TypeRenderingStrategy {
fieldType.markerName

is FieldType.FrameFieldType ->
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
}
}

internal object ShortNames : TypeRenderingStrategy {

private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.simpleName!!
private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.simpleName!!
private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.simpleName!!
private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.simpleName!!
private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.simpleName!!
private val dataRow = DataRow::class.simpleName!!
private val columnsContainer = ColumnsContainer::class.simpleName!!
private val dataFrame = DataFrame::class.simpleName!!
private val dataColumn = DataColumn::class.simpleName!!
private val columnGroup = ColumnGroup::class.simpleName!!

override fun renderRowTypeName(markerName: String): String = "$DataRow<${markerName.shorten()}>"
override fun renderRowTypeName(markerName: String): String = "$dataRow<${markerName.shorten()}>"

override fun renderColumnsContainerTypeName(markerName: String): String =
"$ColumnsContainer<${markerName.shorten()}>"
"$columnsContainer<${markerName.shorten()}>"

override fun BaseField.renderColumnType(): Code =
when (val fieldType = fieldType) {
is FieldType.ValueFieldType ->
"$DataColumn<${fieldType.typeFqName.shorten()}>"
"$dataColumn<${fieldType.typeFqName.shorten()}>"

is FieldType.GroupFieldType ->
"$ColumnGroup<${fieldType.markerName}>"
"$columnGroup<${fieldType.markerName}>"

is FieldType.FrameFieldType ->
"$DataColumn<$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}>"
"$dataColumn<$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}>"
}

override fun BaseField.renderAccessorFieldType(): Code =
Expand All @@ -185,10 +185,10 @@ internal object ShortNames : TypeRenderingStrategy {
fieldType.typeFqName.shorten()

is FieldType.GroupFieldType ->
"$DataRow<${fieldType.markerName}>"
"$dataRow<${fieldType.markerName}>"

is FieldType.FrameFieldType ->
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
}

override fun BaseField.renderFieldType(): Code =
Expand All @@ -200,7 +200,7 @@ internal object ShortNames : TypeRenderingStrategy {
fieldType.markerName

is FieldType.FrameFieldType ->
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
}

private fun String.shorten() = removeRedundantQualifier(this)
Expand Down
52 changes: 26 additions & 26 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,26 +107,26 @@ internal interface TypeRenderingStrategy {

internal object FullyQualifiedNames : TypeRenderingStrategy {

private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.qualifiedName!!
private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.qualifiedName!!
private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.qualifiedName!!
private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.qualifiedName!!
private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.qualifiedName!!
private val dataRow = DataRow::class.qualifiedName!!
private val columnsContainer = ColumnsContainer::class.qualifiedName!!
private val dataFrame = DataFrame::class.qualifiedName!!
private val dataColumn = DataColumn::class.qualifiedName!!
private val columnGroup = ColumnGroup::class.qualifiedName!!

override fun renderRowTypeName(markerName: String) = "$DataRow<$markerName>"
override fun renderRowTypeName(markerName: String) = "$dataRow<$markerName>"

override fun renderColumnsContainerTypeName(markerName: String) = "$ColumnsContainer<$markerName>"
override fun renderColumnsContainerTypeName(markerName: String) = "$columnsContainer<$markerName>"

override fun BaseField.renderColumnType(): Code =
when (val fieldType = fieldType) {
is FieldType.ValueFieldType ->
"$DataColumn<${fieldType.typeFqName}>"
"$dataColumn<${fieldType.typeFqName}>"

is FieldType.GroupFieldType ->
"$ColumnGroup<${fieldType.markerName}>"
"$columnGroup<${fieldType.markerName}>"

is FieldType.FrameFieldType ->
"$DataColumn<$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}>"
"$dataColumn<$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}>"
}

override fun BaseField.renderAccessorFieldType(): Code =
Expand All @@ -135,10 +135,10 @@ internal object FullyQualifiedNames : TypeRenderingStrategy {
fieldType.typeFqName

is FieldType.GroupFieldType ->
"$DataRow<${fieldType.markerName}>"
"$dataRow<${fieldType.markerName}>"

is FieldType.FrameFieldType ->
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
}

override fun BaseField.renderFieldType(): Code =
Expand All @@ -150,33 +150,33 @@ internal object FullyQualifiedNames : TypeRenderingStrategy {
fieldType.markerName

is FieldType.FrameFieldType ->
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
}
}

internal object ShortNames : TypeRenderingStrategy {

private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.simpleName!!
private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.simpleName!!
private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.simpleName!!
private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.simpleName!!
private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.simpleName!!
private val dataRow = DataRow::class.simpleName!!
private val columnsContainer = ColumnsContainer::class.simpleName!!
private val dataFrame = DataFrame::class.simpleName!!
private val dataColumn = DataColumn::class.simpleName!!
private val columnGroup = ColumnGroup::class.simpleName!!

override fun renderRowTypeName(markerName: String): String = "$DataRow<${markerName.shorten()}>"
override fun renderRowTypeName(markerName: String): String = "$dataRow<${markerName.shorten()}>"

override fun renderColumnsContainerTypeName(markerName: String): String =
"$ColumnsContainer<${markerName.shorten()}>"
"$columnsContainer<${markerName.shorten()}>"

override fun BaseField.renderColumnType(): Code =
when (val fieldType = fieldType) {
is FieldType.ValueFieldType ->
"$DataColumn<${fieldType.typeFqName.shorten()}>"
"$dataColumn<${fieldType.typeFqName.shorten()}>"

is FieldType.GroupFieldType ->
"$ColumnGroup<${fieldType.markerName}>"
"$columnGroup<${fieldType.markerName}>"

is FieldType.FrameFieldType ->
"$DataColumn<$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}>"
"$dataColumn<$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}>"
}

override fun BaseField.renderAccessorFieldType(): Code =
Expand All @@ -185,10 +185,10 @@ internal object ShortNames : TypeRenderingStrategy {
fieldType.typeFqName.shorten()

is FieldType.GroupFieldType ->
"$DataRow<${fieldType.markerName}>"
"$dataRow<${fieldType.markerName}>"

is FieldType.FrameFieldType ->
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
}

override fun BaseField.renderFieldType(): Code =
Expand All @@ -200,7 +200,7 @@ internal object ShortNames : TypeRenderingStrategy {
fieldType.markerName

is FieldType.FrameFieldType ->
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
}

private fun String.shorten() = removeRedundantQualifier(this)
Expand Down