Merge branch 'main' into charset

facebook · Mar 26, 2024 · b394fe3 · b394fe3
2 parents 2759d1e + 3a67771
commit b394fe3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 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
@@ -1230,7 +1230,8 @@ class KotlinInputAstVisitor(
       val isFirst = leftExpression === leftMostExpression
 
       when (leftExpression.operationToken) {
-        KtTokens.RANGE -> {
+        KtTokens.RANGE,
+        KtTokens.RANGE_UNTIL -> {
           if (isFirst) {
             builder.open(expressionBreakIndent)
           }

diff --git a/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt b/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt
@@ -375,6 +375,7 @@ class FormatterTest {
         |      "The" +
         |          "quick" +
         |          ("brown".."fox") +
+        |          ("brown"..<"fox") +
         |          "jumps" +
         |          "over" +
         |          "the".."lazy" + "dog"
@@ -1696,6 +1697,7 @@ class FormatterTest {
       |    in a..3 -> print()
       |    in 1..b -> print()
       |    !in 1..b -> print()
+      |    in 1..<b -> print()
       |    else -> print(3)
       |  }
       |}

diff --git a/ktfmt_idea_plugin/src/main/java/com/facebook/ktfmt/intellij/KtfmtConfigurable.java b/ktfmt_idea_plugin/src/main/java/com/facebook/ktfmt/intellij/KtfmtConfigurable.java
@@ -200,7 +200,9 @@ private void createUIComponents() {
             false));
   }
 
-  /** @noinspection ALL */
+  /**
+   * @noinspection ALL
+   */
   public JComponent $$$getRootComponent$$$() {
     return panel;
   }