Skip to content

Commit 66ee93a

Browse files
koperagenkoperagen
committed
revert html escape changes
1 parent 64ae5b6 commit 66ee93a

File tree

5 files changed

+89
-50
lines changed

5 files changed

+89
-50
lines changed

‎core/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ tasks.withType<KspTask> {
7171
}
7272
}
7373

74+
tasks.named("lintKotlinMyTest") {
75+
onlyIf { false }
76+
}
77+
7478
val customTest = tasks.register<Test>("customTest") {
7579
group = "Verification"
7680
description = "Runs the custom tests."

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -334,19 +334,12 @@ internal fun String.escapeHTML(): String {
334334
val str = this
335335
return buildString {
336336
for (c in str) {
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-
}
337+
if (c.code > 127 || c == '"' || c == '\'' || c == '<' || c == '>' || c == '&' || c == '\\') {
338+
append("&#")
339+
append(c.code)
340+
append(';')
341+
} else {
342+
append(c)
350343
}
351344
}
352345
}

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/PluginCallback.kt

Lines changed: 47 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.beust.klaxon.JsonObject
44
import org.jetbrains.kotlinx.dataframe.AnyFrame
55
import org.jetbrains.kotlinx.dataframe.api.print
66
import java.io.File
7+
import java.util.concurrent.atomic.AtomicInteger
78
import org.jetbrains.kotlinx.dataframe.AnyCol
89
import org.jetbrains.kotlinx.dataframe.DataFrame
910
import org.jetbrains.kotlinx.dataframe.DataRow
@@ -114,7 +115,7 @@ object PluginCallback {
114115
// val names = mutableListOf<String>()
115116
// val dfs = mutableListOf<String>()
116117

117-
var i = 0
118+
var i = AtomicInteger(0)
118119
val names = mutableMapOf<String, List<String>>()
119120
val expressionsByStatement = mutableMapOf<Int, List<Expression>>()
120121

@@ -130,31 +131,32 @@ object PluginCallback {
130131
}
131132

132133
fun save() {
134+
if (i.get() == 0) return
133135
sessionId = 0
134136
tableInSessionId = 0
135137
var output = DataFrameHtmlData.tableDefinitions() + DataFrameHtmlData(
136138
style = """
137-
body {
138-
font-family: "JetBrains Mono",SFMono-Regular,Consolas,"Liberation Mono",Menlo,Courier,monospace;
139-
}
140-
141-
:root {
142-
color: #19191C;
143-
background-color: #fff;
144-
}
145-
146-
:root[theme="dark"] {
147-
background-color: #19191C;
148-
color: #FFFFFFCC
149-
}
150-
151-
details details {
152-
margin-left: 20px;
153-
}
154-
155-
summary {
156-
padding: 6px;
157-
}
139+
body {
140+
font-family: "JetBrains Mono",SFMono-Regular,Consolas,"Liberation Mono",Menlo,Courier,monospace;
141+
}
142+
143+
:root {
144+
color: #19191C;
145+
background-color: #fff;
146+
}
147+
148+
:root[theme="dark"] {
149+
background-color: #19191C;
150+
color: #FFFFFFCC
151+
}
152+
153+
details details {
154+
margin-left: 20px;
155+
}
156+
157+
summary {
158+
padding: 6px;
159+
}
158160
""".trimIndent()
159161
)
160162

@@ -251,6 +253,7 @@ object PluginCallback {
251253

252254
var action: (String, String, Any, String, String?, String?, String?, Int) -> Unit =
253255
{ source, name, df, id, receiverId, containingClassFqName, containingFunName, statementIndex ->
256+
i.incrementAndGet()
254257
expressionsByStatement.compute(statementIndex) { _, list ->
255258
val element = Expression(source, containingClassFqName, containingFunName, df)
256259
list?.plus(element) ?: listOf(element)
@@ -305,3 +308,25 @@ object PluginCallback {
305308
action(string, name, df, id, receiverId, containingClassFqName, containingFunName, statementIndex)
306309
}
307310
}
311+
312+
internal fun String.escapeHTML(): String {
313+
val str = this
314+
return buildString {
315+
for (c in str) {
316+
when {
317+
c.code > 127 || c == '\'' || c == '\\' -> {
318+
append("&#")
319+
append(c.code)
320+
append(';')
321+
}
322+
c == '<' -> append("&lt;")
323+
c == '>' -> append("&gt;")
324+
c == '"' -> append("&quot;")
325+
c == '&' -> append("&amp;")
326+
else -> {
327+
append(c)
328+
}
329+
}
330+
}
331+
}
332+
}

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -334,19 +334,12 @@ internal fun String.escapeHTML(): String {
334334
val str = this
335335
return buildString {
336336
for (c in str) {
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-
}
337+
if (c.code > 127 || c == '"' || c == '\'' || c == '<' || c == '>' || c == '&' || c == '\\') {
338+
append("&#")
339+
append(c.code)
340+
append(';')
341+
} else {
342+
append(c)
350343
}
351344
}
352345
}

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/PluginCallback.kt

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.beust.klaxon.JsonObject
44
import org.jetbrains.kotlinx.dataframe.AnyFrame
55
import org.jetbrains.kotlinx.dataframe.api.print
66
import java.io.File
7+
import java.util.concurrent.atomic.AtomicInteger
78
import org.jetbrains.kotlinx.dataframe.AnyCol
89
import org.jetbrains.kotlinx.dataframe.DataFrame
910
import org.jetbrains.kotlinx.dataframe.DataRow
@@ -30,7 +31,6 @@ import org.jetbrains.kotlinx.dataframe.api.with
3031
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
3132
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
3233
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
33-
import org.jetbrains.kotlinx.dataframe.io.escapeHTML
3434
import org.jetbrains.kotlinx.dataframe.io.sessionId
3535
import org.jetbrains.kotlinx.dataframe.io.tableInSessionId
3636
import org.jetbrains.kotlinx.dataframe.io.toHTML
@@ -114,7 +114,7 @@ object PluginCallback {
114114
// val names = mutableListOf<String>()
115115
// val dfs = mutableListOf<String>()
116116

117-
var i = 0
117+
var i = AtomicInteger(0)
118118
val names = mutableMapOf<String, List<String>>()
119119
val expressionsByStatement = mutableMapOf<Int, List<Expression>>()
120120

@@ -130,6 +130,7 @@ object PluginCallback {
130130
}
131131

132132
fun save() {
133+
if (i.get() == 0) return
133134
sessionId = 0
134135
tableInSessionId = 0
135136
var output = DataFrameHtmlData.tableDefinitions() + DataFrameHtmlData(
@@ -251,6 +252,7 @@ object PluginCallback {
251252

252253
var action: (String, String, Any, String, String?, String?, String?, Int) -> Unit =
253254
{ source, name, df, id, receiverId, containingClassFqName, containingFunName, statementIndex ->
255+
i.incrementAndGet()
254256
expressionsByStatement.compute(statementIndex) { _, list ->
255257
val element = Expression(source, containingClassFqName, containingFunName, df)
256258
list?.plus(element) ?: listOf(element)
@@ -305,3 +307,25 @@ object PluginCallback {
305307
action(string, name, df, id, receiverId, containingClassFqName, containingFunName, statementIndex)
306308
}
307309
}
310+
311+
internal fun String.escapeHTML(): String {
312+
val str = this
313+
return buildString {
314+
for (c in str) {
315+
when {
316+
c.code > 127 || c == '\'' || c == '\\' -> {
317+
append("&#")
318+
append(c.code)
319+
append(';')
320+
}
321+
c == '<' -> append("&lt;")
322+
c == '>' -> append("&gt;")
323+
c == '"' -> append("&quot;")
324+
c == '&' -> append("&amp;")
325+
else -> {
326+
append(c)
327+
}
328+
}
329+
}
330+
}
331+
}

0 commit comments

Comments
 (0)