Merge pull request #356 from scala-steward/update/scalafmt-core-2.6.2

Update scalafmt-core to 2.6.2
playframework · Jul 6, 2020 · c0be99b · c0be99b
2 parents 602db45 + f764da7
commit c0be99b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.5.3
+version = 2.6.2
 
 align.preset = true
 danglingParentheses.preset = true

diff --git 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
@@ -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.
    */