Skip to content

Commit 9f45ec5

Browse files
committed
Fix code format handling
1 parent 5efe540 commit 9f45ec5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,8 +594,9 @@ class AztecToolbar : FrameLayout, IAztecToolbar, OnMenuItemClickListener {
594594
ToolbarAction.CODE -> {
595595
editor?.apply {
596596
val spans = editableText.getSpans(selectionStart, selectionEnd, AztecPreformatSpan::class.java).size
597-
val isInlineCode = isTextSelected() && spans == 1 || inlineFormatter.containsInlineStyle(AztecTextFormat.FORMAT_CODE)
598-
if (blockFormatter.containsPreformat() || !isInlineCode) {
597+
val isInlineCode = isTextSelected() && spans <= 1 || inlineFormatter.containsInlineStyle(AztecTextFormat.FORMAT_CODE)
598+
val containsLineBreak = editableText.toString().substring(selectionStart, selectionEnd).contains("\n")
599+
if (blockFormatter.containsPreformat() || !isInlineCode || containsLineBreak) {
599600
toggleFormatting(AztecTextFormat.FORMAT_PREFORMAT)
600601
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_PREFORMAT, false)
601602
} else {

0 commit comments

Comments
 (0)