Skip to content

Commit 8990376

Browse files
authored
Merge pull request Kotlin#613 from Kotlin/kdoc-fixes
KDoc fixes for IntelliJ 2024.X
2 parents 195a305 + 175773b commit 8990376

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+5456
-7602
lines changed

core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ val installGitPreCommitHook by tasks.creating(Copy::class) {
185185
} else {
186186
logger.lifecycle("'.git/hooks' directory not found. Skipping installation of pre-commit hook.")
187187
}
188-
189188
}
190189
tasks.named("assemble") {
191190
dependsOn(installGitPreCommitHook)

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt

Lines changed: 140 additions & 183 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt

Lines changed: 63 additions & 427 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt

Lines changed: 1702 additions & 3359 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt

Lines changed: 468 additions & 450 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt

Lines changed: 109 additions & 109 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt

Lines changed: 124 additions & 125 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt

Lines changed: 134 additions & 134 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt

Lines changed: 814 additions & 814 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt

Lines changed: 61 additions & 61 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt

Lines changed: 37 additions & 37 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt

Lines changed: 30 additions & 30 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt

Lines changed: 75 additions & 77 deletions
Large diffs are not rendered by default.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt

Lines changed: 24 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
77
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
88
import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
99
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
10+
import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources
1011
import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
1112
import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet
1213
import kotlin.reflect.KProperty
@@ -30,10 +31,10 @@ public interface ColumnRangeColumnsSelectionDsl {
3031
*     
3132
*
3233
* ### Definitions:
33-
* `column: `[ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[String][String]
34+
* `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]
3435
*
3536
*            
36-
* `| `[KProperty][kotlin.reflect.KProperty]`<*> | `[ColumnPath][org.jetbrains.kotlinx.dataframe.columns.ColumnPath]
37+
* `| `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath]
3738
*
3839
* &nbsp;&nbsp;&nbsp;&nbsp;
3940
*
@@ -42,7 +43,7 @@ public interface ColumnRangeColumnsSelectionDsl {
4243
*
4344
* &nbsp;&nbsp;&nbsp;&nbsp;
4445
*
45-
* [column][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef] [**..**][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.rangeTo] [column][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]
46+
* [`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]` `[**`..`**][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.rangeTo]` `[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]
4647
*
4748
*
4849
*
@@ -61,51 +62,24 @@ public interface ColumnRangeColumnsSelectionDsl {
6162
*/
6263
public interface Grammar {
6364

64-
/** [**..**][ColumnsSelectionDsl.rangeTo] */
65+
/** [**`..`**][ColumnsSelectionDsl.rangeTo] */
6566
public interface PlainDslName
6667
}
6768

68-
/**
69-
* ## Range of Columns
70-
* Creates a [ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
71-
*
72-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
73-
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
74-
*
75-
* ### Check out: [Grammar]
76-
*
77-
* #### For example:
78-
*
79-
* `df.`[select][DataFrame.select]` { `` }`
80-
*
81-
* @param [endInclusive] The last column in the subset.
82-
* @receiver The first column in the subset.
83-
* @return A [ColumnSet] containing all columns from [this] to [endInclusive].
84-
* @throws [IllegalArgumentException] if the columns have different parents or the end column is before the
85-
* start column.
86-
* @see [ColumnsSelectionDsl.allBefore]
87-
* @see [ColumnsSelectionDsl.allAfter]
88-
* @see [ColumnsSelectionDsl.allFrom]
89-
* @see [ColumnsSelectionDsl.allUpTo]
90-
*/
91-
private interface CommonRangeOfColumnsDocs {
92-
93-
/** Examples key */
94-
interface Example
95-
}
69+
9670

9771
/**
9872
* ## Range of Columns
9973
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
10074
*
101-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
75+
* Columns inside column groups are also supported (as long as they share the same direct parent),
10276
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
10377
*
10478
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
10579
*
10680
* #### For example:
10781
*
108-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `"fromColumn"[`..`][String.rangeTo]"toColumn"` }`
82+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`"fromColumn"`[`..`][String.rangeTo]`"toColumn"`</code>` }`
10983
*
11084
* @param [endInclusive] The last column in the subset.
11185
* @receiver The first column in the subset.
@@ -125,14 +99,14 @@ public interface ColumnRangeColumnsSelectionDsl {
12599
* ## Range of Columns
126100
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
127101
*
128-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
102+
* Columns inside column groups are also supported (as long as they share the same direct parent),
129103
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
130104
*
131105
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
132106
*
133107
* #### For example:
134108
*
135-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `"fromColumn"[`..`][String.rangeTo]Type::toColumn` }`
109+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`"fromColumn"`[`..`][String.rangeTo]`Type::toColumn`</code>` }`
136110
*
137111
* @param [endInclusive] The last column in the subset.
138112
* @receiver The first column in the subset.
@@ -152,14 +126,14 @@ public interface ColumnRangeColumnsSelectionDsl {
152126
* ## Range of Columns
153127
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
154128
*
155-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
129+
* Columns inside column groups are also supported (as long as they share the same direct parent),
156130
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
157131
*
158132
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
159133
*
160134
* #### For example:
161135
*
162-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `"fromColumn"[`..`][String.rangeTo]toColumn` }`
136+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`"fromColumn"`[`..`][String.rangeTo]`toColumn`</code>` }`
163137
*
164138
* @param [endInclusive] The last column in the subset.
165139
* @receiver The first column in the subset.
@@ -179,14 +153,14 @@ public interface ColumnRangeColumnsSelectionDsl {
179153
* ## Range of Columns
180154
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
181155
*
182-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
156+
* Columns inside column groups are also supported (as long as they share the same direct parent),
183157
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
184158
*
185159
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
186160
*
187161
* #### For example:
188162
*
189-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `Type::fromColumn[`..`][KProperty.rangeTo]"toColumn"` }`
163+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`Type::fromColumn`[`..`][KProperty.rangeTo]`"toColumn"`</code>` }`
190164
*
191165
* @param [endInclusive] The last column in the subset.
192166
* @receiver The first column in the subset.
@@ -206,14 +180,14 @@ public interface ColumnRangeColumnsSelectionDsl {
206180
* ## Range of Columns
207181
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
208182
*
209-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
183+
* Columns inside column groups are also supported (as long as they share the same direct parent),
210184
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
211185
*
212186
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
213187
*
214188
* #### For example:
215189
*
216-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `Type::fromColumn[`..`][KProperty.rangeTo]Type::toColumn` }`
190+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`Type::fromColumn`[`..`][KProperty.rangeTo]`Type::toColumn`</code>` }`
217191
*
218192
* @param [endInclusive] The last column in the subset.
219193
* @receiver The first column in the subset.
@@ -233,14 +207,14 @@ public interface ColumnRangeColumnsSelectionDsl {
233207
* ## Range of Columns
234208
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
235209
*
236-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
210+
* Columns inside column groups are also supported (as long as they share the same direct parent),
237211
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
238212
*
239213
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
240214
*
241215
* #### For example:
242216
*
243-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `Type::fromColumn[`..`][KProperty.rangeTo]toColumn` }`
217+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`Type::fromColumn`[`..`][KProperty.rangeTo]`toColumn`</code>` }`
244218
*
245219
* @param [endInclusive] The last column in the subset.
246220
* @receiver The first column in the subset.
@@ -260,14 +234,14 @@ public interface ColumnRangeColumnsSelectionDsl {
260234
* ## Range of Columns
261235
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
262236
*
263-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
237+
* Columns inside column groups are also supported (as long as they share the same direct parent),
264238
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
265239
*
266240
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
267241
*
268242
* #### For example:
269243
*
270-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `fromColumn[`..`][ColumnReference.rangeTo]"toColumn"` }`
244+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`fromColumn`[`..`][ColumnReference.rangeTo]`"toColumn"`</code>` }`
271245
*
272246
* @param [endInclusive] The last column in the subset.
273247
* @receiver The first column in the subset.
@@ -287,14 +261,14 @@ public interface ColumnRangeColumnsSelectionDsl {
287261
* ## Range of Columns
288262
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
289263
*
290-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
264+
* Columns inside column groups are also supported (as long as they share the same direct parent),
291265
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
292266
*
293267
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
294268
*
295269
* #### For example:
296270
*
297-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `fromColumn[`..`][ColumnReference.rangeTo]Type::toColumn` }`
271+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`fromColumn`[`..`][ColumnReference.rangeTo]`Type::toColumn`</code>` }`
298272
*
299273
* @param [endInclusive] The last column in the subset.
300274
* @receiver The first column in the subset.
@@ -314,14 +288,14 @@ public interface ColumnRangeColumnsSelectionDsl {
314288
* ## Range of Columns
315289
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
316290
*
317-
* Columns inside of column groups are also supported (as long as they share the same direct parent),
291+
* Columns inside column groups are also supported (as long as they share the same direct parent),
318292
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
319293
*
320294
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
321295
*
322296
* #### For example:
323297
*
324-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `fromColumn[`..`][ColumnReference.rangeTo]toColumn` }`
298+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`fromColumn`[`..`][ColumnReference.rangeTo]`toColumn`</code>` }`
325299
*
326300
* @param [endInclusive] The last column in the subset.
327301
* @receiver The first column in the subset.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public interface DistinctColumnsSelectionDsl {
6666
* &nbsp;&nbsp;&nbsp;&nbsp;
6767
*
6868
* ### Definitions:
69-
* `columnSet: `[ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]`<*>`
69+
* `columnSet: `[`ColumnSet`][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]`<*>`
7070
*
7171
*
7272
*
@@ -77,9 +77,9 @@ public interface DistinctColumnsSelectionDsl {
7777
*
7878
* &nbsp;&nbsp;&nbsp;&nbsp;
7979
*
80-
* [columnSet][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef]
80+
* [`columnSet`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef]
8181
*
82-
* &nbsp;&nbsp;&nbsp;&nbsp;.[**distinct**][org.jetbrains.kotlinx.dataframe.api.DistinctColumnsSelectionDsl.distinct]**`()`**
82+
* &nbsp;&nbsp;&nbsp;&nbsp;__`.`__[**`distinct`**][org.jetbrains.kotlinx.dataframe.api.DistinctColumnsSelectionDsl.distinct]**`()`**
8383
*
8484
*
8585
*
@@ -97,7 +97,7 @@ public interface DistinctColumnsSelectionDsl {
9797
*/
9898
public interface Grammar {
9999

100-
/** .[**distinct**][ColumnsSelectionDsl.distinct] */
100+
/** __`.`__[**`distinct`**][ColumnsSelectionDsl.distinct] */
101101
public interface ColumnSetName
102102
}
103103

@@ -114,7 +114,7 @@ public interface DistinctColumnsSelectionDsl {
114114
* #### For Example:
115115
* `df.`[select][DataFrame.select]` { (`[colsOf][SingleColumn.colsOf]`<`[Int][Int]`>() `[and][ColumnsSelectionDsl.and]` age).`[distinct][ColumnSet.distinct]`() }`
116116
*
117-
* `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[nameStartsWith][ColumnsSelectionDsl.nameStartsWith]`("order").`[distinct][ColumnSet.distinct]`() }`
117+
* `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[nameStartsWith][ColumnsSelectionDsl.nameStartsWith]`("order").`[distinct][ColumnSet.distinct]`() }`
118118
*
119119
* @return A new [ColumnSet] containing only distinct columns (by path).
120120
* @see ColumnsSelectionDsl.named

0 commit comments

Comments
 (0)