diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt index 63e44bedd0..d01e7e8e7c 100644 --- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt +++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt @@ -475,16 +475,9 @@ public class IndentationRule : } private fun adjustExpectedIndentInFrontOfPropertyAccessor(n: ASTNode, ctx: IndentContext) { -// val adj = ctx.clearExitAdj(n.treeParent) -// if (adj != null) { -// expectedIndent += adj -// logger.trace { "$line: ++in_front(${n.treeNext.elementType}) Keep indent at -> $expectedIndent" } -// ctx.exitAdjBy(n.treeNext, adj) -// } else { expectedIndent++ logger.trace { "$line: ++in_front(${n.treeNext.elementType}) -> $expectedIndent" } ctx.exitAdjBy(n.treeNext, -1) -// } } private fun adjustExpectedIndentInFrontOfSuperTypeList(n: ASTNode, ctx: IndentContext) { diff --git a/ktlint-ruleset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt b/ktlint-ruleset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt index 7d5124ccd6..69a25dc189 100644 --- a/ktlint-ruleset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt +++ b/ktlint-ruleset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt @@ -8,6 +8,7 @@ import com.pinterest.ktlint.test.LintViolation import com.pinterest.ktlint.test.MULTILINE_STRING_QUOTE import com.pinterest.ktlint.test.SPACE import com.pinterest.ktlint.test.TAB +import kotlin.random.Random import org.ec4j.core.model.PropertyType import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DisplayName @@ -3769,6 +3770,27 @@ internal class IndentationRuleTest { } } + val foo = Any() == true && + Random.nextBoolean().let { boolean -> + !boolean + } == true + + @DisplayName("Issue 1321 - Lambda inside complex boolean expression") + @Nested + inner class Issue1321 { + @Test + fun `Issue 1321 - `() { + val code = + """ + val foo = Any() == true && + Random.nextBoolean().let { boolean -> + !boolean + } == true + """.trimIndent() + indentationRuleAssertThat(code).hasNoLintViolations() + } + } + private companion object { val INDENT_STYLE_TAB = indentStyleProperty to PropertyType.IndentStyleValue.tab }