Merge pull request #194 from alexarchambault/fix-scalafmt-scalafix

Fix scalafmt / scalafix
VirtusLab · Oct 7, 2021 · 936ef0a · 936ef0a
2 parents b974ead + 8c5810e
commit 936ef0a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -6,6 +6,8 @@ rules  = [
   ProcedureSyntax
 ]
 DisableSyntax.noFinalize = true
+DisableSyntax.noIsInstanceOf = true
+DisableSyntax.noReturns = true
 
 // `rules` on compilation
 triggered.rules = [

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -12,9 +12,6 @@ newlines.beforeMultiline = keep
 newlines.afterCurlyLambdaParams = keep
 newlines.alwaysBeforeElseAfterCurlyIf = true
 
-DisableSyntax.noIsInstanceOf = true
-DisableSyntax.noReturns = true
-
 runner.dialect = scala213
 
 rewrite.rules = [
@@ -44,6 +41,9 @@ fileOverride {
   "glob:**/docs_checker/**" {
     runner.dialect = scala3
   }
+  "glob:**/gifs/**" {
+    runner.dialect = scala3
+  }
 }
 project.excludeFilters = [
   ".metals"

diff --git a/gifs/create_missing.sc b/gifs/create_missing.sc
@@ -2,14 +2,13 @@
 
 import $ivy.`com.lihaoyi::os-lib:0.7.8`
 
-/**
- * Small and handy script to generate stubs for .svg files with nice TODO
- */
+/** Small and handy script to generate stubs for .svg files with nice TODO
+  */
 
-val content = os.read(os.pwd/"website"/"src"/"components"/"features.js")
-val Image = """.*image="([^ ]+)" +(title="(.+)")?.*""".r
-def needStub(name: String) = 
-  !os.exists(os.pwd/"website"/"static"/"img"/name) && name.endsWith(".svg")
+val content = os.read(os.pwd / "website" / "src" / "components" / "features.js")
+val Image   = """.*image="([^ ]+)" +(title="(.+)")?.*""".r
+def needStub(name: String) =
+  !os.exists(os.pwd / "website" / "static" / "img" / name) && name.endsWith(".svg")
 
 // Look for missing .svg files in out feature list
 val stubs = content.linesIterator.collect {
@@ -28,16 +27,15 @@ val stubs = content.linesIterator.collect {
 //   ("demo", "general demo of Scala CLI"),
 // )
 
-if stubs.nonEmpty then 
-  val scriptBase = os.read(os.pwd/"gifs"/"example.sh")
+if stubs.nonEmpty then
+  val scriptBase = os.read(os.pwd / "gifs" / "example.sh")
   stubs.foreach { case (imageName, desc) =>
     val scriptName = imageName.stripSuffix(".svg") + ".sh"
-    val dest = os.pwd/"gifs"/"scenarios"/scriptName
-    val fullDescr = s"TODO: turn gifs/scenarios/$scriptName into proper scenario $desc"
+    val dest       = os.pwd / "gifs" / "scenarios" / scriptName
+    val fullDescr  = s"TODO: turn gifs/scenarios/$scriptName into proper scenario $desc"
     os.write.over(dest, scriptBase.replace("<description>", fullDescr))
     os.perms.set(dest, "rwxr-xr-x")
     println(s"Wrote: $dest")
   }
   val names = stubs.map(_._1.stripSuffix(".svg")).mkString(" ")
   println(s"To generate svg files run: 'gifs/generate_gif.sh $names'")
-
diff --git a/modules/bloop-rifle/src/main/scala/scala/build/blooprifle/internal/Operations.scala b/modules/bloop-rifle/src/main/scala/scala/build/blooprifle/internal/Operations.scala
@@ -235,10 +235,8 @@ object Operations {
                   }
                 }
                 catch {
-                  case ex: IOException
-                      if ex.getCause.isInstanceOf[NativeErrorException] &&
-                        ignoredErrnos(ex.getCause.asInstanceOf[NativeErrorException].returnCode) =>
-                    logger.debug(s"Error when connecting to $socketFile: ${ex.getMessage}")
+                  case ExCause(ex0: NativeErrorException) if ignoredErrnos(ex0.returnCode) =>
+                    logger.debug(s"Error when connecting to $socketFile: ${ex0.getMessage}")
                     null
                   case e: NativeErrorException if ignoredErrnos(e.returnCode) =>
                     logger.debug(s"Error when connecting to $socketFile: ${e.getMessage}")
@@ -377,4 +375,9 @@ object Operations {
 
     Await.result(p.future, duration)
   }
+
+  private object ExCause {
+    def unapply(ex: Throwable): Option[Throwable] =
+      Option(ex.getCause)
+  }
 }
diff --git a/modules/tasty-lib/src/main/scala/scala/build/tastylib/TastyName.scala b/modules/tasty-lib/src/main/scala/scala/build/tastylib/TastyName.scala
@@ -158,7 +158,10 @@ sealed abstract class TastyName extends Product with Serializable { self =>
 
   final override def toString: String = source
 
-  final def isObjectName: Boolean = self.isInstanceOf[ObjectName]
+  final def isObjectName: Boolean = self match {
+    case _: ObjectName => true
+    case _             => false
+  }
 
   final def asSimpleName: SimpleName = self match {
     case self: SimpleName => self