cleanup

Closes pinterest#1335
paul-dingemans · May 12, 2022 · 5cc8baa · 5cc8baa
1 parent 9a04ce2
commit 5cc8baa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/...ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt b/...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/...set-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt b/...set-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
  }