Skip to content

[WIP] Update jsoup version #4579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
whyoleg wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −7
Draft

[WIP] Update jsoup version #4579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...alysis-markdown-jb/src/main/kotlin/org/jetbrains/dokka/analysis/markdown/jb/ParseUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.jetbrains.dokka.InternalDokkaApi
import org.jetbrains.dokka.model.doc.DocTag
import org.jetbrains.dokka.model.doc.Text
import org.jsoup.internal.StringUtil
import org.jsoup.nodes.Entities
import org.jsoup.nodes.TextNode

@InternalDokkaApi
public fun String.parseHtmlEncodedWithNormalisedSpaces(
Expand All @@ -21,12 +21,16 @@ public fun String.parseHtmlEncodedWithNormalisedSpaces(
var lastWasWhite = false

forEachCodePoint { c ->
if (renderWhiteCharactersAsSpaces && StringUtil.isWhitespace(c)) {
if (!lastWasWhite) {
accum.append(' ')
lastWasWhite = true
if (StringUtil.isWhitespace(c)) {
if (renderWhiteCharactersAsSpaces) {
if (!lastWasWhite) {
accum.append(' ')
lastWasWhite = true
}
} else {
accum.appendCodePoint(c)
}
} else if (Compat.codePointToString(c).let { it != Entities.escape(it) }) {
} else if (Compat.codePointToString(c).let { it != TextNode(it).toString() }) {
accum.toString().takeIf { it.isNotBlank() }?.let { tags.add(Text(it)) }
accum.delete(0, accum.length)

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ kotlin-compiler-k2 = "2.5.0-dev-3229"
intellij-platform = "261.24374.151"

## HTML
jsoup = "1.16.1"
jsoup = "1.23.1"
freemarker = "2.3.32"
korlibs-template = "4.0.10"
kotlinx-html = "0.9.1"
Expand Down
Loading