From 7cfc678d4d852d12470ab7e5037659eb1b45caef Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 29 Oct 2021 20:15:44 +0200 Subject: [PATCH 1/2] Update scalafmt-core to 3.0.8 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e62e16e5..be99fc60 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.0" +version = "3.0.8" align = some align { arrowEnumeratorGenerator = false From 2ecdae1601fd8e21a1fa67daad970b0e6251c870 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 29 Oct 2021 20:15:58 +0200 Subject: [PATCH 2/2] Reformat with scalafmt 3.0.8 --- .../org/scalastyle/scalariform/ClassNamesChecker.scala | 10 +++++----- .../org/scalastyle/scalariform/ScalaDocChecker.scala | 2 +- src/test/resources/testDir/dirA/X.scala | 1 + src/test/resources/testDir/dirB/Y.scala | 1 + src/test/resources/testDir/dirB/Z.scala | 1 + src/test/resources/testfiles/EmptyClass.scala | 1 + 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/scala/org/scalastyle/scalariform/ClassNamesChecker.scala b/src/main/scala/org/scalastyle/scalariform/ClassNamesChecker.scala index 038c71de..5930dd3d 100644 --- a/src/main/scala/org/scalastyle/scalariform/ClassNamesChecker.scala +++ b/src/main/scala/org/scalastyle/scalariform/ClassNamesChecker.scala @@ -229,9 +229,9 @@ class FieldNamesChecker extends ScalariformChecker { ast: Any ): List[ScalastyleError] = { ast match { - //object Name { ... } + // object Name { ... } case TmplDef(List(Token(OBJECT, _, _, _)), _, _, _, _, _, _, Some(TemplateBody(_, _, stats, _))) => - //go through all first-level val declarations and apply objectFieldRegex + // go through all first-level val declarations and apply objectFieldRegex stats.immediateChildren.flatMap(stat => stat match { case FullDefOrDcl(_, _, PatDefOrDcl(Token(tokenType, _, _, _), expr, _, _, _)) @@ -242,17 +242,17 @@ class FieldNamesChecker extends ScalariformChecker { } ) - //val ... = + // val ... = case PatDefOrDcl(Token(tokenType, _, _, _), expr, _, _, _) if tokenType == VAL || tokenType == VAR => VisitorHelper.visit(expr, localVisit(regex, objectFieldRegex, inValDef = true)) // don't descend into type elements case tee: TypeExprElement => Nil - //destructuring start - val name(... + // destructuring start - val name(... case GeneralTokens(List(Token(VARID, _, _, _), Token(LPAREN, _, _, _))) if inValDef => Nil - //actual name check + // actual name check case GeneralTokens(List(Token(VARID, name, offset, _))) if inValDef && regex.findAllIn(name).isEmpty => List(PositionError(offset, List(regex.toString))) diff --git a/src/main/scala/org/scalastyle/scalariform/ScalaDocChecker.scala b/src/main/scala/org/scalastyle/scalariform/ScalaDocChecker.scala index 19db632b..0b937a97 100644 --- a/src/main/scala/org/scalastyle/scalariform/ScalaDocChecker.scala +++ b/src/main/scala/org/scalastyle/scalariform/ScalaDocChecker.scala @@ -163,7 +163,7 @@ class ScalaDocChecker extends CombinedChecker { ): List[ScalastyleError] = { def tparams(xs: List[Token], bracketDepth: Int): List[String] = if (bracketDepth > 1) { - //skip nested type params + // skip nested type params xs match { case Token(Tokens.RBRACKET, _, _, _) :: t => tparams(t, bracketDepth - 1) case _ :: t => tparams(t, bracketDepth) diff --git a/src/test/resources/testDir/dirA/X.scala b/src/test/resources/testDir/dirA/X.scala index e69de29b..8b137891 100644 --- a/src/test/resources/testDir/dirA/X.scala +++ b/src/test/resources/testDir/dirA/X.scala @@ -0,0 +1 @@ + diff --git a/src/test/resources/testDir/dirB/Y.scala b/src/test/resources/testDir/dirB/Y.scala index e69de29b..8b137891 100644 --- a/src/test/resources/testDir/dirB/Y.scala +++ b/src/test/resources/testDir/dirB/Y.scala @@ -0,0 +1 @@ + diff --git a/src/test/resources/testDir/dirB/Z.scala b/src/test/resources/testDir/dirB/Z.scala index e69de29b..8b137891 100644 --- a/src/test/resources/testDir/dirB/Z.scala +++ b/src/test/resources/testDir/dirB/Z.scala @@ -0,0 +1 @@ + diff --git a/src/test/resources/testfiles/EmptyClass.scala b/src/test/resources/testfiles/EmptyClass.scala index e69de29b..8b137891 100644 --- a/src/test/resources/testfiles/EmptyClass.scala +++ b/src/test/resources/testfiles/EmptyClass.scala @@ -0,0 +1 @@ +