Skip to content

Commit a44a9ce

Browse files
koperagenkoperagen
authored
Merge pull request #737 from Kotlin/rename-conflicting-declarations
Rename private properties with names matching library classes
2 parents bff6e3c + 22cf9d9 commit a44a9ce

File tree

2 files changed

+52
-52
lines changed

2 files changed

+52
-52
lines changed

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,26 @@ internal interface TypeRenderingStrategy {
107107

108108
internal object FullyQualifiedNames : TypeRenderingStrategy {
109109

110-
private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.qualifiedName!!
111-
private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.qualifiedName!!
112-
private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.qualifiedName!!
113-
private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.qualifiedName!!
114-
private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.qualifiedName!!
110+
private val dataRow = DataRow::class.qualifiedName!!
111+
private val columnsContainer = ColumnsContainer::class.qualifiedName!!
112+
private val dataFrame = DataFrame::class.qualifiedName!!
113+
private val dataColumn = DataColumn::class.qualifiedName!!
114+
private val columnGroup = ColumnGroup::class.qualifiedName!!
115115

116-
override fun renderRowTypeName(markerName: String) = "$DataRow<$markerName>"
116+
override fun renderRowTypeName(markerName: String) = "$dataRow<$markerName>"
117117

118-
override fun renderColumnsContainerTypeName(markerName: String) = "$ColumnsContainer<$markerName>"
118+
override fun renderColumnsContainerTypeName(markerName: String) = "$columnsContainer<$markerName>"
119119

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

125125
is FieldType.GroupFieldType ->
126-
"$ColumnGroup<${fieldType.markerName}>"
126+
"$columnGroup<${fieldType.markerName}>"
127127

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

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

137137
is FieldType.GroupFieldType ->
138-
"$DataRow<${fieldType.markerName}>"
138+
"$dataRow<${fieldType.markerName}>"
139139

140140
is FieldType.FrameFieldType ->
141-
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
141+
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
142142
}
143143

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

152152
is FieldType.FrameFieldType ->
153-
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
153+
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
154154
}
155155
}
156156

157157
internal object ShortNames : TypeRenderingStrategy {
158158

159-
private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.simpleName!!
160-
private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.simpleName!!
161-
private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.simpleName!!
162-
private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.simpleName!!
163-
private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.simpleName!!
159+
private val dataRow = DataRow::class.simpleName!!
160+
private val columnsContainer = ColumnsContainer::class.simpleName!!
161+
private val dataFrame = DataFrame::class.simpleName!!
162+
private val dataColumn = DataColumn::class.simpleName!!
163+
private val columnGroup = ColumnGroup::class.simpleName!!
164164

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

167167
override fun renderColumnsContainerTypeName(markerName: String): String =
168-
"$ColumnsContainer<${markerName.shorten()}>"
168+
"$columnsContainer<${markerName.shorten()}>"
169169

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

175175
is FieldType.GroupFieldType ->
176-
"$ColumnGroup<${fieldType.markerName}>"
176+
"$columnGroup<${fieldType.markerName}>"
177177

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

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

187187
is FieldType.GroupFieldType ->
188-
"$DataRow<${fieldType.markerName}>"
188+
"$dataRow<${fieldType.markerName}>"
189189

190190
is FieldType.FrameFieldType ->
191-
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
191+
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
192192
}
193193

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

202202
is FieldType.FrameFieldType ->
203-
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
203+
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
204204
}
205205

206206
private fun String.shorten() = removeRedundantQualifier(this)

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,26 @@ internal interface TypeRenderingStrategy {
107107

108108
internal object FullyQualifiedNames : TypeRenderingStrategy {
109109

110-
private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.qualifiedName!!
111-
private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.qualifiedName!!
112-
private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.qualifiedName!!
113-
private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.qualifiedName!!
114-
private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.qualifiedName!!
110+
private val dataRow = DataRow::class.qualifiedName!!
111+
private val columnsContainer = ColumnsContainer::class.qualifiedName!!
112+
private val dataFrame = DataFrame::class.qualifiedName!!
113+
private val dataColumn = DataColumn::class.qualifiedName!!
114+
private val columnGroup = ColumnGroup::class.qualifiedName!!
115115

116-
override fun renderRowTypeName(markerName: String) = "$DataRow<$markerName>"
116+
override fun renderRowTypeName(markerName: String) = "$dataRow<$markerName>"
117117

118-
override fun renderColumnsContainerTypeName(markerName: String) = "$ColumnsContainer<$markerName>"
118+
override fun renderColumnsContainerTypeName(markerName: String) = "$columnsContainer<$markerName>"
119119

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

125125
is FieldType.GroupFieldType ->
126-
"$ColumnGroup<${fieldType.markerName}>"
126+
"$columnGroup<${fieldType.markerName}>"
127127

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

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

137137
is FieldType.GroupFieldType ->
138-
"$DataRow<${fieldType.markerName}>"
138+
"$dataRow<${fieldType.markerName}>"
139139

140140
is FieldType.FrameFieldType ->
141-
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
141+
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
142142
}
143143

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

152152
is FieldType.FrameFieldType ->
153-
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
153+
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
154154
}
155155
}
156156

157157
internal object ShortNames : TypeRenderingStrategy {
158158

159-
private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.simpleName!!
160-
private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.simpleName!!
161-
private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.simpleName!!
162-
private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.simpleName!!
163-
private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.simpleName!!
159+
private val dataRow = DataRow::class.simpleName!!
160+
private val columnsContainer = ColumnsContainer::class.simpleName!!
161+
private val dataFrame = DataFrame::class.simpleName!!
162+
private val dataColumn = DataColumn::class.simpleName!!
163+
private val columnGroup = ColumnGroup::class.simpleName!!
164164

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

167167
override fun renderColumnsContainerTypeName(markerName: String): String =
168-
"$ColumnsContainer<${markerName.shorten()}>"
168+
"$columnsContainer<${markerName.shorten()}>"
169169

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

175175
is FieldType.GroupFieldType ->
176-
"$ColumnGroup<${fieldType.markerName}>"
176+
"$columnGroup<${fieldType.markerName}>"
177177

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

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

187187
is FieldType.GroupFieldType ->
188-
"$DataRow<${fieldType.markerName}>"
188+
"$dataRow<${fieldType.markerName}>"
189189

190190
is FieldType.FrameFieldType ->
191-
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
191+
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
192192
}
193193

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

202202
is FieldType.FrameFieldType ->
203-
"$DataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
203+
"$dataFrame<${fieldType.markerName}>${renderNullability(fieldType.nullable)}"
204204
}
205205

206206
private fun String.shorten() = removeRedundantQualifier(this)

0 commit comments

Comments
 (0)