From ecd59bd3e16f54b0ea5350aede77a18e43c862ed Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 22 Oct 2022 17:55:52 -0400
Subject: [PATCH] Scalafmt 3.6.0

---
 .scalafmt.conf                                |  2 +-
 .../sbt/internal/graph/rendering/DOT.scala    | 39 +++++++------------
 .../sbt/internal/server/NetworkChannel.scala  | 10 +++--
 .../sbt/plugins/DependencyTreeSettings.scala  |  4 +-
 4 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 6c3fcac3c..fe53f4b85 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.5.2
+version = 3.6.0
 runner.dialect = scala3
 
 maxColumn = 100
diff --git a/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala b/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala
index 5c7dae6c9..84b972427 100644
--- a/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala
+++ b/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala
@@ -10,7 +10,7 @@ package internal
 package graph
 package rendering
 
-object DOT {
+object DOT:
   val EvictedStyle = "dashed"
 
   def dotGraph(
@@ -18,8 +18,8 @@ object DOT {
       dotHead: String,
       nodeFormation: (String, String, String) => String,
       labelRendering: HTMLLabelRendering,
-      colors: Boolean
-  ): String = {
+      colors: Boolean,
+  ): String =
     val nodes = {
       for (n <- graph.nodes) yield {
         val label = nodeFormation(n.id.organization, n.id.name, n.id.version)
@@ -27,9 +27,9 @@ object DOT {
         val penwidth = if (n.isEvicted) "3" else "5"
         val color = if (colors) {
           val orgHash = n.id.organization.hashCode
-          val r = (orgHash >> 16) & 0xFF
-          val g = (orgHash >> 8) & 0xFF
-          val b = (orgHash >> 0) & 0xFF
+          val r = (orgHash >> 16) & 0xff
+          val g = (orgHash >> 8) & 0xff
+          val b = (orgHash >> 0) & 0xff
           val r1 = (r * 0.90).toInt
           val g1 = (g * 0.90).toInt
           val b1 = (b * 0.90).toInt
@@ -79,24 +79,11 @@ object DOT {
     }.sorted.mkString("\n")
 
     s"$dotHead\n$nodes\n$edges\n}"
-  }
 
-  sealed trait HTMLLabelRendering {
-    def renderLabel(labelText: String): String
-  }
-
-  /**
-   *  Render HTML labels in Angle brackets as defined at http://graphviz.org/content/node-shapes#html
-   */
-  case object AngleBrackets extends HTMLLabelRendering {
-    def renderLabel(labelText: String): String = s"label=<$labelText>"
-  }
-
-  /**
-   * Render HTML labels with `labelType="html"` and label content in double quotes as supported by
-   * dagre-d3
-   */
-  case object LabelTypeHtml extends HTMLLabelRendering {
-    def renderLabel(labelText: String): String = s"""labelType="html" label="$labelText""""
-  }
-}
+  enum HTMLLabelRendering:
+    case AngleBrackets
+    case LabelTypeHtml
+    def renderLabel(labelText: String): String = this match
+      case AngleBrackets => s"label=<$labelText>"
+      case LabelTypeHtml => s"""labelType="html" label="$labelText""""
+end DOT
diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
index aef920e50..e88978316 100644
--- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
+++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
@@ -851,10 +851,12 @@ final class NetworkChannel(
     override def getStringCapability(capability: String): String =
       getCapability(
         TerminalCapabilitiesQuery(boolean = None, numeric = None, string = Some(capability)),
-        _.string.flatMap {
-          case "null" => None
-          case s      => Some(s)
-        }.orNull
+        _.string
+          .flatMap {
+            case "null" => None
+            case s      => Some(s)
+          }
+          .orNull
       ).getOrElse("")
 
     override private[sbt] def getAttributes: Map[String, String] =
diff --git a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala
index c2b24c4d5..90024c4c0 100644
--- a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala
+++ b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala
@@ -110,7 +110,7 @@ object DependencyTreeSettings {
         dependencyTreeModuleGraph0.value,
         dependencyDotHeader.value,
         dependencyDotNodeLabel.value,
-        rendering.DOT.AngleBrackets,
+        rendering.DOT.HTMLLabelRendering.AngleBrackets,
         dependencyDotNodeColors.value
       ),
       dependencyDot := writeToFile(dependencyDot / asString, dependencyDotFile).value,
@@ -195,7 +195,7 @@ object DependencyTreeSettings {
         graph,
         dependencyDotHeader.value,
         dependencyDotNodeLabel.value,
-        rendering.DOT.AngleBrackets,
+        rendering.DOT.HTMLLabelRendering.AngleBrackets,
         dependencyDotNodeColors.value
       )
       val link = DagreHTML.createLink(dotGraph, target.value)