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

bump: scalafmt-core 3.8.6 (was 3.8.3) #637

Merged
merged 3 commits into from
Feb 10, 2025
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.5.9
71a281e0b411e6941332d79abb211ac197105a6a

# Scala Steward: Reformat with scalafmt 3.8.6
f34ebab1f49f9f361ba6b5232c4cd141dd37be4c
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.3
version = 3.8.6
runner.dialect = scala213
maxColumn = 120
docstrings.style = Asterisk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ object ParadoxPlugin extends AutoPlugin {
sourceDirectories in paradoxTemplate,
includeFilter in paradoxTemplate,
excludeFilter in paradoxTemplate
) dependsOn {
) dependsOn
paradoxThemeDirectory // trigger theme extraction first
}).value,
).value,
mappings in paradoxTemplate := Defaults
.relativeMappings(sources in paradoxTemplate, sourceDirectories in paradoxTemplate)
.value,
Expand Down Expand Up @@ -289,10 +289,9 @@ object ParadoxPlugin extends AutoPlugin {
}
}.value,
includeFilter in paradox := AllPassFilter,
excludeFilter in paradox := {
excludeFilter in paradox :=
// exclude markdown sources and the _template directory sources
(includeFilter in paradoxMarkdownToHtml).value || InDirectoryFilter((sourceDirectory in paradoxTheme).value)
},
(includeFilter in paradoxMarkdownToHtml).value || InDirectoryFilter((sourceDirectory in paradoxTheme).value),
sources in paradox := Defaults
.collectFiles(sourceDirectories in paradox, includeFilter in paradox, excludeFilter in paradox)
.value,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,19 @@ class GitHubDirectiveSpec extends MarkdownBaseSpec {
}

it should "throw exceptions for non-existing GitHub tree path with label" in {
val ex = the[ParadoxException] thrownBy {
val ex = the[ParadoxException] thrownBy
markdown("""
|@github[oops](does/not/exist.scala) { #broken }
|""")
}

ex.getMessage.startsWith("Failed to resolve [does/not/exist.scala] to a file") shouldBe true
}

it should "throw exceptions for non-existing GitHub tree path with invalid label" in {
val ex = the[ParadoxException] thrownBy {
val ex = the[ParadoxException] thrownBy
markdown("""
|@github[neither](tests/src/test/scala/com/lightbend/paradox/markdown/example.scala) { #does-not-exist }
|""")
}

ex.getMessage.replace('\\', '/') shouldBe
"Failed to resolve [tests/src/test/scala/com/lightbend/paradox/markdown/example.scala]: Label [does-not-exist] not found in [tests/src/test/scala/com/lightbend/paradox/markdown/example.scala]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,11 @@ class RefDirectiveSpec extends MarkdownBaseSpec {
""".stripMargin) shouldEqual testHtml("""<p>This <a href="pagewithanchors.html#header">Page</a> is linked.</p>""")
}

it should "support referenced links with empty key" in {
it should "support referenced links with empty key" in
testMarkdown("""This @ref:[Page][] { .ref a=1 } is linked.
|
| [Page]: pagewithanchors.md#header
""".stripMargin) // shouldEqual testHtml("""<p>This <a href="page.html#header">Page</a> is linked.</p>""")
}

it should "support referenced links with defined key" in {
testMarkdown("""This @ref:[Page][123] { .ref a=1 } is linked.
Expand Down