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

Update scalafmt-core to 3.8.5 #1534

Open
wants to merge 3 commits into
base: 1.10.x
Choose a base branch
from
Open

Update scalafmt-core to 3.8.5 #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa82a91
Update scalafmt-core to 3.8.5
scala-steward Jan 19, 2025
8c7f2b8
Reformat with scalafmt 3.8.5
scala-steward Jan 19, 2025
9f30fd4
Add 'Reformat with scalafmt 3.8.5' to .git-blame-ignore-revs
scala-steward Jan 19, 2025
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ c7afd84c5921949600cd336bbc72acbb41d2342b

# Scala Steward: Reformat with scalafmt 3.8.3
fd4b05723aa0d0ab98f75475ed73c61549a08878

# Scala Steward: Reformat with scalafmt 3.8.5
8c7f2b8470aa6a855752f60aceff86a3b4960af0
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.5
runner.dialect = scala212

project.git = true
Expand Down
7 changes: 5 additions & 2 deletions ...ridge-test/src/test/scala/sbt/internal/inc/ExtractUsedNamesPerformanceSpecification.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ class ExtractUsedNamesPerformanceSpecification
new String(Files.readAllBytes(Paths.get(fileUri)))
} finally zipfs.foreach { fs =>
try fs.close()
catch { case _: Throwable => /*ignore*/ }
catch {
case _: Throwable => /*ignore*/
}
}
import org.scalatest.time.SpanSugar._
val usedNames = failAfter(30 seconds) {
Expand Down Expand Up @@ -114,7 +116,8 @@ class ExtractUsedNamesPerformanceSpecification

it should "correctly collect used names from macro extension" in {
pending
val ext = """|package acme
val ext =
"""|package acme
|import scala.reflect.macros.blackbox.Context
|
|object Foo {
Expand Down
4 changes: 3 additions & 1 deletion internal/zinc-apiinfo/src/main/scala/xsbt/api/ShowAPI.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ object ShowAPI {
else tps.map(showTypeParameter).mkString("[", ", ", "]")

private def showTypeParameter(tp: TypeParameter)(implicit nesting: Int): String =
showAnnotations(tp.annotations.toIndexedSeq) + " " + showVariance(tp.variance) + tp.id + showTypeParameters(
showAnnotations(tp.annotations.toIndexedSeq) + " " + showVariance(
tp.variance
) + tp.id + showTypeParameters(
tp.typeParameters.toIndexedSeq
) + " " + showBounds(tp.lowerBound, tp.upperBound)

Expand Down
5 changes: 4 additions & 1 deletion internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,10 @@ case class ProjectStructure(
import scala.collection.JavaConverters._
val map = new java.util.HashMap[String, String]
properties.asScala foreach { case (k: String, v: String) => map.put(k, v) }
val externalHooks = new DefaultExternalHooks(Optional.empty[ExternalHooks.Lookup], Optional.empty[XClassFileManager])
val externalHooks = new DefaultExternalHooks(
Optional.empty[ExternalHooks.Lookup],
Optional.empty[XClassFileManager]
)
.withInvalidationProfiler(profiler)
val base = IncOptions
.of()
Expand Down
Loading