From d4920fae66afb09c8f54719c9614b2255b6b6df2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 5 Jul 2020 19:15:35 +0200 Subject: [PATCH 1/2] Update scalafmt-core to 2.6.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 6cf46bd0..bc3a4570 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 2.5.3 +version = 2.6.2 align.preset = true danglingParentheses.preset = true From f764da75038ff96c3527fdd1f9c5e08ecdb65e92 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 6 Jul 2020 10:12:08 +0200 Subject: [PATCH 2/2] scalafmt --- .../src/main/scala/play/twirl/api/TwirlHelperImports.scala | 2 +- parser/src/main/scala/play/twirl/parser/TwirlParser.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/shared/src/main/scala/play/twirl/api/TwirlHelperImports.scala b/api/shared/src/main/scala/play/twirl/api/TwirlHelperImports.scala index 1cf9b731..ac9a81df 100644 --- a/api/shared/src/main/scala/play/twirl/api/TwirlHelperImports.scala +++ b/api/shared/src/main/scala/play/twirl/api/TwirlHelperImports.scala @@ -16,7 +16,7 @@ object TwirlHelperImports { x.asScala } - /** Allows inline formatting of java.util.Date */ + /** Allows inline formatting of java.util.Date */ implicit class TwirlRichDate(date: java.util.Date) { def format(pattern: String): String = { new java.text.SimpleDateFormat(pattern).format(date) diff --git a/parser/src/main/scala/play/twirl/parser/TwirlParser.scala b/parser/src/main/scala/play/twirl/parser/TwirlParser.scala index c34ef5a8..ba972a4e 100644 --- a/parser/src/main/scala/play/twirl/parser/TwirlParser.scala +++ b/parser/src/main/scala/play/twirl/parser/TwirlParser.scala @@ -252,7 +252,8 @@ class TwirlParser(val shouldParseInclusiveDot: Boolean) { positional } - /** Recursively match pairs of prefixes and suffixes and return the consumed characters + /** + * Recursively match pairs of prefixes and suffixes and return the consumed characters * * Terminates at EOF. */