From 13a29541f371881ec21aed5db93db6f8f23bbc04 Mon Sep 17 00:00:00 2001 From: Ekaterina Berezhko Date: Fri, 24 May 2024 15:17:43 +0300 Subject: [PATCH 1/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b891588..36459ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # intellij-markdown Changelog ## [Unreleased] +- Removed fastutil dependency ## [0.7.2] - Fixed handling of html entities inside mathematical expressions From 3b7ac58b5e8a2e3ab19c335aa9dd595aebe943f2 Mon Sep 17 00:00:00 2001 From: Ekaterina Berezhko Date: Fri, 24 May 2024 15:18:12 +0300 Subject: [PATCH 2/4] Bump version to 0.7.3 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36459ca..9922dea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # intellij-markdown Changelog ## [Unreleased] + +## [0.7.3] - Removed fastutil dependency ## [0.7.2] diff --git a/gradle.properties b/gradle.properties index 05d210e..25a51ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=0.7.2 +version=0.7.3 snapshot=true publication_channels=maven-central-snapshot From f351aa2fb3de2aad6c4714ea6f610ab04c6299d6 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Tue, 9 Apr 2024 20:10:10 +0200 Subject: [PATCH 3/4] Bump Kotlin version to 2.0.0 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index f7fd73c..7d59f0d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,7 +4,7 @@ include(":docs") pluginManagement { plugins { - kotlin("multiplatform") version "1.9.22" apply false + kotlin("multiplatform") version "2.0.0" apply false id("org.jetbrains.dokka") version "1.8.20" apply false } } From 10fdb5a886c0d3cfecdc9c43e0da7ac2e942cdf1 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Fri, 24 May 2024 15:01:07 +0200 Subject: [PATCH 4/4] Remove `IntStack` because it became redundant It's always actualized by `Stack` --- .../org/intellij/markdown/flavours/gfm/lexer/_GFMLexer.kt | 3 ++- .../org/intellij/markdown/flavours/space/lexer/_SFMLexer.kt | 4 ++-- .../kotlin/org/intellij/markdown/html/CommonDefs.kt | 6 ------ src/jsMain/kotlin/CommonDefsImplJs.kt | 3 --- src/jvmMain/kotlin/CommonDefsImplJvm.kt | 2 -- .../org/intellij/markdown/html/CommonDefsImplNative.kt | 3 --- src/wasmJsMain/kotlin/CommonDefsImplJs.kt | 3 --- 7 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/commonMain/kotlin/org/intellij/markdown/flavours/gfm/lexer/_GFMLexer.kt b/src/commonMain/kotlin/org/intellij/markdown/flavours/gfm/lexer/_GFMLexer.kt index c02a47f..dee96cf 100644 --- a/src/commonMain/kotlin/org/intellij/markdown/flavours/gfm/lexer/_GFMLexer.kt +++ b/src/commonMain/kotlin/org/intellij/markdown/flavours/gfm/lexer/_GFMLexer.kt @@ -8,6 +8,7 @@ import org.intellij.markdown.flavours.gfm.GFMTokenTypes import org.intellij.markdown.html.* import org.intellij.markdown.lexer.Compat import org.intellij.markdown.lexer.GeneratedLexer +import org.intellij.markdown.lexer.Stack /* Auto generated File */ class _GFMLexer : GeneratedLexer { @@ -56,7 +57,7 @@ class _GFMLexer : GeneratedLexer { /* user code: */ private class Token : MarkdownTokenTypes() - private val stateStack: IntStack = IntStack() + private val stateStack: Stack = Stack() private var isHeader = false private var codeSpanBacktickslength = 0 private val parseDelimited = ParseDelimited() diff --git a/src/commonMain/kotlin/org/intellij/markdown/flavours/space/lexer/_SFMLexer.kt b/src/commonMain/kotlin/org/intellij/markdown/flavours/space/lexer/_SFMLexer.kt index 2bfdfbd..483bf20 100644 --- a/src/commonMain/kotlin/org/intellij/markdown/flavours/space/lexer/_SFMLexer.kt +++ b/src/commonMain/kotlin/org/intellij/markdown/flavours/space/lexer/_SFMLexer.kt @@ -7,8 +7,8 @@ import org.intellij.markdown.IElementType import kotlin.Throws import org.intellij.markdown.flavours.gfm.GFMTokenTypes import org.intellij.markdown.html.BitSet -import org.intellij.markdown.html.IntStack import org.intellij.markdown.lexer.Compat +import org.intellij.markdown.lexer.Stack /** * This class is a scanner generated by @@ -61,7 +61,7 @@ class _SFMLexer : GeneratedLexer { /* user code: */ private class Token : MarkdownTokenTypes() - private val stateStack = IntStack() + private val stateStack = Stack() private var isHeader = false private val parseDelimited = ParseDelimited() diff --git a/src/commonMain/kotlin/org/intellij/markdown/html/CommonDefs.kt b/src/commonMain/kotlin/org/intellij/markdown/html/CommonDefs.kt index 7161e85..2d638a3 100644 --- a/src/commonMain/kotlin/org/intellij/markdown/html/CommonDefs.kt +++ b/src/commonMain/kotlin/org/intellij/markdown/html/CommonDefs.kt @@ -22,12 +22,6 @@ expect class BitSet(size: Int){ inline fun BitSet.clear(index: Int) = set(index, false) -expect class IntStack() { - fun push(e: Int) - fun pop(): Int - fun isEmpty(): Boolean -} - expect fun isWhitespace(char: Char): Boolean expect fun isPunctuation(char: Char): Boolean diff --git a/src/jsMain/kotlin/CommonDefsImplJs.kt b/src/jsMain/kotlin/CommonDefsImplJs.kt index 04ea654..5b0d756 100644 --- a/src/jsMain/kotlin/CommonDefsImplJs.kt +++ b/src/jsMain/kotlin/CommonDefsImplJs.kt @@ -1,10 +1,7 @@ package org.intellij.markdown.html -import org.intellij.markdown.lexer.Stack import org.w3c.dom.url.URL -actual class IntStack: Stack() - actual typealias BitSet = BooleanArray actual class URI actual constructor(str: String) { diff --git a/src/jvmMain/kotlin/CommonDefsImplJvm.kt b/src/jvmMain/kotlin/CommonDefsImplJvm.kt index 59e55ef..3d00c38 100644 --- a/src/jvmMain/kotlin/CommonDefsImplJvm.kt +++ b/src/jvmMain/kotlin/CommonDefsImplJvm.kt @@ -7,8 +7,6 @@ actual class BitSet actual constructor(size: Int): java.util.BitSet(size){ actual val size = size() } -actual class IntStack: Stack() - private const val PUNCTUATION_MASK: Int = (1 shl Character.DASH_PUNCTUATION.toInt()) or (1 shl Character.START_PUNCTUATION.toInt()) or (1 shl Character.END_PUNCTUATION.toInt()) or diff --git a/src/nativeMain/kotlin/org/intellij/markdown/html/CommonDefsImplNative.kt b/src/nativeMain/kotlin/org/intellij/markdown/html/CommonDefsImplNative.kt index 409fab2..85a6e21 100644 --- a/src/nativeMain/kotlin/org/intellij/markdown/html/CommonDefsImplNative.kt +++ b/src/nativeMain/kotlin/org/intellij/markdown/html/CommonDefsImplNative.kt @@ -1,7 +1,4 @@ package org.intellij.markdown.html -import org.intellij.markdown.lexer.Stack - -actual class IntStack: Stack() actual typealias BitSet = BooleanArray diff --git a/src/wasmJsMain/kotlin/CommonDefsImplJs.kt b/src/wasmJsMain/kotlin/CommonDefsImplJs.kt index 1d962c2..b7a4479 100644 --- a/src/wasmJsMain/kotlin/CommonDefsImplJs.kt +++ b/src/wasmJsMain/kotlin/CommonDefsImplJs.kt @@ -1,10 +1,7 @@ package org.intellij.markdown.html -import org.intellij.markdown.lexer.Stack import org.w3c.dom.url.URL -actual class IntStack: Stack() - actual typealias BitSet = BooleanArray actual class URI actual constructor(str: String) {