Fix typo, small formatting and naming refactor

twitter · Aug 23, 2019 · 90d63a1 · 90d63a1
1 parent dab0784
commit 90d63a1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/check/src/main/scala/rsc/checkscalasig/Checker.scala b/check/src/main/scala/rsc/checkscalasig/Checker.scala
@@ -24,7 +24,7 @@ class Checker(settings: Settings, nscResult: Path, rscResult: Path)
   private def symbols(scalasig: Scalasig): Map[Id, EmbeddedSymbol] =
     scalasig.symbols.map(sym => sym.id -> sym).toMap
 
-  private def resStr(sig: ScalasigResult): Option[(String, Map[Id, EmbeddedSymbol])] = {
+  private def resultSyms(sig: ScalasigResult): Option[(String, Map[Id, EmbeddedSymbol])] = {
     sig match {
       case ParsedScalasig(_, _, scalasig) => Some(scalasig.name -> symbols(scalasig))
       case _ => None
@@ -33,11 +33,8 @@ class Checker(settings: Settings, nscResult: Path, rscResult: Path)
 
   def check(): Unit = {
 
-    val ns1: Scalasig = Scalasigs.list(nscResult)(1).asInstanceOf[ParsedScalasig].scalasig
-    val rs1: Scalasig = Scalasigs.list(rscResult)(1).asInstanceOf[ParsedScalasig].scalasig
-
-    val nscSigs = Scalasigs.list(nscResult).flatMap(resStr).toMap
-    val rscSigs = Scalasigs.list(rscResult).flatMap(resStr).toMap
+    val nscSigs = Scalasigs.list(nscResult).flatMap(resultSyms).toMap
+    val rscSigs = Scalasigs.list(rscResult).flatMap(resultSyms).toMap
 
     assert(nscSigs.keySet == rscSigs.keySet)
 
@@ -47,9 +44,9 @@ class Checker(settings: Settings, nscResult: Path, rscResult: Path)
     nscSigs.foreach {
       case (k, nscSyms) =>
         val rscSyms = rscSigs(k)
-
+
+        val nscSymStrs = nscSyms.mapValues(_.toString)
         val rscSymStrs = rscSyms.mapValues(_.toString)
-        val nscSymStrs = rscSyms.mapValues(_.toString)
 
         if (settings.saveOutput) {
           nscTexts.prepend(nscSymStrs.mkString("\n"))
@@ -59,7 +56,6 @@ class Checker(settings: Settings, nscResult: Path, rscResult: Path)
         val relevant_ids = (nscSymStrs.keySet ++ rscSymStrs.keySet).toList.sorted
 
         relevant_ids.foreach { id =>
-
           val nscString = nscSymStrs.getOrElse(id, "")
           val rscString = rscSymStrs.getOrElse(id, "")
 

diff --git a/check/src/main/scala/rsc/checkscalasig/Main.scala b/check/src/main/scala/rsc/checkscalasig/Main.scala
@@ -2,7 +2,6 @@ package rsc.checkscalasig
 
 import java.nio.file.Path
 import _root_.rsc.checkbase.{SimpleBase, ToolResult}
-import rsc.checkscalasig.Settings.ClassFiles
 
 /**
  * Example invocation (in sbt):

diff --git a/check/src/main/scala/rsc/checkscalasig/Settings.scala b/check/src/main/scala/rsc/checkscalasig/Settings.scala
@@ -3,19 +3,19 @@ package rsc.checkscalasig
 import java.io.File.pathSeparator
 import java.nio.file.{Path, Paths}
 import rsc.checkbase.SettingsBase
-import rsc.checkscalasig.Settings.ClassFiles
+import rsc.checkscalasig.Settings.ClassfilesPath
 
 final case class Settings(
     cp: List[Path] = Nil,
     ins: List[Path] = Nil,
     quiet: Boolean = false,
     saveOutput: Boolean = false,
-    classfiles: ClassFiles = ClassFiles(None, None)
+    classfiles: ClassfilesPath = ClassfilesPath(None, None)
 ) extends SettingsBase
 
 object Settings {
 
-  final case class ClassFiles(rsc: Option[Path], nsc: Option[Path])
+  final case class ClassfilesPath(rsc: Option[Path], nsc: Option[Path])
 
   private def pathsFor(pathStr: String): List[Path] =
     pathStr.split(pathSeparator).map(s => Paths.get(s)).toList
@@ -31,7 +31,10 @@ object Settings {
         case "--classfiles" +: rsc_path +: nsc_path +: Nil =>
           val rsc_files = Paths.get(rsc_path)
           val nsc_files = Paths.get(nsc_path)
-          loop(settings.copy(classfiles = ClassFiles(Some(rsc_files), Some(nsc_files))), true, Nil)
+          loop(
+            settings.copy(classfiles = ClassfilesPath(Some(rsc_files), Some(nsc_files))),
+            true,
+            Nil)
         case "--classpath" +: s_cp +: rest if allowOptions =>
           val cp = pathsFor(s_cp)
           loop(settings.copy(cp = settings.cp ++ cp), true, rest)