diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2017-02-18 23:58:49 +0100 |
---|---|---|
committer | Guillaume Martres <smarter@ubuntu.com> | 2017-02-19 00:00:19 +0100 |
commit | 5b330f1fea7a4c7ad3a33c237e99cc31fabfba59 (patch) | |
tree | 73a88e3b385f850fa108e7a4099979336c78513d /compiler/src/dotty/tools/dotc/printing | |
parent | 42e112b92a526bb9352febb14d8af48138bcfb87 (diff) | |
download | dotty-5b330f1fea7a4c7ad3a33c237e99cc31fabfba59.tar.gz dotty-5b330f1fea7a4c7ad3a33c237e99cc31fabfba59.tar.bz2 dotty-5b330f1fea7a4c7ad3a33c237e99cc31fabfba59.zip |
ImportInfo: removed ctx parameter from constructor
ImportInfo#toString required the ctx parameter,so it was replaced by
ImportInfo#toText.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/printing')
-rw-r--r-- | compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala | 12 | ||||
-rw-r--r-- | compiler/src/dotty/tools/dotc/printing/Printer.scala | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala index ac25f7cfd..b6d595b9c 100644 --- a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -7,6 +7,7 @@ import Contexts.Context, Scopes.Scope, Denotations.Denotation, Annotations.Annot import StdNames.{nme, tpnme} import ast.Trees._, ast._ import typer.Implicits._ +import typer.ImportInfo import config.Config import java.lang.Integer.toOctalString import config.Config.summarizeDepth @@ -502,6 +503,17 @@ class PlainPrinter(_ctx: Context) extends Printer { "?Unknown Implicit Result?" } + def toText(importInfo: ImportInfo): Text = { + val siteStr = importInfo.site.show + val exprStr = if (siteStr endsWith ".type") siteStr dropRight 5 else siteStr + val selectorStr = importInfo.selectors match { + case Ident(name) :: Nil => name.show + case _ => "{...}" + } + s"import $exprStr.$selectorStr" + } + + private var maxSummarized = Int.MaxValue def summarized[T](depth: Int)(op: => T): T = { diff --git a/compiler/src/dotty/tools/dotc/printing/Printer.scala b/compiler/src/dotty/tools/dotc/printing/Printer.scala index 506773a4b..e163a83f3 100644 --- a/compiler/src/dotty/tools/dotc/printing/Printer.scala +++ b/compiler/src/dotty/tools/dotc/printing/Printer.scala @@ -6,6 +6,7 @@ import Texts._, ast.Trees._ import Types.Type, Symbols.Symbol, Contexts.Context, Scopes.Scope, Constants.Constant, Names.Name, Denotations._, Annotations.Annotation import typer.Implicits.SearchResult +import typer.ImportInfo /** The base class of all printers */ @@ -98,6 +99,9 @@ abstract class Printer { /** Textual representation of implicit search result */ def toText(result: SearchResult): Text + /** Textual representation of info relating to an import clause */ + def toText(result: ImportInfo): Text + /** Perform string or text-producing operation `op` so that only a * summarized text with given recursion depth is shown */ |