Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
#### Version 0.39.0

- **Note**: The `highlights` library in v1.1.0 seems to be compiled with Java 21
- **Note**: Some dependencies start to require minSDK: 23 (compared to the minSDK of 21 from before)
- **Breaking Change**: Some underlying APIs start to require API 23 instead of 21.
- `org.jetbrains.compose.components.resources`
- **Dependency Upgrade**: Kotlin 2.3.0
- **Dependency Upgrade**: Compose 1.10.x

#### Version 0.38.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import org.intellij.markdown.MarkdownElementTypes
import org.intellij.markdown.MarkdownTokenTypes
import org.intellij.markdown.ast.ASTNode
import org.intellij.markdown.ast.findChildOfType
import org.intellij.markdown.ast.getTextInNode
import org.intellij.markdown.flavours.MarkdownFlavourDescriptor
import org.intellij.markdown.flavours.gfm.GFMElementTypes
import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor
Expand Down Expand Up @@ -295,6 +296,7 @@ fun AnnotatedString.Builder.buildMarkdownAnnotatedString(
GFMTokenTypes.GFM_AUTOLINK -> if (child.parent == MarkdownElementTypes.LINK_TEXT) {
append(child.getUnescapedTextInNode(content))
} else appendAutoLink(content, child, annotatorSettings)

GFMTokenTypes.DOLLAR -> append('$')

MarkdownTokenTypes.SINGLE_QUOTE -> append('\'')
Expand All @@ -313,12 +315,24 @@ fun AnnotatedString.Builder.buildMarkdownAnnotatedString(
skipIfNext = MarkdownTokenTypes.EOL
}

MarkdownTokenTypes.EMPH -> if (parentType != MarkdownElementTypes.EMPH && parentType != MarkdownElementTypes.STRONG) append('*')
MarkdownTokenTypes.EMPH -> {
if (parentType != MarkdownElementTypes.EMPH && parentType != MarkdownElementTypes.STRONG) {
append(child.getTextInNode(content))
}
}

MarkdownTokenTypes.EOL -> if (eolAsNewLine) append('\n') else append(' ')
MarkdownTokenTypes.WHITE_SPACE -> if (length > 0) append(' ')
MarkdownTokenTypes.BLOCK_QUOTE -> {
skipIfNext = MarkdownTokenTypes.WHITE_SPACE
}

else -> {
// `~` is not a specific `MarkdownTokenTypes`
if (child.type.name == "~" && parentType != GFMElementTypes.STRIKETHROUGH) {
append(child.getTextInNode(content))
}
}
}
}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ class SnapshotTests {
@Preview(showBackground = true, backgroundColor = Color.BLACK.toLong(), heightDp = 1500, uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
fun TableTest() = TestMarkdown(MARKDOWN_TABLE)

@Preview(showBackground = true, backgroundColor = Color.WHITE.toLong(), heightDp = 1500)
@Preview(showBackground = true, backgroundColor = Color.BLACK.toLong(), heightDp = 1500, uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
fun InlineCodeTest() = TestMarkdown(MARKDOWN_INLINE_CODE)
}


Expand Down Expand Up @@ -228,4 +233,15 @@ private val MARKDOWN_LIST = """
* 7
* 8
* **Bold**: 9
""".trimIndent()

private val MARKDOWN_INLINE_CODE = """
* Emphasis (`*`, `_`)
* It will be displayed as: Emphasis ( * , * )

* Strong emphasis (`**`, `__`)

It will be displayed as: Strong emphasis ( ** , ** )

* Strike-through (`~~`)
""".trimIndent()
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ class SnapshotTests {
@Preview(showBackground = true, backgroundColor = Color.BLACK.toLong(), heightDp = 1500, uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
fun TableTest() = TestMarkdown(MARKDOWN_TABLE)

@Preview(showBackground = true, backgroundColor = Color.WHITE.toLong(), heightDp = 1500)
@Preview(showBackground = true, backgroundColor = Color.BLACK.toLong(), heightDp = 1500, uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
fun InlineCodeTest() = TestMarkdown(MARKDOWN_INLINE_CODE)
}


Expand Down Expand Up @@ -228,4 +233,15 @@ private val MARKDOWN_LIST = """
* 7
* 8
* **Bold**: 9
""".trimIndent()

private val MARKDOWN_INLINE_CODE = """
* Emphasis (`*`, `_`)
* It will be displayed as: Emphasis ( * , * )

* Strong emphasis (`**`, `__`)

It will be displayed as: Strong emphasis ( ** , ** )

* Strike-through (`~~`)
""".trimIndent()
Loading