From 3829e4e8ccb1c32113871c30ca49fee32ed5e027 Mon Sep 17 00:00:00 2001 From: Yuriy Artamonov Date: Mon, 9 Sep 2024 21:55:57 +0200 Subject: [PATCH] [markdown] MarkdownWrappingFormattingBlock does not need a companion object GitOrigin-RevId: c4ad915edc01284a0870e5d559787650580dd6f5 --- .../blocks/special/EmphasisFormattingBlock.kt | 18 ++++---- .../MarkdownWrappingFormattingBlock.kt | 42 +++++++++---------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/blocks/special/EmphasisFormattingBlock.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/blocks/special/EmphasisFormattingBlock.kt index 0eff3780c8e2..0cfdb8d7c5db 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/blocks/special/EmphasisFormattingBlock.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/blocks/special/EmphasisFormattingBlock.kt @@ -30,14 +30,12 @@ internal class EmphasisFormattingBlock( } } } - - companion object { - private fun ASTNode.isLast(): Boolean { - return treeNext == null - } - - private fun ASTNode.isFirstContentElement(): Boolean { - return treePrev?.hasType(MarkdownTokenTypes.EMPH) == true - } - } } + +private fun ASTNode.isLast(): Boolean { + return treeNext == null +} + +private fun ASTNode.isFirstContentElement(): Boolean { + return treePrev?.hasType(MarkdownTokenTypes.EMPH) == true +} \ No newline at end of file diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/blocks/special/MarkdownWrappingFormattingBlock.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/blocks/special/MarkdownWrappingFormattingBlock.kt index 090e63c4e11a..5e357babfd0e 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/blocks/special/MarkdownWrappingFormattingBlock.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/formatter/blocks/special/MarkdownWrappingFormattingBlock.kt @@ -70,32 +70,30 @@ internal open class MarkdownWrappingFormattingBlock( result.add(block) } } +} - companion object { - internal fun splitTextForWrapping(text: String): Sequence { - return sequence { - var start = -1 - var length = -1 - for ((index, char) in text.withIndex()) { - if (char.isWhitespace()) { - if (length > 0) { - yield(TextRange.from(start, length)) - } - start = -1 - length = -1 - } - else { - if (start == -1) { - start = index - length = 0 - } - length++ - } - } +private fun splitTextForWrapping(text: String): Sequence { + return sequence { + var start = -1 + var length = -1 + for ((index, char) in text.withIndex()) { + if (char.isWhitespace()) { if (length > 0) { yield(TextRange.from(start, length)) } + start = -1 + length = -1 + } + else { + if (start == -1) { + start = index + length = 0 + } + length++ } } + if (length > 0) { + yield(TextRange.from(start, length)) + } } -} +} \ No newline at end of file