Scala3 syntax: remove braces around single import

scalameta · Sep 12, 2024 · 45ca994 · 45ca994
1 parent ac49860
commit 45ca994
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/ConvertToNewScala3Syntax.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/ConvertToNewScala3Syntax.scala
@@ -76,6 +76,13 @@ private class ConvertToNewScala3Syntax(implicit val ftoks: FormatTokens)
           case _ => null
         }
 
+      case _: Token.LeftBrace
+          if flag.deprecated && dialect.allowAsForImportRename =>
+        ft.meta.rightOwner match {
+          case t: Importer if t.importees.lengthCompare(1) == 0 => removeToken
+          case _ => null
+        }
+
       case _: Token.RightArrow
           if flag.deprecated && dialect.allowAsForImportRename =>
         ft.meta.rightOwner match {
@@ -119,6 +126,8 @@ private class ConvertToNewScala3Syntax(implicit val ftoks: FormatTokens)
           case _ => null
         }
 
+      case _: Token.RightBrace if left.isRemove => removeToken
+
       case _ => null
     }
   }.map((left, _))

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -1835,9 +1835,9 @@ object a:
 object a:
    import A.{min as minimum, `*` as multiply}
    import Predef.{augmentString as _, *}
-   import scala.{annotation as ann}
+   import scala.annotation as ann
    import java as j
-   import Predef.{augmentString as _}
+   import Predef.augmentString as _
    // scalafmt: { rewrite.scala3.newSyntax.deprecated = false }
    import Predef.{augmentString => _}
 <<< rewrite to new syntax, imports, scala2-source3
@@ -1856,9 +1856,9 @@ object a {
 object a {
   import A.{min as minimum, `*` as multiply}
   import Predef.{augmentString as _, *}
-  import scala.{annotation as ann}
+  import scala.annotation as ann
   import java as j
-  import Predef.{augmentString as _}
+  import Predef.augmentString as _
 }
 <<< rewrite to new syntax, wildcard
 rewrite.scala3.convertToNewSyntax = true

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -1748,9 +1748,9 @@ object a:
 object a:
    import A.{min as minimum, `*` as multiply}
    import Predef.{augmentString as _, *}
-   import scala.{annotation as ann}
+   import scala.annotation as ann
    import java as j
-   import Predef.{augmentString as _}
+   import Predef.augmentString as _
    // scalafmt: { rewrite.scala3.newSyntax.deprecated = false }
    import Predef.{augmentString => _}
 <<< rewrite to new syntax, imports, scala2-source3
@@ -1769,9 +1769,9 @@ object a {
 object a {
   import A.{min as minimum, `*` as multiply}
   import Predef.{augmentString as _, *}
-  import scala.{annotation as ann}
+  import scala.annotation as ann
   import java as j
-  import Predef.{augmentString as _}
+  import Predef.augmentString as _
 }
 <<< rewrite to new syntax, wildcard
 rewrite.scala3.convertToNewSyntax = true

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -1850,9 +1850,9 @@ object a:
 object a:
    import A.{min as minimum, `*` as multiply}
    import Predef.{augmentString as _, *}
-   import scala.{annotation as ann}
+   import scala.annotation as ann
    import java as j
-   import Predef.{augmentString as _}
+   import Predef.augmentString as _
    // scalafmt: { rewrite.scala3.newSyntax.deprecated = false }
    import Predef.{augmentString => _}
 <<< rewrite to new syntax, imports, scala2-source3
@@ -1871,9 +1871,9 @@ object a {
 object a {
   import A.{min as minimum, `*` as multiply}
   import Predef.{augmentString as _, *}
-  import scala.{annotation as ann}
+  import scala.annotation as ann
   import java as j
-  import Predef.{augmentString as _}
+  import Predef.augmentString as _
 }
 <<< rewrite to new syntax, wildcard
 rewrite.scala3.convertToNewSyntax = true

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -1970,9 +1970,9 @@ object a:
 object a:
    import A.{min as minimum, `*` as multiply}
    import Predef.{augmentString as _, *}
-   import scala.{annotation as ann}
+   import scala.annotation as ann
    import java as j
-   import Predef.{augmentString as _}
+   import Predef.augmentString as _
    // scalafmt: { rewrite.scala3.newSyntax.deprecated = false }
    import Predef.{augmentString => _}
 <<< rewrite to new syntax, imports, scala2-source3
@@ -1991,9 +1991,9 @@ object a {
 object a {
   import A.{min as minimum, `*` as multiply}
   import Predef.{augmentString as _, *}
-  import scala.{annotation as ann}
+  import scala.annotation as ann
   import java as j
-  import Predef.{augmentString as _}
+  import Predef.augmentString as _
 }
 <<< rewrite to new syntax, wildcard
 rewrite.scala3.convertToNewSyntax = true

diff --git a/scalafmt-tests/src/test/resources/scala3/RenameImportExport.stat b/scalafmt-tests/src/test/resources/scala3/RenameImportExport.stat
@@ -100,7 +100,4 @@ rewrite.scala3.convertToNewSyntax = true
 ===
 import scala.util.{Try => T}
 >>>
-Idempotency violated
-=> Diff (- obtained, + expected)
--import scala.util.Try as T
-+import scala.util.{Try as T}
+import scala.util.Try as T