diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-10-03 18:21:28 +0200 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-10-10 13:25:37 +0200 |
| commit | d2b620541b18bb50d2a2b89194e1778c64bba567 (patch) | |
| tree | a37b2bc37deda4e281d3279ff931ed8effdef28f /src/dotty/tools/dotc/printing | |
| parent | 29d19ba41622b1a904d4960869866c0967db6c37 (diff) | |
| download | dotty-d2b620541b18bb50d2a2b89194e1778c64bba567.tar.gz dotty-d2b620541b18bb50d2a2b89194e1778c64bba567.tar.bz2 dotty-d2b620541b18bb50d2a2b89194e1778c64bba567.zip | |
Insert message "inline" into multiline code at point
Diffstat (limited to 'src/dotty/tools/dotc/printing')
| -rw-r--r-- | src/dotty/tools/dotc/printing/Formatting.scala | 10 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/printing/Highlighting.scala | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/dotty/tools/dotc/printing/Formatting.scala b/src/dotty/tools/dotc/printing/Formatting.scala index 9cbf07914..76d2bdc18 100644 --- a/src/dotty/tools/dotc/printing/Formatting.scala +++ b/src/dotty/tools/dotc/printing/Formatting.scala @@ -10,7 +10,7 @@ import scala.annotation.switch import scala.util.control.NonFatal import reporting.diagnostic.MessageContainer import util.DiffUtil -import Highlighting.{ highlightToString => _, _ } +import Highlighting._ import SyntaxHighlighting._ object Formatting { @@ -165,7 +165,11 @@ object Formatting { } } - /** Turns a `Seen => String` to produce a `where: T is...` clause */ + /** Turns a `Seen` into a `String` to produce an explanation for types on the + * form `where: T is...` + * + * @return string disambiguating types + */ private def explanations(seen: Seen)(implicit ctx: Context): String = { def needsExplanation(entry: Recorded) = entry match { case param: PolyParam => ctx.typerState.constraint.contains(param) @@ -245,7 +249,7 @@ object Formatting { val exp = wrapNonSensical(expected, expected.show) (found, expected) match { - case (_: RefinedType, _: RefinedType) => + case (_: RefinedType, _: RefinedType) if ctx.settings.color.value != "never" => DiffUtil.mkColoredTypeDiff(fnd, exp) case _ => (hl"$fnd", hl"$exp") diff --git a/src/dotty/tools/dotc/printing/Highlighting.scala b/src/dotty/tools/dotc/printing/Highlighting.scala index 13e55722f..3bda7fb7a 100644 --- a/src/dotty/tools/dotc/printing/Highlighting.scala +++ b/src/dotty/tools/dotc/printing/Highlighting.scala @@ -9,10 +9,6 @@ object Highlighting { implicit def highlightShow(h: Highlight)(implicit ctx: Context): String = h.show - implicit def highlightToString(h: Highlight): String = - h.toString - implicit def hbufToString(hb: HighlightBuffer): String = - hb.toString abstract class Highlight(private val highlight: String) { def text: String |