I like aligned things

martijnhoekstra · Aug 16, 2017 · ab20bba · ab20bba
1 parent 0e932c4
commit ab20bba
Show file tree

Hide file tree

Showing 55 changed files with 1,163 additions and 900 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -2,7 +2,13 @@ align.tokens = [
   {code="=>",owner="Case"}    
   "%"   
   "%%"    
-  "%%%"   
+  "%%%"
+  "="
+  {code="<-",owner="For"}
 ]
 
+align.arrowEnumeratorGenerator = true
+
+align.openParenCallSite = true
+
 maxColumn = 120
diff --git a/build.sbt b/build.sbt
@@ -13,10 +13,10 @@ scmInfo := Some(
 
 developers := List(
   Developer(
-    id    = "MartijnHoekstra",
-    name  = "Martijn Hoekstra",
+    id = "MartijnHoekstra",
+    name = "Martijn Hoekstra",
     email = "Martijnhoekstra@gmail.com",
-    url   = url("https://github.com/martijnhoekstra")
+    url = url("https://github.com/martijnhoekstra")
   )
 )
 
@@ -27,7 +27,7 @@ publishTo := {
   if (isSnapshot.value)
     Some("snapshots" at nexus + "content/repositories/snapshots")
   else
-    Some("releases"  at nexus + "service/local/staging/deploy/maven2")
+    Some("releases" at nexus + "service/local/staging/deploy/maven2")
 }
 
 organization := "com.heroestools"
@@ -38,52 +38,53 @@ version := "0.0.4-SNAPSHOT"
 
 scalaVersion := "2.12.3"
 
-scalacOptions ++=  List(
-  "-deprecation",                      // Emit warning and location for usages of deprecated APIs.
-  "-encoding", "utf-8",                // Specify character encoding used by source files.
-  "-explaintypes",                     // Explain type errors in more detail.
-  "-feature",                          // Emit warning and location for usages of features that should be imported explicitly.
-  "-language:existentials",            // Existential types (besides wildcard types) can be written and inferred
-  "-language:experimental.macros",     // Allow macro definition (besides implementation and application)
-  "-language:higherKinds",             // Allow higher-kinded types
-  "-language:implicitConversions",     // Allow definition of implicit functions called views
-  "-unchecked",                        // Enable additional warnings where generated code depends on assumptions.
-  "-Xcheckinit",                       // Wrap field accessors to throw an exception on uninitialized access.
-  "-Xfatal-warnings",                  // Fail the compilation if there are any warnings.
-  "-Xfuture",                          // Turn on future language features.
-  "-Xlint:adapted-args",               // Warn if an argument list is modified to match the receiver.
-  "-Xlint:by-name-right-associative",  // By-name parameter of right associative operator.
-  "-Xlint:constant",                   // Evaluation of a constant arithmetic expression results in an error.
-  "-Xlint:delayedinit-select",         // Selecting member of DelayedInit.
-  "-Xlint:doc-detached",               // A Scaladoc comment appears to be detached from its element.
-  "-Xlint:inaccessible",               // Warn about inaccessible types in method signatures.
-  "-Xlint:infer-any",                  // Warn when a type argument is inferred to be `Any`.
-  "-Xlint:missing-interpolator",       // A string literal appears to be missing an interpolator id.
-  "-Xlint:nullary-override",           // Warn when non-nullary `def f()' overrides nullary `def f'.
-  "-Xlint:nullary-unit",               // Warn when nullary methods return Unit.
-  "-Xlint:option-implicit",            // Option.apply used implicit view.
-  "-Xlint:package-object-classes",     // Class or object defined in package object.
-  "-Xlint:poly-implicit-overload",     // Parameterized overloaded implicit methods are not visible as view bounds.
-  "-Xlint:private-shadow",             // A private field (or class parameter) shadows a superclass field.
-  "-Xlint:stars-align",                // Pattern sequence wildcard must align with sequence component.
-  "-Xlint:type-parameter-shadow",      // A local type parameter shadows a type already in scope.
-  "-Xlint:unsound-match",              // Pattern match may not be typesafe.
-  "-Yno-adapted-args",                 // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
-  "-Ypartial-unification",             // Enable partial unification in type constructor inference
-  "-Ywarn-dead-code",                  // Warn when dead code is identified.
-  "-Ywarn-extra-implicit",             // Warn when more than one implicit parameter section is defined.
-  "-Ywarn-inaccessible",               // Warn about inaccessible types in method signatures.
-  "-Ywarn-infer-any",                  // Warn when a type argument is inferred to be `Any`.
-  "-Ywarn-nullary-override",           // Warn when non-nullary `def f()' overrides nullary `def f'.
-  "-Ywarn-nullary-unit",               // Warn when nullary methods return Unit.
-  "-Ywarn-numeric-widen",              // Warn when numerics are widened.
-  "-Ywarn-unused:implicits",           // Warn if an implicit parameter is unused.
-  "-Ywarn-unused:imports",             // Warn if an import selector is not referenced.
-  "-Ywarn-unused:locals",              // Warn if a local definition is unused.
-  "-Ywarn-unused:params",              // Warn if a value parameter is unused.
-  "-Ywarn-unused:patvars",             // Warn if a variable bound in a pattern is unused.
-  "-Ywarn-unused:privates",            // Warn if a private member is unused.
-  "-Ywarn-value-discard"               // Warn when non-Unit expression results are unused.
+scalacOptions ++= List(
+  "-deprecation", // Emit warning and location for usages of deprecated APIs.
+  "-encoding",
+  "utf-8", // Specify character encoding used by source files.
+  "-explaintypes", // Explain type errors in more detail.
+  "-feature", // Emit warning and location for usages of features that should be imported explicitly.
+  "-language:existentials", // Existential types (besides wildcard types) can be written and inferred
+  "-language:experimental.macros", // Allow macro definition (besides implementation and application)
+  "-language:higherKinds", // Allow higher-kinded types
+  "-language:implicitConversions", // Allow definition of implicit functions called views
+  "-unchecked", // Enable additional warnings where generated code depends on assumptions.
+  "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access.
+  "-Xfatal-warnings", // Fail the compilation if there are any warnings.
+  "-Xfuture", // Turn on future language features.
+  "-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver.
+  "-Xlint:by-name-right-associative", // By-name parameter of right associative operator.
+  "-Xlint:constant", // Evaluation of a constant arithmetic expression results in an error.
+  "-Xlint:delayedinit-select", // Selecting member of DelayedInit.
+  "-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element.
+  "-Xlint:inaccessible", // Warn about inaccessible types in method signatures.
+  "-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`.
+  "-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id.
+  "-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
+  "-Xlint:nullary-unit", // Warn when nullary methods return Unit.
+  "-Xlint:option-implicit", // Option.apply used implicit view.
+  "-Xlint:package-object-classes", // Class or object defined in package object.
+  "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds.
+  "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field.
+  "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component.
+  "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope.
+  "-Xlint:unsound-match", // Pattern match may not be typesafe.
+  "-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
+  "-Ypartial-unification", // Enable partial unification in type constructor inference
+  "-Ywarn-dead-code", // Warn when dead code is identified.
+  "-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined.
+  "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures.
+  "-Ywarn-infer-any", // Warn when a type argument is inferred to be `Any`.
+  "-Ywarn-nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
+  "-Ywarn-nullary-unit", // Warn when nullary methods return Unit.
+  "-Ywarn-numeric-widen", // Warn when numerics are widened.
+  "-Ywarn-unused:implicits", // Warn if an implicit parameter is unused.
+  "-Ywarn-unused:imports", // Warn if an import selector is not referenced.
+  "-Ywarn-unused:locals", // Warn if a local definition is unused.
+  "-Ywarn-unused:params", // Warn if a value parameter is unused.
+  "-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused.
+  "-Ywarn-unused:privates", // Warn if a private member is unused.
+  "-Ywarn-value-discard" // Warn when non-Unit expression results are unused.
 )
 
 addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
@@ -121,10 +122,10 @@ val matryoshkaDependencies = List(
 
 val simulacrumDependencies = List("com.github.mpilquist" %% "simulacrum" % "0.10.0")
 
-libraryDependencies ++= 
-  circeDependencies      ++
-  fs2httpDependencies    ++
-  matryoshkaDependencies ++
-  catsDependencies       ++
-  simulacrumDependencies ++
-  testDependencies
+libraryDependencies ++=
+  circeDependencies ++
+    fs2httpDependencies ++
+    matryoshkaDependencies ++
+    catsDependencies ++
+    simulacrumDependencies ++
+    testDependencies
diff --git a/src/main/scala/DefaultResources.scala b/src/main/scala/DefaultResources.scala
@@ -3,15 +3,16 @@ package masterleague4s
 import java.nio.channels.AsynchronousChannelGroup
 import java.util.concurrent.Executors
 
-import fs2.{ Scheduler, Strategy }
+import fs2.{Scheduler, Strategy}
 
 object DefaultResources {
 
   val ES = Executors.newCachedThreadPool(Strategy.daemonThreadFactory("AG"))
 
   implicit val S = Strategy.fromExecutor(ES)
 
-  implicit val Sch = Scheduler.fromScheduledExecutorService(Executors.newScheduledThreadPool(4, Strategy.daemonThreadFactory("S")))
+  implicit val Sch =
+    Scheduler.fromScheduledExecutorService(Executors.newScheduledThreadPool(4, Strategy.daemonThreadFactory("S")))
 
   implicit val AG = AsynchronousChannelGroup.withThreadPool(ES)
 

diff --git a/src/main/scala/Runner.scala b/src/main/scala/Runner.scala
@@ -44,14 +44,14 @@ object Runner {
       case Left(err) => List(s"error: $err")
       case Right(m) => m.toList.map { case (id, _) => s"Match #$id" }
     }) foreach println
-*/
+     */
     /*
     println("PLAYERS:")
     (allPlayers[Task].unsafeAttemptRun match {
       case Left(err) => List(s"error: $err")
       case Right(m) => m.toList.map { case (id, player) => s"Player #$id is ${player.nickname}" }
     }) foreach println
-    */
+     */
     /*
     val matchlist = allMatches[Task](credentials).unsafeAttemptRun match {
       case Left(err) => { println(err); List() }
@@ -66,7 +66,7 @@ object Runner {
     println("ETC in HGC Europe - Open Division")
     val tournystatsstats = masterleague4s.stats.Stats.forHeroInTourny(21l, 35l, matchlist)
     tournystatsstats.pretty.foreach(println)
-    */
+     */
 
     println("HEROES (Specialists):")
     import masterleague4s.net.filters._
@@ -91,8 +91,8 @@ object Runner {
       case Right(m) => m.toList.map { case (id, team) => s"Team #$id is ${team.name}" }
     }) foreach println
 
-  
-  
+
+
     println("REGIONS:")
     (regions.unsafeAttemptRun match {
       case Left(err) => List(s"error: $err")
@@ -121,6 +121,6 @@ object Runner {
       case Right(Left(thr)) => List(s"error: $thr")
       case Right(Right(l)) => l.map { entry => s"an event occurs at ${entry.date.atOffset(ZoneOffset.UTC)}" }
     }) foreach println
-*/
+   */
   }
-}
+}