Use inExpression in a nullsafe way

facebook · Sep 13, 2023 · be69526 · be69526
1 parent 2c36ddb
commit be69526
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt
@@ -2374,7 +2374,7 @@ class KotlinInputAstVisitor(
    * @throws FormattingError
    */
   override fun visitElement(element: PsiElement) {
-    inExpression.addLast(element is KtExpression || inExpression.peekLast())
+    inExpression.addLast(element is KtExpression || inExpression.last())
     val previous = builder.depth()
     try {
       super.visitElement(element)
@@ -2430,10 +2430,6 @@ class KotlinInputAstVisitor(
     markForPartialFormat()
   }
 
-  private fun inExpression(): Boolean {
-    return inExpression.peekLast()
-  }
-
   /**
    * markForPartialFormat is used to delineate the smallest areas of code that must be formatted
    * together.
@@ -2442,7 +2438,7 @@ class KotlinInputAstVisitor(
    * covered by an area marked by this method.
    */
   private fun markForPartialFormat() {
-    if (!inExpression()) {
+    if (!inExpression.last()) {
       builder.markForPartialFormat()
     }
   }