Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scala3 syntax: remove braces around single import #4223

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Scala3 syntax: remove braces around single import #4223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac49860
Add test with import rename and multiple rewrites
kitbellew Sep 7, 2024
45ca994
Scala3 syntax: remove braces around single import
kitbellew Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/ConvertToNewScala3Syntax.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -119,6 +126,8 @@ private class ConvertToNewScala3Syntax(implicit val ftoks: FormatTokens)
case _ => null
}

case _: Token.RightBrace if left.isRemove => removeToken

case _ => null
}
}.map((left, _))
Expand Down
8 changes: 4 additions & 4 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions scalafmt-tests/src/test/resources/scala3/RenameImportExport.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,11 @@ rewrite.rules = [ExpandImportSelectors]
import foo.{ bar as baz, *}
>>>
import foo.{bar as baz, *}
<<< #4218 with multiple rewrites
runner.parser = source
rewrite.rules = [ExpandImportSelectors]
rewrite.scala3.convertToNewSyntax = true
===
import scala.util.{Try => T}
>>>
import scala.util.Try as T
Loading