From 8b8e9465f7e7adbc32e89cd7ee27e1690c72d893 Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Thu, 14 Apr 2022 20:58:38 +0200 Subject: [PATCH 1/2] Update scalafmt --- .github/workflows/format.yml | 2 +- .scalafmt.conf | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index b5ca820..c3f6c74 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -23,4 +23,4 @@ jobs: - name: Check project is formatted uses: jrouly/scalafmt-native-action@v1 with: - version: '3.4.3' + version: '3.5.1' diff --git a/.scalafmt.conf b/.scalafmt.conf index 862cf68..df5e647 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,13 +1,19 @@ -version = 3.4.3 +version = 3.5.1 runner.dialect = scala213 maxColumn = 120 docstrings.style = Asterisk assumeStandardLibraryStripMargin = true rewrite.rules = [RedundantBraces, RedundantParens, SortImports, SortModifiers] indentOperator.exemptScope = all -align.tokens = [ +align.tokens."+" = [ {code = "%", owner = "Term.ApplyInfix"}, {code = "%%", owner = "Term.ApplyInfix"}, {code = ":=", owner = "Term.ApplyInfix"}, + { + code = "=>" + owners = [{ + regex = "Case" + }] + }, "=" ] From 9b3f7c5bf96b7df6b3addc722dd2e710f70e0569 Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Thu, 14 Apr 2022 20:59:33 +0200 Subject: [PATCH 2/2] Apply scalafmt --- .../paradox/dependencies/ParadoxDependenciesPlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/lightbend/paradox/dependencies/ParadoxDependenciesPlugin.scala b/src/main/scala/com/lightbend/paradox/dependencies/ParadoxDependenciesPlugin.scala index 047884c..3e91f51 100644 --- a/src/main/scala/com/lightbend/paradox/dependencies/ParadoxDependenciesPlugin.scala +++ b/src/main/scala/com/lightbend/paradox/dependencies/ParadoxDependenciesPlugin.scala @@ -60,7 +60,7 @@ object ParadoxDependenciesPlugin extends AutoPlugin { new DependenciesDirective(paradoxDependenciesShowLicenses.value)(projectId => trees.get(projectId) match { case Some(deps) => deps - case _ => throw new Error(s"Could not retrieve dependency information for project [$projectId]") + case _ => throw new Error(s"Could not retrieve dependency information for project [$projectId]") } ) }