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.

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.3 #1381

Merged
merged 3 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.8.0
c7afd84c5921949600cd336bbc72acbb41d2342b

# Scala Steward: Reformat with scalafmt 3.8.3
fd4b05723aa0d0ab98f75475ed73c61549a08878
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.1
version = 3.8.3
runner.dialect = scala212

project.git = true
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,8 @@ lazy val zincCompileCore = (projectMatrix in internalPath / "zinc-compile-core")
),
Test / unmanagedJars := Seq((compilerBridge212 / Compile / packageSrc).value).classpath,
Compile / managedSourceDirectories += (Compile / generateContrabands / sourceManaged).value,
Compile / generateContrabands / sourceManaged := (internalPath / "zinc-compile-core" / "src" / "main" / "contraband-java").getAbsoluteFile,
Compile / generateContrabands / sourceManaged := (internalPath / "zinc-compile-core" / "src" / "main" / "contraband-java")
.getAbsoluteFile,
mimaSettings,
mimaBinaryIssueFilters ++= ZincBuildUtil.excludeInternalProblems,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,8 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with
val inheritanceSymbols = inheritanceTypes.flatMap(flattenTypeToSymbols)

debuglog(
"Parent types for " + tree.symbol + " (self: " + self.tpt.tpe + "): " + inheritanceTypes + " with symbols " + inheritanceSymbols
"Parent types for " + tree.symbol + " (self: " + self.tpt
.tpe + "): " + inheritanceTypes + " with symbols " + inheritanceSymbols
.map(_.fullName)
)

Expand Down
9 changes: 6 additions & 3 deletions internal/zinc-apiinfo/src/main/scala/xsbt/api/SameAPI.scala
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ class SameAPI(includePrivate: Boolean, includeParamNames: Boolean) {
): Boolean =
debug(
sameStrings(a.keySet, b.keySet),
"\tDefinition strings differed (a: " + (a.keySet -- b.keySet) + ", b: " + (b.keySet -- a.keySet) + ")"
"\tDefinition strings differed (a: " + (a.keySet -- b.keySet) + ", b: " + (b.keySet -- a
.keySet) + ")"
) &&
zippedEntries(a, b).forall(tupled(sameNamedDefinitions))

Expand Down Expand Up @@ -236,7 +237,8 @@ class SameAPI(includePrivate: Boolean, includeParamNames: Boolean) {
def sameFieldSpecificAPI(a: FieldLike, b: FieldLike): Boolean =
debug(
sameFieldCategory(a, b),
"Different field categories (" + a.name + "=" + a.getClass.getName + " -- " + a.name + "=" + a.getClass.getName + ")"
"Different field categories (" + a.name + "=" + a.getClass.getName + " -- " + a.name + "=" + a
.getClass.getName + ")"
) &&
debug(sameType(a.tpe, b.tpe), "Different field type for " + a.name)

Expand Down Expand Up @@ -350,7 +352,8 @@ class SameAPI(includePrivate: Boolean, includeParamNames: Boolean) {
def differentCategory(label: String, a: AnyRef, b: AnyRef): Boolean =
debug(
flag = false,
"Different category of " + label + " (" + a.getClass.getName + " and " + b.getClass.getName + ") for (" + a + " and " + b + ")"
"Different category of " + label + " (" + a.getClass.getName + " and " + b.getClass
.getName + ") for (" + a + " and " + b + ")"
)

def sameParameterized(a: Parameterized, b: Parameterized): Boolean =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ object ProtobufDefaults {

object Feedback {
implicit class StringToException(str: String) {
def `!!` : Nothing = sys.error(str)
def `!!`: Nothing = sys.error(str)
}

object Writers {
Expand Down