diff options
| author | rockjam <rockjam@actor.im> | 2016-09-19 15:08:11 +0300 |
|---|---|---|
| committer | rockjam <rockjam@actor.im> | 2016-09-19 15:08:11 +0300 |
| commit | 8981e35d7eb7066ee8cb2a5777d4c83e1986696d (patch) | |
| tree | d82283cbc267dac5d13499a32f24c796e30d60e4 /plugins/scalafmt | |
| parent | 0ec1d01e7c99ee6cea1d7a0be956d1845a3721d6 (diff) | |
| download | cbt-8981e35d7eb7066ee8cb2a5777d4c83e1986696d.tar.gz cbt-8981e35d7eb7066ee8cb2a5777d4c83e1986696d.tar.bz2 cbt-8981e35d7eb7066ee8cb2a5777d4c83e1986696d.zip | |
Upgrade scalafmt 0.2.5 -> 0.3.1
Diffstat (limited to 'plugins/scalafmt')
| -rw-r--r-- | plugins/scalafmt/Scalafmt.scala | 5 | ||||
| -rw-r--r-- | plugins/scalafmt/build/build.scala | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/scalafmt/Scalafmt.scala b/plugins/scalafmt/Scalafmt.scala index 94670cb..a1c7a0d 100644 --- a/plugins/scalafmt/Scalafmt.scala +++ b/plugins/scalafmt/Scalafmt.scala @@ -1,5 +1,6 @@ package cbt +import org.scalafmt.Error.Incomplete import org.scalafmt.{FormatResult, ScalafmtStyle} import java.io.File @@ -41,10 +42,10 @@ object Scalafmt { write(path, formatted.getBytes) reformattedCount += 1 } + case FormatResult.Failure(e: Incomplete) => + System.err.println(s"Couldn't complete file reformat: $path") case FormatResult.Failure(e) => System.err.println(s"Failed to format file: $path, cause: ${e}") - case FormatResult.Incomplete(e) => - System.err.println(s"Couldn't complete file reformat: $path") } } } diff --git a/plugins/scalafmt/build/build.scala b/plugins/scalafmt/build/build.scala index e8ce270..0d4900c 100644 --- a/plugins/scalafmt/build/build.scala +++ b/plugins/scalafmt/build/build.scala @@ -4,6 +4,6 @@ class Build(val context: Context) extends Plugin { override def dependencies = super.dependencies ++ Resolver( mavenCentral ).bind( - ScalaDependency("com.geirsson", "scalafmt", "0.2.5") + ScalaDependency("com.geirsson", "scalafmt", "0.3.1") ) } |