From 250a489183266fec477634383fc33a2cec33ee19 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 16:18:23 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 996f2aa4..a5c4a6b8 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,2 +1,2 @@ -version = 3.8.1 +version = 3.8.3 runner.dialect = scala213 \ No newline at end of file From 7f1070998d74a7dce4d4b28d3bdfff6870408744 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 16:18:49 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.3 Executed command: scalafmt --non-interactive --- build.sbt | 5 +- .../org/scalawiki/xml/XmlParserSpec.scala | 94 +++++++++++++------ 2 files changed, 69 insertions(+), 30 deletions(-) diff --git a/build.sbt b/build.sbt index fef2e1ab..0b903196 100644 --- a/build.sbt +++ b/build.sbt @@ -63,7 +63,10 @@ lazy val core = Project("scalawiki-core", file("scalawiki-core")) "com.iheart" %% "ficus" % FicusV, "jp.ne.opt" %% "chronoscala" % ChronoScalaV, "ch.qos.logback" % "logback-classic" % LogbackClassicV, - "org.sweble.wikitext" % "swc-engine" % SwcEngineV exclude ("org.jsoup", "jsoup"), + "org.sweble.wikitext" % "swc-engine" % SwcEngineV exclude ( + "org.jsoup", + "jsoup" + ), "javax.xml.bind" % "jaxb-api" % "2.3.1", "de.fau.cs.osr.ptk" % "ptk-common" % "3.0.8", Library.Commons.codec, diff --git a/scalawiki-dumps/src/test/scala/org/scalawiki/xml/XmlParserSpec.scala b/scalawiki-dumps/src/test/scala/org/scalawiki/xml/XmlParserSpec.scala index 093c98f4..03f8502a 100644 --- a/scalawiki-dumps/src/test/scala/org/scalawiki/xml/XmlParserSpec.scala +++ b/scalawiki-dumps/src/test/scala/org/scalawiki/xml/XmlParserSpec.scala @@ -420,17 +420,27 @@ class XmlParserSpec extends Specification { val p1Revs = p1.revisions p1Revs.size === 2 val p1r1 = p1Revs(0) - (p1r1.revId, p1r1.parentId, p1r1.comment, p1r1.content) === (Some( - 100 - ), Some(99), Some("I have just one thing to say!"), Some( - "A bunch of [[text]] here." - )) + (p1r1.revId, p1r1.parentId, p1r1.comment, p1r1.content) === ( + Some( + 100 + ), + Some(99), + Some("I have just one thing to say!"), + Some( + "A bunch of [[text]] here." + ) + ) p1r1.user === Some(User(42, "Foobar")) val p1r2 = p1Revs(1) - (p1r2.revId, p1r2.parentId, p1r2.comment, p1r2.content) === (Some( - 99 - ), None, Some("new!"), Some("An earlier [[revision]].")) + (p1r2.revId, p1r2.parentId, p1r2.comment, p1r2.content) === ( + Some( + 99 + ), + None, + Some("new!"), + Some("An earlier [[revision]].") + ) p1r2.user === Some(IpContributor("10.0.0.2")) val p2 = pages(1) @@ -438,11 +448,16 @@ class XmlParserSpec extends Specification { val p2Revs = p2.revisions p2Revs.size === 1 val p2r1 = p2Revs(0) - (p2r1.revId, p2r1.parentId, p2r1.comment, p2r1.content) === (Some( - 101 - ), None, Some("hey"), Some( - "WHYD YOU LOCK PAGE??!!! i was editing that jerk" - )) + (p2r1.revId, p2r1.parentId, p2r1.comment, p2r1.content) === ( + Some( + 101 + ), + None, + Some("hey"), + Some( + "WHYD YOU LOCK PAGE??!!! i was editing that jerk" + ) + ) p2r1.user === Some(IpContributor("10.0.0.2")) val p3 = pages(2) @@ -450,11 +465,16 @@ class XmlParserSpec extends Specification { val p3Revs = p3.revisions p3Revs.size === 1 val p3r1 = p3Revs(0) - (p3r1.revId, p3r1.parentId, p3r1.comment, p3r1.content) === (Some( - 102 - ), None, Some("My awesomeest image!"), Some( - "This is an awesome little imgae. I lurves it. {{PD}}" - )) + (p3r1.revId, p3r1.parentId, p3r1.comment, p3r1.content) === ( + Some( + 102 + ), + None, + Some("My awesomeest image!"), + Some( + "This is an awesome little imgae. I lurves it. {{PD}}" + ) + ) p3r1.user === Some(User(42, "Foobar")) val ii = p3.images @@ -475,17 +495,27 @@ class XmlParserSpec extends Specification { val p1Revs = p1.revisions p1Revs.size === 2 val p1r1 = p1Revs(0) - (p1r1.revId, p1r1.parentId, p1r1.comment, p1r1.content) === (Some( - 100 - ), Some(99), Some("I have just one thing to say!"), Some( - "A bunch of [[text]] here." - )) + (p1r1.revId, p1r1.parentId, p1r1.comment, p1r1.content) === ( + Some( + 100 + ), + Some(99), + Some("I have just one thing to say!"), + Some( + "A bunch of [[text]] here." + ) + ) p1r1.user === Some(User(42, "Foobar")) val p1r2 = p1Revs(1) - (p1r2.revId, p1r2.parentId, p1r2.comment, p1r2.content) === (Some( - 99 - ), None, Some("new!"), Some("An earlier [[revision]].")) + (p1r2.revId, p1r2.parentId, p1r2.comment, p1r2.content) === ( + Some( + 99 + ), + None, + Some("new!"), + Some("An earlier [[revision]].") + ) p1r2.user === Some(IpContributor("10.0.0.2")) } @@ -506,9 +536,15 @@ class XmlParserSpec extends Specification { revision.comment, revision.content ) === - (Some(revId), Some(parentId), Some(Timestamp.format(timestamp)), Some( - comment - ), Some(text)) + ( + Some(revId), + Some(parentId), + Some(Timestamp.format(timestamp)), + Some( + comment + ), + Some(text) + ) revision.user === Some(User(userId, user)) } From c0f95edbd0e4c7d4462d616e427186fdaee62ecf Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 16:18:50 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.3' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index bab00be6..105618ae 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.8.0 2b7c8bc5f30a6c124b70c00bc4362dda112c7c50 + +# Scala Steward: Reformat with scalafmt 3.8.3 +7f1070998d74a7dce4d4b28d3bdfff6870408744