Skip to content

Commit f26a8c1

Browse files
koperagenkoperagen
committed
fix escaping
1 parent 00642ed commit f26a8c1

File tree

28 files changed

+84
-70
lines changed

28 files changed

+84
-70
lines changed

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,19 @@ internal fun String.escapeHTML(): String {
334334
val str = this
335335
return buildString {
336336
for (c in str) {
337-
if (c.code > 127 || c == '"' || c == '\'' || c == '<' || c == '>' || c == '&' || c == '\\') {
338-
append("&#")
339-
append(c.code)
340-
append(';')
341-
} else {
342-
append(c)
337+
when {
338+
c.code > 127 || c == '\'' || c == '\\' -> {
339+
append("&#")
340+
append(c.code)
341+
append(';')
342+
}
343+
c == '<' -> append("&lt;")
344+
c == '>' -> append("&gt;")
345+
c == '"' -> append("&quot;")
346+
c == '&' -> append("&amp;")
347+
else -> {
348+
append(c)
349+
}
343350
}
344351
}
345352
}

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,19 @@ internal fun String.escapeHTML(): String {
334334
val str = this
335335
return buildString {
336336
for (c in str) {
337-
if (c.code > 127 || c == '"' || c == '\'' || c == '<' || c == '>' || c == '&' || c == '\\') {
338-
append("&#")
339-
append(c.code)
340-
append(';')
341-
} else {
342-
append(c)
337+
when {
338+
c.code > 127 || c == '\'' || c == '\\' -> {
339+
append("&#")
340+
append(c.code)
341+
append(';')
342+
}
343+
c == '<' -> append("&lt;")
344+
c == '>' -> append("&gt;")
345+
c == '"' -> append("&quot;")
346+
c == '&' -> append("&amp;")
347+
else -> {
348+
append(c)
349+
}
343350
}
344351
}
345352
}

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectors.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
</details>
281281
<br>
282282
<details>
283-
<summary>df.select { name named &#34;Full Name&#34; }</summary>
283+
<summary>df.select { name named &quot;Full Name&quot; }</summary>
284284

285285
<details>
286286
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274

275275

276276
<details>
277-
<summary>df.add { &#34;year&#34; from { 0 } }</summary>
277+
<summary>df.add { &quot;year&quot; from { 0 } }</summary>
278278

279279
<details>
280280
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
@@ -291,7 +291,7 @@
291291
</details>
292292
<br>
293293
<details>
294-
<summary>df.select { cols { it.name().startsWith(&#34;year&#34;) } }</summary>
294+
<summary>df.select { cols { it.name().startsWith(&quot;year&quot;) } }</summary>
295295

296296
<details>
297297
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -308,7 +308,7 @@
308308
</details>
309309
<br>
310310
<details>
311-
<summary>df.select { startsWith(&#34;year&#34;) }</summary>
311+
<summary>df.select { startsWith(&quot;year&quot;) }</summary>
312312

313313
<details>
314314
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -325,7 +325,7 @@
325325
</details>
326326
<br>
327327
<details>
328-
<summary>df.select { colsOf&#60;String&#62;() }</summary>
328+
<summary>df.select { colsOf&lt;String&gt;() }</summary>
329329

330330
<details>
331331
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -342,7 +342,7 @@
342342
</details>
343343
<br>
344344
<details>
345-
<summary>df.select { colsOf&#60;String?&#62; { it.countDistinct() &#62; 5 } }</summary>
345+
<summary>df.select { colsOf&lt;String?&gt; { it.countDistinct() &gt; 5 } }</summary>
346346

347347
<details>
348348
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -444,7 +444,7 @@
444444
</details>
445445
<br>
446446
<details>
447-
<summary>df.select { first { it.name.startsWith(&#34;year&#34;) } }</summary>
447+
<summary>df.select { first { it.name.startsWith(&quot;year&quot;) } }</summary>
448448

449449
<details>
450450
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -462,7 +462,7 @@
462462
<br>
463463
<details>
464464
<summary>df.select {
465-
colGroup(&#34;name&#34;).last { it.name().endsWith(&#34;Name&#34;) }
465+
colGroup(&quot;name&quot;).last { it.name().endsWith(&quot;Name&quot;) }
466466
}</summary>
467467

468468
<details>
@@ -481,7 +481,7 @@
481481
<br>
482482
<details>
483483
<summary>df.select {
484-
Person::name.single { it.name().startsWith(&#34;first&#34;) }
484+
Person::name.single { it.name().startsWith(&quot;first&quot;) }
485485
}</summary>
486486

487487
<details>
@@ -533,7 +533,7 @@
533533
</details>
534534
<br>
535535
<details>
536-
<summary>df.select { dfs { it.name().contains(&#34;:&#34;) } }</summary>
536+
<summary>df.select { dfs { it.name().contains(&quot;:&quot;) } }</summary>
537537

538538
<details>
539539
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -550,7 +550,7 @@
550550
</details>
551551
<br>
552552
<details>
553-
<summary>df.select { dfsOf&#60;String&#62;() }</summary>
553+
<summary>df.select { dfsOf&lt;String&gt;() }</summary>
554554

555555
<details>
556556
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -567,7 +567,7 @@
567567
</details>
568568
<br>
569569
<details>
570-
<summary>df.select { except { colsOf&#60;String&#62;() } }</summary>
570+
<summary>df.select { except { colsOf&lt;String&gt;() } }</summary>
571571

572572
<details>
573573
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsModifySet.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
</details>
283283
<br>
284284
<details>
285-
<summary>df.select { allDfs().filter { it.name().startsWith(&#34;year&#34;) } }</summary>
285+
<summary>df.select { allDfs().filter { it.name().startsWith(&quot;year&quot;) } }</summary>
286286

287287
<details>
288288
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
@@ -316,7 +316,7 @@
316316
</details>
317317
<br>
318318
<details>
319-
<summary>df.select { (colsOf&#60;Int&#62;() and age).distinct() }</summary>
319+
<summary>df.select { (colsOf&lt;Int&gt;() and age).distinct() }</summary>
320320

321321
<details>
322322
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsUsages.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
</details>
238238
<br>
239239
<details>
240-
<summary>df.fillNaNs { dfsOf&#60;Double&#62;() }.withZero()</summary>
240+
<summary>df.fillNaNs { dfsOf&lt;Double&gt;() }.withZero()</summary>
241241

242242
<details>
243243
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
@@ -277,7 +277,7 @@
277277
</details>
278278
<br>
279279
<details>
280-
<summary>df.into { &#34;nameless&#34; }</summary>
280+
<summary>df.into { &quot;nameless&quot; }</summary>
281281

282282
<details>
283283
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
@@ -317,7 +317,7 @@
317317
</details>
318318
<br>
319319
<details>
320-
<summary>df.gather { colsOf&#60;Number&#62;() }.into(&#34;key&#34;, &#34;value&#34;)</summary>
320+
<summary>df.gather { colsOf&lt;Number&gt;() }.into(&quot;key&quot;, &quot;value&quot;)</summary>
321321

322322
<details>
323323
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.xs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189

190190

191191
<details>
192-
<summary>df.xs(&#34;Charlie&#34;, &#34;Chaplin&#34;)</summary>
192+
<summary>df.xs(&quot;Charlie&quot;, &quot;Chaplin&quot;)</summary>
193193

194194
<details>
195195
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
@@ -206,7 +206,7 @@
206206
</details>
207207
<br>
208208
<details>
209-
<summary>df.xs(&#34;Moscow&#34;, true) { city and isHappy }</summary>
209+
<summary>df.xs(&quot;Moscow&quot;, true) { city and isHappy }</summary>
210210

211211
<details>
212212
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Analyze.columnsFor.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204

205205

206206
<details>
207-
<summary>df.minFor { colsOf&#60;Int&#62;() }</summary>
207+
<summary>df.minFor { colsOf&lt;Int&gt;() }</summary>
208208

209209
<details>
210210
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Analyze.countAggregation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
</details>
226226
<br>
227227
<details>
228-
<summary>df.pivot { city }.count { age &#62; 18 }</summary>
228+
<summary>df.pivot { city }.count { age &gt; 18 }</summary>
229229

230230
<details>
231231
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Analyze.groupBy.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
</details>
234234
<br>
235235
<details>
236-
<summary>df.groupBy { age / 10 named &#34;ageDecade&#34; }</summary>
236+
<summary>df.groupBy { age / 10 named &quot;ageDecade&quot; }</summary>
237237

238238
<details>
239239
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
@@ -250,7 +250,7 @@
250250
</details>
251251
<br>
252252
<details>
253-
<summary>df.groupBy { expr { name.firstName.length + name.lastName.length } named &#34;nameLength&#34; }</summary>
253+
<summary>df.groupBy { expr { name.firstName.length + name.lastName.length } named &quot;nameLength&quot; }</summary>
254254

255255
<details>
256256
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>

0 commit comments

Comments
 (0)