@@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
7
7
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
8
8
import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
9
9
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
10
+ import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources
10
11
import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
11
12
import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet
12
13
import kotlin.reflect.KProperty
@@ -30,10 +31,10 @@ public interface ColumnRangeColumnsSelectionDsl {
30
31
*
31
32
*
32
33
* ### Definitions:
33
- * `column: `[ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[ String][String]
34
+ * `column: `[` ColumnAccessor` ][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[` String` ][String]
34
35
*
35
36
*
36
- * `| `[KProperty][kotlin.reflect.KProperty]`<*> | `[ColumnPath][org.jetbrains.kotlinx.dataframe.columns.ColumnPath]
37
+ * `| `[` KProperty` ][kotlin.reflect.KProperty]`<*> | `[` ColumnPath` ][org.jetbrains.kotlinx.dataframe.columns.ColumnPath]
37
38
*
38
39
*
39
40
*
@@ -42,7 +43,7 @@ public interface ColumnRangeColumnsSelectionDsl {
42
43
*
43
44
*
44
45
*
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]
46
47
*
47
48
*
48
49
*
@@ -61,51 +62,24 @@ public interface ColumnRangeColumnsSelectionDsl {
61
62
*/
62
63
public interface Grammar {
63
64
64
- /* * [**.. **][ColumnsSelectionDsl.rangeTo] */
65
+ /* * [**`..` **][ColumnsSelectionDsl.rangeTo] */
65
66
public interface PlainDslName
66
67
}
67
68
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
+
96
70
97
71
/* *
98
72
* ## Range of Columns
99
73
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
100
74
*
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),
102
76
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
103
77
*
104
78
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
105
79
*
106
80
* #### For example:
107
81
*
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> ` }`
109
83
*
110
84
* @param [endInclusive] The last column in the subset.
111
85
* @receiver The first column in the subset.
@@ -125,14 +99,14 @@ public interface ColumnRangeColumnsSelectionDsl {
125
99
* ## Range of Columns
126
100
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
127
101
*
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),
129
103
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
130
104
*
131
105
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
132
106
*
133
107
* #### For example:
134
108
*
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> ` }`
136
110
*
137
111
* @param [endInclusive] The last column in the subset.
138
112
* @receiver The first column in the subset.
@@ -152,14 +126,14 @@ public interface ColumnRangeColumnsSelectionDsl {
152
126
* ## Range of Columns
153
127
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
154
128
*
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),
156
130
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
157
131
*
158
132
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
159
133
*
160
134
* #### For example:
161
135
*
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> ` }`
163
137
*
164
138
* @param [endInclusive] The last column in the subset.
165
139
* @receiver The first column in the subset.
@@ -179,14 +153,14 @@ public interface ColumnRangeColumnsSelectionDsl {
179
153
* ## Range of Columns
180
154
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
181
155
*
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),
183
157
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
184
158
*
185
159
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
186
160
*
187
161
* #### For example:
188
162
*
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> ` }`
190
164
*
191
165
* @param [endInclusive] The last column in the subset.
192
166
* @receiver The first column in the subset.
@@ -206,14 +180,14 @@ public interface ColumnRangeColumnsSelectionDsl {
206
180
* ## Range of Columns
207
181
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
208
182
*
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),
210
184
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
211
185
*
212
186
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
213
187
*
214
188
* #### For example:
215
189
*
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> ` }`
217
191
*
218
192
* @param [endInclusive] The last column in the subset.
219
193
* @receiver The first column in the subset.
@@ -233,14 +207,14 @@ public interface ColumnRangeColumnsSelectionDsl {
233
207
* ## Range of Columns
234
208
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
235
209
*
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),
237
211
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
238
212
*
239
213
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
240
214
*
241
215
* #### For example:
242
216
*
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> ` }`
244
218
*
245
219
* @param [endInclusive] The last column in the subset.
246
220
* @receiver The first column in the subset.
@@ -260,14 +234,14 @@ public interface ColumnRangeColumnsSelectionDsl {
260
234
* ## Range of Columns
261
235
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
262
236
*
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),
264
238
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
265
239
*
266
240
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
267
241
*
268
242
* #### For example:
269
243
*
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> ` }`
271
245
*
272
246
* @param [endInclusive] The last column in the subset.
273
247
* @receiver The first column in the subset.
@@ -287,14 +261,14 @@ public interface ColumnRangeColumnsSelectionDsl {
287
261
* ## Range of Columns
288
262
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
289
263
*
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),
291
265
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
292
266
*
293
267
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
294
268
*
295
269
* #### For example:
296
270
*
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> ` }`
298
272
*
299
273
* @param [endInclusive] The last column in the subset.
300
274
* @receiver The first column in the subset.
@@ -314,14 +288,14 @@ public interface ColumnRangeColumnsSelectionDsl {
314
288
* ## Range of Columns
315
289
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
316
290
*
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),
318
292
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
319
293
*
320
294
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
321
295
*
322
296
* #### For example:
323
297
*
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> ` }`
325
299
*
326
300
* @param [endInclusive] The last column in the subset.
327
301
* @receiver The first column in the subset.
0 commit comments