aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-03-29 10:47:21 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2017-04-02 02:43:39 -0400
commit8016298a6ae89ed1c8a45bde87411db4a2daf86f (patch)
tree6641b80a95bffaf37f0ff89b91f6ec2dc7bb0643 /libraries
parent1cd9cdd449a5b1286f67f516ba0b9874161b8277 (diff)
downloadcbt-8016298a6ae89ed1c8a45bde87411db4a2daf86f.tar.gz
cbt-8016298a6ae89ed1c8a45bde87411db4a2daf86f.tar.bz2
cbt-8016298a6ae89ed1c8a45bde87411db4a2daf86f.zip
use scalariform from github master which fixes indentation bug
Diffstat (limited to 'libraries')
-rw-r--r--libraries/file/file.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/libraries/file/file.scala b/libraries/file/file.scala
index f20c9a8..900e9ec 100644
--- a/libraries/file/file.scala
+++ b/libraries/file/file.scala
@@ -83,12 +83,12 @@ trait Module {
val duplicateFiles = ( relatives diff relatives.distinct ).distinct
assert(
duplicateFiles.isEmpty, {
- val rs = relatives.toSet
- "Conflicting:\n\n" +
- map.filter( rs contains _._2 ).groupBy( _._2 ).mapValues( _.map( _._1 ).sorted ).toSeq.sortBy( _._1 ).map {
- case ( name, files ) => s"$name:\n" ++ files.mkString( "\n" )
- }.mkString( "\n\n" )
- }
+ val rs = relatives.toSet
+ "Conflicting:\n\n" +
+ map.filter( rs contains _._2 ).groupBy( _._2 ).mapValues( _.map( _._1 ).sorted ).toSeq.sortBy( _._1 ).map {
+ case ( name, files ) => s"$name:\n" ++ files.mkString( "\n" )
+ }.mkString( "\n\n" )
+ }
)
}
map