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.4.2 #253

Merged
merged 2 commits into from
Feb 9, 2022
Merged

Update scalafmt-core to 3.4.2 #253

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
a8f7183
Update scalafmt-core to 3.4.2
scala-steward Feb 6, 2022
bc3f3f3
Reformat with scalafmt 3.4.2
scala-steward Feb 6, 2022
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
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.4.0"
version = "3.4.2"
runner.dialect = scala213
maxColumn = 200 # For my wide 30" display.
project.git = true
Expand Down
4 changes: 2 additions & 2 deletions api/src/test/scala/com/github/andyglow/jsonschema/JsonMatchers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ trait JsonMatchers {
MatchResult(
matches = false,
s"```\n${JsonFormatter format left}\n```\nis not structurally equal to\n```\n${JsonFormatter format right}\n```\nDifferences:\n${diffs
.map(_.str)
.mkString("- ", "\n- ", "")}",
.map(_.str)
.mkString("- ", "\n- ", "")}",
""
)
}
Expand Down
2 changes: 1 addition & 1 deletion macros/src/main/scala/com/github/andyglow/jsonschema/UEnums.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ private[jsonschema] trait UEnums {
val details = ss.toSeq.sortBy { schema => showCode(schema.tree) }.map { schema =>
val schemaDetails = schemas(schema).sortBy { member => show(member.tpe) }.map { member =>
s" - ${show(member.tpe)}.${if (member.typeHint != NoType) s" Type Hint: ${show(member.typeHint)}"
else ""}"
else ""}"
}
.mkString("\n")
s"- ${showCode(schema.tree)}:\n$schemaDetails"
Expand Down
8 changes: 4 additions & 4 deletions macros/src/main/scala/com/github/andyglow/jsonschema/UProductTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ private[jsonschema] trait UProductTypes {
case ex: Throwable =>
throw new Exception(
s"Unable to check isNone for ${show(tpe)}.${show(fieldSym)}: ${show(
fieldTpe
)}. May be try non-full rebuild. Throws on evaluation of:\n```\n${showCode(q"$effectiveDefaultGetterTree.isEmpty")}\n```",
fieldTpe
)}. May be try non-full rebuild. Throws on evaluation of:\n```\n${showCode(q"$effectiveDefaultGetterTree.isEmpty")}\n```",
ex
)
}
Expand Down Expand Up @@ -109,8 +109,8 @@ private[jsonschema] trait UProductTypes {
| - corresponding library is in classpath (eg. scala-jsonschema-spray-json, scala-jsonschema-play-json, scala-jsonschema-circe-json, etc)
| - corresponding import is taking place (eg. `import com.github.andyglow.jsonschema.AsSpray._`, `import com.github.andyglow.jsonschema.AsPlay._`, `import com.github.andyglow.jsonschema.AsCirce._` etc)
|${if (isOption && is211)
"NOTE: Functionality of recognizing `scala.None` is not available for scala 2.11."
else ""}
"NOTE: Functionality of recognizing `scala.None` is not available for scala 2.11."
else ""}
|""".stripMargin
)
}
Expand Down