luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scalafmt 3.6.0

This commit is contained in:
Eugene Yokota 2022-10-22 17:55:52 -04:00
parent 20420b9f75
commit ecd59bd3e1
4 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.scalafmt.conf
View File

@ -1,4 +1,4 @@
version = 3.5.2 version = 3.6.0
runner.dialect = scala3 runner.dialect = scala3
maxColumn = 100 maxColumn = 100

39
main/src/main/scala/sbt/internal/graph/rendering/DOT.scala
View File

@ -10,7 +10,7 @@ package internal
package graph package graph
package rendering package rendering
object DOT { object DOT:
val EvictedStyle = "dashed" val EvictedStyle = "dashed"
def dotGraph( def dotGraph(
@ -18,8 +18,8 @@ object DOT {
dotHead: String, dotHead: String,
nodeFormation: (String, String, String) => String, nodeFormation: (String, String, String) => String,
labelRendering: HTMLLabelRendering, labelRendering: HTMLLabelRendering,
colors: Boolean colors: Boolean,
): String = { ): String =
val nodes = { val nodes = {
for (n <- graph.nodes) yield { for (n <- graph.nodes) yield {
val label = nodeFormation(n.id.organization, n.id.name, n.id.version) 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 penwidth = if (n.isEvicted) "3" else "5"
val color = if (colors) { val color = if (colors) {
val orgHash = n.id.organization.hashCode val orgHash = n.id.organization.hashCode
val r = (orgHash >> 16) & 0xFF val r = (orgHash >> 16) & 0xff
val g = (orgHash >> 8) & 0xFF val g = (orgHash >> 8) & 0xff
val b = (orgHash >> 0) & 0xFF val b = (orgHash >> 0) & 0xff
val r1 = (r * 0.90).toInt val r1 = (r * 0.90).toInt
val g1 = (g * 0.90).toInt val g1 = (g * 0.90).toInt
val b1 = (b * 0.90).toInt val b1 = (b * 0.90).toInt
@ -79,24 +79,11 @@ object DOT {
}.sorted.mkString("\n") }.sorted.mkString("\n")
s"$dotHead\n$nodes\n$edges\n}" s"$dotHead\n$nodes\n$edges\n}"
}
sealed trait HTMLLabelRendering { enum HTMLLabelRendering:
def renderLabel(labelText: String): String case AngleBrackets
} case LabelTypeHtml
def renderLabel(labelText: String): String = this match
/** case AngleBrackets => s"label=<$labelText>"
* Render HTML labels in Angle brackets as defined at http://graphviz.org/content/node-shapes#html case LabelTypeHtml => s"""labelType="html" label="$labelText""""
*/ end DOT
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""""
}
}

10
main/src/main/scala/sbt/internal/server/NetworkChannel.scala
View File

@ -851,10 +851,12 @@ final class NetworkChannel(
override def getStringCapability(capability: String): String = override def getStringCapability(capability: String): String =
getCapability( getCapability(
TerminalCapabilitiesQuery(boolean = None, numeric = None, string = Some(capability)), TerminalCapabilitiesQuery(boolean = None, numeric = None, string = Some(capability)),
_.string.flatMap { _.string
case "null" => None .flatMap {
case s => Some(s) case "null" => None
}.orNull case s => Some(s)
}
.orNull
).getOrElse("") ).getOrElse("")
override private[sbt] def getAttributes: Map[String, String] = override private[sbt] def getAttributes: Map[String, String] =

4
main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala
View File

@ -110,7 +110,7 @@ object DependencyTreeSettings {
dependencyTreeModuleGraph0.value, dependencyTreeModuleGraph0.value,
dependencyDotHeader.value, dependencyDotHeader.value,
dependencyDotNodeLabel.value, dependencyDotNodeLabel.value,
rendering.DOT.AngleBrackets, rendering.DOT.HTMLLabelRendering.AngleBrackets,
dependencyDotNodeColors.value dependencyDotNodeColors.value
), ),
dependencyDot := writeToFile(dependencyDot / asString, dependencyDotFile).value, dependencyDot := writeToFile(dependencyDot / asString, dependencyDotFile).value,
@ -195,7 +195,7 @@ object DependencyTreeSettings {
graph, graph,
dependencyDotHeader.value, dependencyDotHeader.value,
dependencyDotNodeLabel.value, dependencyDotNodeLabel.value,
rendering.DOT.AngleBrackets, rendering.DOT.HTMLLabelRendering.AngleBrackets,
dependencyDotNodeColors.value dependencyDotNodeColors.value
) )
val link = DagreHTML.createLink(dotGraph, target.value) val link = DagreHTML.createLink(dotGraph, target.value)