Skip to content

Commit 78ebabe

Browse files
committed
Remove unnecessary Alignment and Wrap objects
Also fixes initial entry indent being 8 spaces instead of none
1 parent 7cafab7 commit 78ebabe

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/main/kotlin/platform/mcp/at/format/AtBlock.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import com.intellij.formatting.Indent
2727
import com.intellij.formatting.Spacing
2828
import com.intellij.formatting.SpacingBuilder
2929
import com.intellij.formatting.Wrap
30-
import com.intellij.formatting.WrapType
3130
import com.intellij.lang.ASTNode
3231
import com.intellij.lang.tree.util.children
3332
import com.intellij.psi.TokenType
@@ -83,7 +82,7 @@ class AtBlock(
8382
blocks.add(
8483
AtBlock(
8584
child,
86-
Wrap.createWrap(WrapType.NONE, false),
85+
null,
8786
alignment,
8887
spacingBuilder,
8988
codeStyleSettings,
@@ -98,6 +97,8 @@ class AtBlock(
9897

9998
override fun getIndent(): Indent? = Indent.getNoneIndent()
10099

100+
override fun getChildIndent(): Indent? = Indent.getNoneIndent()
101+
101102
override fun getSpacing(child1: Block?, child2: Block): Spacing? = spacingBuilder.getSpacing(this, child1, child2)
102103

103104
override fun isLeaf(): Boolean = node.firstChildNode == null

src/main/kotlin/platform/mcp/at/format/AtFormattingModelBuilder.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import com.intellij.formatting.FormattingModel
2828
import com.intellij.formatting.FormattingModelBuilder
2929
import com.intellij.formatting.FormattingModelProvider
3030
import com.intellij.formatting.SpacingBuilder
31-
import com.intellij.formatting.Wrap
32-
import com.intellij.formatting.WrapType
3331
import com.intellij.psi.codeStyle.CodeStyleSettings
3432

3533
class AtFormattingModelBuilder : FormattingModelBuilder {
@@ -49,8 +47,8 @@ class AtFormattingModelBuilder : FormattingModelBuilder {
4947
val codeStyleSettings = formattingContext.codeStyleSettings
5048
val rootBlock = AtBlock(
5149
formattingContext.node,
52-
Wrap.createWrap(WrapType.NONE, false),
53-
Alignment.createAlignment(),
50+
null,
51+
null,
5452
createSpaceBuilder(codeStyleSettings),
5553
codeStyleSettings,
5654
Alignment.createAlignment(true),

0 commit comments

Comments
 (0)