Skip to content

Commit c14d16b

Browse files
authored
Merge pull request #2184 from Kotlin/air/typo-fixes-2026-10-23
[AIR] Fixed typos, grammar and four copy-pasted grammar KDoc links
2 parents 0ce0c68 + 09869f5 commit c14d16b

14 files changed

Lines changed: 41 additions & 37 deletions

File tree

‎KDOC_GUIDELINES.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ In the future, we want to have nice topic names with backticks
198198
199199
All KDoc-helpers must be `internal` or `private`!
200200

201-
Some of KDoc-helpers can be used both as -snippets and -topics.
201+
Some KDoc-helpers can be used both as snippets and as topics.
202202

203203
### Common KDoc-helpers
204204

@@ -330,13 +330,13 @@ and it should be continued with other methods. Also add a note about the [operat
330330
For example (from the `insert` KDoc):
331331

332332
```
333-
* This function does not immediately insert the new column but instead specify a column to insert and
333+
* This function does not immediately insert the new column but instead specifies a column to insert and
334334
* returns an [InsertClause],
335335
* which serves as an intermediate step.
336336
* The [InsertClause] object provides methods to insert a new column using:
337337
* - [under][InsertClause.under] - inserts a new column under the specified column group.
338338
* - [after][InsertClause.after] - inserts a new column after the specified column.
339-
* - [at][InsertClause.at]- inserts a new column at the specified position.
339+
* - [at][InsertClause.at] - inserts a new column at the specified position.
340340
*
341341
* Each method returns a new [DataFrame] with the inserted column.
342342
*

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
132132
/** [**`Before`**][ColumnsSelectionDsl.allColsBefore] */
133133
public typealias Before = Nothing
134134

135-
/** [**`After`**][ColumnsSelectionDsl.allAfter] */
135+
/** [**`After`**][ColumnsSelectionDsl.allColsAfter] */
136136
public typealias After = Nothing
137137

138138
/** [**`From`**][ColumnsSelectionDsl.allColsFrom] */

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ public interface ColsOfKindColumnsSelectionDsl {
5858
*/
5959
public interface Grammar {
6060

61-
/** [**`colsOfKind`**][ColumnsSelectionDsl.colGroups] */
61+
/** [**`colsOfKind`**][ColumnsSelectionDsl.colsOfKind] */
6262
public typealias PlainDslName = Nothing
6363

64-
/** __`.`__[**`colsOfKind`**][ColumnsSelectionDsl.colGroups] */
64+
/** __`.`__[**`colsOfKind`**][ColumnsSelectionDsl.colsOfKind] */
6565
public typealias ColumnSetName = Nothing
6666

67-
/** __`.`__[**`colsOfKind`**][ColumnsSelectionDsl.colGroups] */
67+
/** __`.`__[**`colsOfKind`**][ColumnsSelectionDsl.colsOfKind] */
6868
public typealias ColumnGroupName = Nothing
6969
}
7070

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ public interface FrameColsColumnsSelectionDsl {
5656
*/
5757
public interface Grammar {
5858

59-
/** [**`frameCols`**][ColumnsSelectionDsl.colGroups] */
59+
/** [**`frameCols`**][ColumnsSelectionDsl.frameCols] */
6060
public typealias PlainDslName = Nothing
6161

62-
/** __`.`__[**`frameCols`**][ColumnsSelectionDsl.colGroups] */
62+
/** __`.`__[**`frameCols`**][ColumnsSelectionDsl.frameCols] */
6363
public typealias ColumnSetName = Nothing
6464

65-
/** __`.`__[**`frameCols`**][ColumnsSelectionDsl.colGroups] */
65+
/** __`.`__[**`frameCols`**][ColumnsSelectionDsl.frameCols] */
6666
public typealias ColumnGroupName = Nothing
6767
}
6868

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ internal interface GatherDocs {
7676
* `\[ `__`.`__[**`cast`**][Gather.cast]**`<T>() `**`]`
7777
*
7878
* {@include [Indent]}
79-
* `\[ `__`.`__[**`notNull`**][Gather.cast]**`() `**`]`
79+
* `\[ `__`.`__[**`notNull`**][Gather.notNull]**`() `**`]`
8080
*
8181
* {@include [Indent]}
8282
* `\[ `__`.`__[**`where`**][Gather.where]**` { `**`filter: `[`RowValueFilter`][RowValueFilter]**` } `**`]`
@@ -251,8 +251,8 @@ public fun <T, C, K, R> Gather<T, C?, K, R>.notNull(): Gather<T, C, K, R> = wher
251251
* ```kotlin
252252
* // Gather `resultA` and `resultB` columns into a single "value" column,
253253
* // with the "series" column containing a key.
254-
* // Assuming `resultA` contains `Double` values and `
255-
* // resultB` contains `List<Double>` values,
254+
* // Assuming `resultA` contains `Double` values
255+
* // and `resultB` contains `List<Double>` values,
256256
* // `explodeLists` will apply only to values from `resultB`,
257257
* // resulting in all gathered values being of type `Double`.
258258
* df.gather { resultA and resultB }

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ import kotlin.reflect.KProperty
3434
// region insert
3535

3636
/**
37-
* This function does not immediately insert the new column but instead specify a column to insert and
37+
* This function does not immediately insert the new column but instead specifies a column to insert and
3838
* returns an [InsertClause],
3939
* which serves as an intermediate step.
4040
* The [InsertClause] object provides methods to insert a new column using:
4141
* - [under][InsertClause.under] - inserts a new column under the specified column group.
4242
* - [after][InsertClause.after] - inserts a new column after the specified column.
43-
* - [at][InsertClause.at]- inserts a new column at the specified position.
43+
* - [at][InsertClause.at] - inserts a new column at the specified position.
4444
*
4545
* Each method returns a new [DataFrame] with the inserted column.
4646
*
@@ -167,14 +167,14 @@ public inline fun <T, reified R> DataFrame<T>.insert(
167167
* An intermediate class used in the [insert] operation.
168168
*
169169
* This class itself does not perform any insertions — it is a transitional step
170-
* before specifying how to insert the selected columns.
170+
* before specifying where to insert the new column.
171171
* It must be followed by one of the inserting methods
172172
* to produce a new [DataFrame] with an inserted column.
173173
*
174174
* Use the following methods to perform the insertion:
175175
* - [under][InsertClause.under] - inserts a new column under the specified column group.
176176
* - [after][InsertClause.after] - inserts a new column after the specified column.
177-
* - [at][InsertClause.at]- inserts a new column at the specified position.
177+
* - [at][InsertClause.at] - inserts a new column at the specified position.
178178
*
179179
* See [Grammar][InsertDocs.Grammar] for more details.
180180
*/

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,26 +283,29 @@ public enum class Infer {
283283
*/
284284
public enum class NullabilityOptions {
285285
/**
286-
* Use only actual data, set [DataColumn.hasNulls] to true if and only if there are null values in the column.
287-
* On empty dataset use False.
286+
* Use only actual data, set [DataColumn.hasNulls] to `true` if and only if there are null values in the column.
287+
* On an empty dataset, use `false`.
288288
*/
289289
Infer,
290290

291291
/**
292-
* Set [DataColumn.hasNulls] to expected value. Throw exception if column should be not nullable but there are null values.
292+
* Set [DataColumn.hasNulls] to the expected value.
293+
* Throws an exception if the column should be not nullable but there are null values.
293294
*/
294295
Checking,
295296

296297
/**
297-
* Set [DataColumn.hasNulls] to expected value by default. Change False to True if column should be not nullable but there are null values.
298+
* Set [DataColumn.hasNulls] to the expected value by default.
299+
* Change `false` to `true` if the column should be not nullable but there are null values.
298300
*/
299301
Widening,
300302
}
301303

302304
public class NullabilityException : Exception()
303305

304306
/**
305-
* @return if column should be marked nullable for current [NullabilityOptions] value with actual [data] and [expectedNulls] per some schema/signature.
307+
* @return whether the column should be marked nullable for the current [NullabilityOptions] value
308+
* with actual [data] and [expectedNulls] per some schema/signature.
306309
* @throws [NullabilityException] for [NullabilityOptions.Checking] if [expectedNulls] is false and [data] contains nulls.
307310
*/
308311
public fun NullabilityOptions.applyNullability(data: List<Any?>, expectedNulls: Boolean): Boolean {

‎dataframe-geo/src/main/kotlin/org/jetbrains/kotlinx/dataframe/geo/geocode/Geocoder.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.locationtech.jts.geom.GeometryFactory
2323
import org.locationtech.jts.io.geojson.GeoJsonReader
2424

2525
/**
26-
* Experimental geo coding utility.
26+
* Experimental geocoding utility.
2727
*/
2828
@Experimental
2929
public object Geocoder {

‎dataframe-geo/src/main/kotlin/org/jetbrains/kotlinx/dataframe/geo/io/read.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import java.net.URL
2222
*
2323
* Each row in the resulting [GeoDataFrame] corresponds to a single
2424
* [`Feature`](https://datatracker.ietf.org/doc/html/rfc7946#section-3.2)
25-
* from the input file :
25+
* from the input file:
2626
* * `"geometry"` value is stored in the `geometry` column.
2727
* * `"properties"` are flattened into individual columns using their keys as column names.
2828
* * `"crs"` is read as `null` if not specified (interpreted as WGS 84 by default).
@@ -31,7 +31,7 @@ import java.net.URL
3131
* > Nested properties are not supported and parsed as [`LinkedHashMap<*, *>`][java.util.LinkedHashMap].
3232
* > According to the specification, the CRS in GeoJSON should be
3333
* > [WGS 84](https://datatracker.ietf.org/doc/html/rfc7946#section-4);
34-
* > deprecated "crs" field is used for now;
34+
* > the deprecated "crs" field is used for now;
3535
* > if it is not present, it is read as `null`.
3636
*/
3737
@ExcludeFromSources

‎dataframe-geo/src/main/kotlin/org/jetbrains/kotlinx/dataframe/geo/io/write.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import kotlin.io.path.outputStream
3030
*
3131
* > According to the specification, the CRS in GeoJSON should be
3232
* > [WGS 84](https://datatracker.ietf.org/doc/html/rfc7946#section-4);
33-
* > deprecated "crs" field [is written for now](https://github.com/Kotlin/dataframe/issues/1187);
33+
* > the deprecated "crs" field [is written for now](https://github.com/Kotlin/dataframe/issues/1187).
3434
*/
3535
@ExcludeFromSources
3636
internal typealias WriteGeoJsonSnippet = Nothing

0 commit comments

Comments
 (0)