-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1. Fix accidentally recursive ParamInfo instance, and test 2. Add a missing Integer instance, needed for VarianceMap, and test 3. Fix showing nested non-Showable, non-primitive values, for instance showing a value of type `List[(Type, Int)]` wasn't pretty-printing the Type. To fix this we need to introduce CtxShow, to defer the showing until we can wire a Context to it. And test. Additionally, we can do the non-sensical tagging with a Printer, like explainations does. 4. Addtionally, that ^ change brings the em/ex features to nested values too, and add tests for those. 5. Add some notes on how MessageLimiter works 6. Fix OrderingContraint assuming ctx.run is non null.
- Loading branch information
Showing
6 changed files
with
152 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package dotty.tools | ||
| package dotc | ||
|
|
||
| import core.*, Contexts.*, Decorators.*, Denotations.*, Flags.*, Names.*, StdNames.*, SymDenotations.*, Symbols.*, Types.* | ||
| import config.Printers.* | ||
| import printing.Formatting.Show | ||
|
|
||
| import org.junit.Test | ||
| import org.junit.Assert.* | ||
|
|
||
| class StringFormatterTest extends AbstractStringFormatterTest: | ||
| @Test def string = check("foo", i"${"foo"}") | ||
| @Test def integer = check("1", i"${Int.box(1)}") | ||
| @Test def type1 = check("Any", i"${defn.AnyType}") | ||
| @Test def symbol = check("class Any", i"${defn.AnyClass}") | ||
| @Test def paramInfo = check("class Any", i"${defn.AnyClass: ParamInfo}") | ||
| @Test def seq = check("[Any, String]", i"${Seq(defn.AnyType, defn.StringType)}") | ||
| @Test def seqSep = check("Any; String", i"${Seq(defn.AnyType, defn.StringType)}%; %") | ||
| @Test def tuple = check("(1,Any)", i"${(1, defn.AnyType)}") | ||
| @Test def seqOfTup = check("(1,Any), (2,String)", i"${Seq(1 -> defn.AnyType, 2 -> defn.StringType)}%, %") | ||
| @Test def flags1 = check("final", i"$Final") | ||
| @Test def flagsSeq = check("<static>, final", i"${Seq(JavaStatic, Final)}%, %") | ||
| @Test def flagsTup = check("(<static>,final)", i"${(JavaStatic, Final)}") | ||
| @Test def seqOfTup2 = check("(final,given), (private,lazy)", i"${Seq((Final, Given), (Private, Lazy))}%, %") | ||
|
|
||
| class StorePrinter extends Printer: | ||
| var string: String = "<never set>" | ||
| override def println(msg: => String) = string = msg | ||
|
|
||
| @Test def testShowing: Unit = | ||
| val store = StorePrinter() | ||
| (JavaStatic | Final).showing(i"flags=$result", store) | ||
| assertEquals("flags=final <static>", store.string) | ||
|
|
||
| @Test def testShowingWithOriginalType: Unit = | ||
| val store = StorePrinter() | ||
| (JavaStatic | Final).showing(i"flags=${if result.is(Private) then result &~ Private else result | Private}", store) | ||
| assertEquals("flags=private final <static>", store.string) | ||
| end StringFormatterTest | ||
|
|
||
| class EmStringFormatterTest extends AbstractStringFormatterTest: | ||
| @Test def seq = check("[Any, String]", em"${Seq(defn.AnyType, defn.StringType)}") | ||
| @Test def seqSeq = check("Any; String", em"${Seq(defn.AnyType, defn.StringType)}%; %") | ||
| @Test def ellipsis = assert(em"$Big".contains("...")) | ||
| @Test def err = check("<nonsensical>type Err</nonsensical>", em"$Err") | ||
| @Test def ambig = check("Foo vs Foo", em"$Foo vs $Foo") | ||
| @Test def cstrd = check("Foo; Bar", em"$mkCstrd%; %") | ||
| @Test def seqErr = check("[class Any, <nonsensical>type Err</nonsensical>]", em"${Seq(defn.AnyClass, Err)}") | ||
| @Test def seqSeqErr = check("class Any; <nonsensical>type Err</nonsensical>", em"${Seq(defn.AnyClass, Err)}%; %") | ||
| @Test def tupleErr = check("(1,<nonsensical>type Err</nonsensical>)", em"${(1, Err)}") | ||
| @Test def tupleAmb = check("(Foo,Foo)", em"${(Foo, Foo)}") | ||
| @Test def tupleFlags = check("(Foo,abstract)", em"${(Foo, Abstract)}") | ||
| @Test def seqOfTupleFlags = check("[(Foo,abstract)]", em"${Seq((Foo, Abstract))}") | ||
| end EmStringFormatterTest | ||
|
|
||
| class ExStringFormatterTest extends AbstractStringFormatterTest: | ||
| @Test def seq = check("[Any, String]", ex"${Seq(defn.AnyType, defn.StringType)}") | ||
| @Test def seqSeq = check("Any; String", ex"${Seq(defn.AnyType, defn.StringType)}%; %") | ||
| @Test def ellipsis = assert(ex"$Big".contains("...")) | ||
| @Test def err = check("<nonsensical>type Err</nonsensical>", ex"$Err") | ||
| @Test def ambig = check("""Foo vs Foo² | ||
| | | ||
| |where: Foo is a type | ||
| | Foo² is a type | ||
| |""".stripMargin, ex"$Foo vs $Foo") | ||
| @Test def cstrd = check("""Foo; Bar | ||
| | | ||
| |where: Bar is a type variable with constraint <: String | ||
| | Foo is a type variable with constraint <: Int | ||
| |""".stripMargin, ex"$mkCstrd%; %") | ||
| @Test def seqErr = check("[class Any, <nonsensical>type Err</nonsensical>]", ex"${Seq(defn.AnyClass, Err)}") | ||
| @Test def seqSeqErr = check("class Any; <nonsensical>type Err</nonsensical>", ex"${Seq(defn.AnyClass, Err)}%; %") | ||
| @Test def tupleErr = check("(1,<nonsensical>type Err</nonsensical>)", ex"${(1, Err)}") | ||
| @Test def tupleAmb = check("""(Foo,Foo²) | ||
| | | ||
| |where: Foo is a type | ||
| | Foo² is a type | ||
| |""".stripMargin, ex"${(Foo, Foo)}") | ||
| end ExStringFormatterTest | ||
|
|
||
| abstract class AbstractStringFormatterTest extends DottyTest: | ||
| override def initializeCtx(fc: FreshContext) = super.initializeCtx(fc.setSetting(fc.settings.color, "never")) | ||
|
|
||
| def Foo = newSymbol(defn.RootClass, typeName("Foo"), EmptyFlags, TypeBounds.empty).typeRef | ||
| def Err = newErrorSymbol(defn.RootClass, typeName("Err"), "") | ||
| def Big = (1 to 120).foldLeft(defn.StringType)((tp, i) => RefinedType(tp, typeName("A" * 69 + i), TypeAlias(defn.IntType))) | ||
|
|
||
| def mkCstrd = | ||
| val names = List(typeName("Foo"), typeName("Bar")) | ||
| val infos = List(TypeBounds.upper(defn.IntType), TypeBounds.upper(defn.StringType)) | ||
| val tl = PolyType(names)(_ => infos, _ => defn.AnyType) | ||
| TypeComparer.addToConstraint(tl, Nil) | ||
| tl.paramRefs | ||
|
|
||
| def ckSub(obtained: String, snippet: String) = assert(obtained.contains(snippet)) | ||
| def check(expected: String, obtained: String) = assertEquals(expected, obtained) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters