Skip to content

Commit e942ddb

Browse files
committed
doc processor 0.3.0: updating \-behavior
1 parent 1e88880 commit e942ddb

Some content is hidden

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

65 files changed

+1890
-1896
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/annotations/ImportDataSchema.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public annotation class JsonOptions(
6666
* will be created.
6767
*
6868
* Example:
69-
* `["""$["store"]["book"][*]["author"]"""]`
69+
* `["""[*]["author"]"""]`
7070
*/
7171
public val keyValuePaths: Array<String> = [],
7272
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import java.io.Serializable
88
* Supports just keys (in bracket notation), double quotes, arrays and wildcards.
99
*
1010
* Examples:
11-
* `$["store"]["book"][*]["author"]`
11+
* `[*]["author"]`
1212
*
13-
* `$[1]` will match `$[*]`
13+
* `` will match ``
1414
*/
1515
@JvmInline
1616
public value class JsonPath(@Language("jsonpath") public val path: String = "$") : Serializable {
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package org.jetbrains.kotlinx.dataframe.api;
2+
3+
import kotlin.Unit;
4+
5+
import java.io.File;
6+
7+
public class Submitting {
8+
9+
public boolean sample() {
10+
int number = 1;
11+
File file = new File("file.json");
12+
return FirstKt.submit(number, file, e -> {
13+
System.out.println(e.getMessage());
14+
return Unit.INSTANCE;
15+
});
16+
}
17+
}

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

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

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@ public interface AllExceptColumnsSelectionDsl {
227227
* columns inside the group, 'lifting' them out.
228228
*
229229
* ### Examples for this overload
230-
* {@getArg [ExampleArg]}
231230
*
232-
* {@getArg [ParamArg]}
233-
* @return A [ColumnSet] containing all columns in [this\] except the specified ones.
231+
*
232+
*
233+
* @return A [ColumnSet] containing all columns in [this] except the specified ones.
234234
* @see ColumnsSelectionDsl.select
235235
* @see ColumnsSelectionDsl.all
236236
* @see ColumnsSelectionDsl.allBefore
@@ -324,20 +324,19 @@ public interface AllExceptColumnsSelectionDsl {
324324
* columns inside the group, 'lifting' them out.
325325
*
326326
* ### Examples for this overload
327-
* `df.`[select][ColumnsSelectionDsl.select] `{` [colsOf][ColumnsSelectionDsl.colsOf]`<`[Number][Number]`>() `[except][ColumnSet.except] {@getArg [ArgumentArg1]} `\
327+
* `df.`[select][ColumnsSelectionDsl.select] `{` [colsOf][ColumnsSelectionDsl.colsOf]`<`[Number][Number]`>() `[except][ColumnSet.except] `}`
328+
*
329+
* `df.`[select][ColumnsSelectionDsl.select] `{` [cols][ColumnsSelectionDsl.cols]`(name, age)` [except][ColumnSet.except] `}`
330+
*
328331
*
329-
* {@getArg [ParamArg][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.CommonExceptDocs.ParamArg]}
330332
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns in [this] except the specified ones.
331333
* @see ColumnsSelectionDsl.select
332334
* @see ColumnsSelectionDsl.all
333335
* @see ColumnsSelectionDsl.allBefore
334336
* @see ColumnsSelectionDsl.allAfter
335337
* @see ColumnsSelectionDsl.allUpTo
336338
* @see ColumnsSelectionDsl.allFrom
337-
* `
338339
*
339-
* `df.`[select][ColumnsSelectionDsl.select] `{` [cols][ColumnsSelectionDsl.cols]`(name, age)` [except][ColumnSet.except] {@getArg [ArgumentArg2]} `\\}`
340-
* }
341340
*/
342341
private interface ColumnSetInfixDocs {
343342

@@ -423,20 +422,19 @@ public interface AllExceptColumnsSelectionDsl {
423422
* columns inside the group, 'lifting' them out.
424423
*
425424
* ### Examples for this overload
426-
* `df.`[select][ColumnsSelectionDsl.select] `{` [colsOf][ColumnsSelectionDsl.colsOf]`<`[Number][Number]`>().`[except][ColumnSet.except]{@getArg [ArgumentArg1]} `\
425+
* `df.`[select][ColumnsSelectionDsl.select] `{` [colsOf][ColumnsSelectionDsl.colsOf]`<`[Number][Number]`>().`[except][ColumnSet.except] `}`
426+
*
427+
* `df.`[select][ColumnsSelectionDsl.select] `{` [cols][ColumnsSelectionDsl.cols]`(name, age).`[except][ColumnSet.except] `}`
428+
*
427429
*
428-
* {@getArg [ParamArg][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.CommonExceptDocs.ParamArg]}
429430
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns in [this] except the specified ones.
430431
* @see ColumnsSelectionDsl.select
431432
* @see ColumnsSelectionDsl.all
432433
* @see ColumnsSelectionDsl.allBefore
433434
* @see ColumnsSelectionDsl.allAfter
434435
* @see ColumnsSelectionDsl.allUpTo
435436
* @see ColumnsSelectionDsl.allFrom
436-
* `
437437
*
438-
* `df.`[select][ColumnsSelectionDsl.select] `{` [cols][ColumnsSelectionDsl.cols]`(name, age).`[except][ColumnSet.except]{@getArg [ArgumentArg2]} `\\}`
439-
* }
440438
*/
441439
private interface ColumnSetVarargDocs {
442440

@@ -1363,11 +1361,11 @@ public interface AllExceptColumnsSelectionDsl {
13631361
* columns inside the group, 'lifting' them out.
13641362
*
13651363
* ### Examples for this overload
1366-
* `df.`[select][ColumnsSelectionDsl.select] `{` [allExcept][ColumnsSelectionDsl.allExcept]{@getArg [ArgumentArg1]} `\}`
1364+
* `df.`[select][ColumnsSelectionDsl.select] `{` [allExcept][ColumnsSelectionDsl.allExcept] `}`
1365+
*
1366+
* `df.`[select][ColumnsSelectionDsl.select] `{` [allExcept][ColumnsSelectionDsl.allExcept] `}`
13671367
*
1368-
* `df.`[select][ColumnsSelectionDsl.select] `{` [allExcept][ColumnsSelectionDsl.allExcept]{@getArg [ArgumentArg2]} `\}`
13691368
*
1370-
* {@getArg [ParamArg][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.CommonExceptDocs.ParamArg]}
13711369
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns in [this] except the specified ones.
13721370
* @see ColumnsSelectionDsl.select
13731371
* @see ColumnsSelectionDsl.all
@@ -1925,11 +1923,11 @@ public interface AllExceptColumnsSelectionDsl {
19251923
* columns inside the group, 'lifting' them out.
19261924
*
19271925
* ### Examples for this overload
1928-
* `df.`[select][ColumnsSelectionDsl.select] `{` {@getArg [ReceiverArg1]}[allColsExcept][{@getArg [ReceiverType]}.allColsExcept]{@getArg [ArgumentArg1]} `\}`
1926+
* `df.`[select][ColumnsSelectionDsl.select] `{` [allColsExcept][.allColsExcept] `}`
1927+
*
1928+
* `df.`[select][ColumnsSelectionDsl.select] `{ city` [and][ColumnsSelectionDsl.and] [allColsExcept][.allColsExcept] `}`
19291929
*
1930-
* `df.`[select][ColumnsSelectionDsl.select] `{ city` [and][ColumnsSelectionDsl.and] {@getArg [ReceiverArg2]}[allColsExcept][{@getArg [ReceiverType]}.allColsExcept]{@getArg [ArgumentArg2]} `\}`
19311930
*
1932-
* {@getArg [ParamArg][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.CommonExceptDocs.ParamArg]}
19331931
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns in [this] except the specified ones.
19341932
* @see ColumnsSelectionDsl.select
19351933
* @see ColumnsSelectionDsl.all

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public interface AndColumnsSelectionDsl {
138138
*
139139
* #### Example for this overload:
140140
*
141-
* {@getArg [CommonAndDocs.ExampleArg]}
141+
*
142142
*
143143
* @return A [ColumnSet] that contains all the columns from the [ColumnsResolvers][ColumnsResolver] on the left
144144
* and right side of the [and] operator.
@@ -176,7 +176,7 @@ public interface AndColumnsSelectionDsl {
176176
*
177177
* #### Example for this overload:
178178
*
179-
* `df.`[select][DataFrame.select]` { `[cols][ColumnsSelectionDsl.cols]` { ... } `[and][ColumnsResolver.and] {@getArg [ColumnsResolverAndDocs.Argument]}` }`
179+
* `df.`[select][DataFrame.select]` { `[cols][ColumnsSelectionDsl.cols]` { ... } `[and][ColumnsResolver.and] ` }`
180180
*
181181
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left
182182
* and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator.
@@ -344,7 +344,7 @@ public interface AndColumnsSelectionDsl {
344344
*
345345
* #### Example for this overload:
346346
*
347-
* `df.`[select][DataFrame.select]` { "colA" `[and][String.and] {@getArg [StringAndDocs.Argument]}` }`
347+
* `df.`[select][DataFrame.select]` { "colA" `[and][String.and] ` }`
348348
*
349349
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left
350350
* and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator.
@@ -512,7 +512,7 @@ public interface AndColumnsSelectionDsl {
512512
*
513513
* #### Example for this overload:
514514
*
515-
* `df.`[select][DataFrame.select]` { Type::colA `[and][KProperty.and] {@getArg [KPropertyAndDocs.Argument]}` }`
515+
* `df.`[select][DataFrame.select]` { Type::colA `[and][KProperty.and] ` }`
516516
*
517517
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left
518518
* and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator.

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -152,20 +152,20 @@ public interface ColColumnsSelectionDsl {
152152
*
153153
* #### Examples for this overload:
154154
*
155-
* {@getArg [CommonColDocs.ExampleArg]}
155+
*
156156
*
157157
* To create a [ColumnAccessor] for a specific kind of column with runtime checks, take a look at the functions
158158
* [valueCol][ColumnsSelectionDsl.valueCol],
159159
* [colGroup][ColumnsSelectionDsl.colGroup],
160160
* and [frameCol][ColumnsSelectionDsl.frameCol].
161161
*
162162
* @return A [ColumnAccessor] for the column with the given argument if possible, else a [SingleColumn].
163-
* @throws [IllegalStateException\] if the column with the given argument does not exist.
163+
* @throws [IllegalStateException] if the column with the given argument does not exist.
164164
*
165-
* @see [column\]
166-
* @see [ColumnsSelectionDsl.colGroup\]
167-
* @see [ColumnsSelectionDsl.frameCol\]
168-
* @see [ColumnsSelectionDsl.valueCol\]
165+
* @see [column]
166+
* @see [ColumnsSelectionDsl.colGroup]
167+
* @see [ColumnsSelectionDsl.frameCol]
168+
* @see [ColumnsSelectionDsl.valueCol]
169169
*
170170
*/
171171
private interface CommonColDocs {
@@ -174,14 +174,14 @@ public interface ColColumnsSelectionDsl {
174174
interface ExampleArg
175175

176176
/**
177-
* `df.`[select][DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][col]`({@getArg [CommonColDocs.Arg]}) \\\\}`
177+
* `df.`[select][DataFrame.select]` { `[col][col]`() }`
178178
*/
179179
interface SingleExample
180180

181181
/**
182-
* `df.`[select][DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][col]`({@getArg [CommonColDocs.Arg]}) \\\\}`
182+
* `df.`[select][DataFrame.select]` { `[col][col]`() }`
183183
*
184-
* `df.`[select][DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][col]`<`[String][String]`>({@getArg [CommonColDocs.Arg]}) \\\\}`
184+
* `df.`[select][DataFrame.select]` { `[col][col]`<`[String][String]`>() }`
185185
*/
186186
interface DoubleExample
187187

@@ -228,7 +228,7 @@ public interface ColColumnsSelectionDsl {
228228
*
229229
* #### Examples for this overload:
230230
*
231-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`(columnA) }`
231+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`(columnA) }`
232232
*
233233
* To create a [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] for a specific kind of column with runtime checks, take a look at the functions
234234
* [valueCol][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCol],
@@ -245,8 +245,8 @@ public interface ColColumnsSelectionDsl {
245245
*
246246
*
247247
*
248-
* @param [col\] The [ColumnAccessor] pointing to the column.
249-
* @include [CommonColDocs.ColumnTypeParam]
248+
* @param [col] The [ColumnAccessor] pointing to the column.
249+
* @param [C] The type of the column.
250250
*/
251251
private interface ColReferenceDocs
252252

@@ -593,9 +593,9 @@ public interface ColColumnsSelectionDsl {
593593
*
594594
* #### Examples for this overload:
595595
*
596-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`("columnName") }`
596+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`("columnName") }`
597597
*
598-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`<`[String][String]`>("columnName") }`
598+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`<`[String][String]`>("columnName") }`
599599
*
600600
* To create a [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] for a specific kind of column with runtime checks, take a look at the functions
601601
* [valueCol][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCol],
@@ -612,7 +612,7 @@ public interface ColColumnsSelectionDsl {
612612
*
613613
*
614614
*
615-
* @param [name\] The name of the column.
615+
* @param [name] The name of the column.
616616
*/
617617
private interface ColNameDocs
618618

@@ -1294,9 +1294,9 @@ public interface ColColumnsSelectionDsl {
12941294
*
12951295
* #### Examples for this overload:
12961296
*
1297-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`("pathTo"["columnName"] ) }`
1297+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`("pathTo"["columnName"] ) }`
12981298
*
1299-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`<`[String][String]`>("pathTo"["columnName"] ) }`
1299+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`<`[String][String]`>("pathTo"["columnName"] ) }`
13001300
*
13011301
* To create a [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] for a specific kind of column with runtime checks, take a look at the functions
13021302
* [valueCol][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCol],
@@ -1313,7 +1313,7 @@ public interface ColColumnsSelectionDsl {
13131313
*
13141314
*
13151315
*
1316-
* @param [path\] The path to the column.
1316+
* @param [path] The path to the column.
13171317
*/
13181318
private interface ColPathDocs
13191319

@@ -1993,7 +1993,7 @@ public interface ColColumnsSelectionDsl {
19931993
*
19941994
* #### Examples for this overload:
19951995
*
1996-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`(Type::columnA) }`
1996+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`(Type::columnA) }`
19971997
*
19981998
* To create a [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] for a specific kind of column with runtime checks, take a look at the functions
19991999
* [valueCol][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCol],
@@ -2010,8 +2010,8 @@ public interface ColColumnsSelectionDsl {
20102010
*
20112011
*
20122012
*
2013-
* @param [property\] The [KProperty] reference to the column.
2014-
* @include [CommonColDocs.ColumnTypeParam]
2013+
* @param [property] The [KProperty] reference to the column.
2014+
* @param [C] The type of the column.
20152015
*/
20162016
private interface ColKPropertyDocs
20172017

@@ -2352,9 +2352,9 @@ public interface ColColumnsSelectionDsl {
23522352
*
23532353
* #### Examples for this overload:
23542354
*
2355-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`(0) }`
2355+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`(0) }`
23562356
*
2357-
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { {@getArg [CommonColDocs.ReceiverArg]}`[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`<`[String][String]`>(0) }`
2357+
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[col][org.jetbrains.kotlinx.dataframe.api.ColColumnsSelectionDsl.col]`<`[String][String]`>(0) }`
23582358
*
23592359
* To create a [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] for a specific kind of column with runtime checks, take a look at the functions
23602360
* [valueCol][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCol],
@@ -2371,8 +2371,8 @@ public interface ColColumnsSelectionDsl {
23712371
*
23722372
*
23732373
*
2374-
* @param [index\] The index of the column.
2375-
* @throws [IndexOutOfBoundsException\] if the index is out of bounds.
2374+
* @param [index] The index of the column.
2375+
* @throws [IndexOutOfBoundsException] if the index is out of bounds.
23762376
*/
23772377
private interface ColIndexDocs
23782378

0 commit comments

Comments
 (0)