Skip to content

Commit ada2c60

Browse files
authored
Merge pull request #861 from Kotlin/readJsonStr-annotation
Add Language annotations for better IDE experience
2 parents 6dee961 + 115e5f3 commit ada2c60

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jetbrains.kotlinx.dataframe.api
22

3+
import org.intellij.lang.annotations.Language
34
import org.jetbrains.kotlinx.dataframe.AnyFrame
45
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
56
import org.jetbrains.kotlinx.dataframe.DataColumn
@@ -111,7 +112,9 @@ internal fun <T, C, R> Split<T, C>.by(
111112

112113
// region match
113114

114-
public fun <T, C : String?> Split<T, C>.match(regex: String): SplitWithTransform<T, C, String?> = match(regex.toRegex())
115+
public fun <T, C : String?> Split<T, C>.match(
116+
@Language("RegExp") regex: String,
117+
): SplitWithTransform<T, C, String?> = match(regex.toRegex())
115118

116119
public fun <T, C : String?> Split<T, C>.match(regex: Regex): SplitWithTransform<T, C, String?> =
117120
by {

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import kotlinx.serialization.ExperimentalSerializationApi
44
import kotlinx.serialization.json.Json
55
import kotlinx.serialization.json.JsonElement
66
import kotlinx.serialization.json.decodeFromStream
7+
import org.intellij.lang.annotations.Language
78
import org.jetbrains.kotlinx.dataframe.AnyFrame
89
import org.jetbrains.kotlinx.dataframe.AnyRow
910
import org.jetbrains.kotlinx.dataframe.DataFrame
@@ -254,7 +255,7 @@ public fun DataRow.Companion.readJson(
254255
@Refine
255256
@Interpretable("ReadJsonStr")
256257
public fun DataFrame.Companion.readJsonStr(
257-
text: String,
258+
@Language("json") text: String,
258259
header: List<String> = emptyList(),
259260
keyValuePaths: List<JsonPath> = emptyList(),
260261
typeClashTactic: TypeClashTactic = ARRAY_AND_VALUE_COLUMNS,
@@ -269,7 +270,7 @@ public fun DataFrame.Companion.readJsonStr(
269270
* @return [DataRow] from the given [text].
270271
*/
271272
public fun DataRow.Companion.readJsonStr(
272-
text: String,
273+
@Language("json") text: String,
273274
header: List<String> = emptyList(),
274275
keyValuePaths: List<JsonPath> = emptyList(),
275276
typeClashTactic: TypeClashTactic = ARRAY_AND_VALUE_COLUMNS,

0 commit comments

Comments
 (0)