REPL: do not dealias before printing types #3566
Merged
Conversation
This file contains hidden or 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
smarter
force-pushed
the
fix-repl-alias
branch
2 times, most recently
from
471711c to
4daf3a0
Compare
| scala> Seq('a','b') | ||
| val res2: Seq[Char] = List(a, b) | ||
| scala> Set(4, 5) | ||
| val res6: Set[Int] = Set(4, 5) |
smarter
force-pushed
the
fix-repl-alias
branch
2 times, most recently
from
5968d96 to
0c13af0
Compare
odersky
requested changes
Nov 29, 2017
| @@ -357,9 +357,16 @@ class Definitions { | |||
| def newGenericArrayMethod(implicit ctx: Context) = DottyArraysModule.requiredMethod("newGenericArray") | |||
| def newArrayMethod(implicit ctx: Context) = DottyArraysModule.requiredMethod("newArray") | |||
|
|
|||
| lazy val ListType = ctx.requiredClassRef("scala.collection.immutable.List") | |||
| def ListClass = ListType.symbol.asClass | |||
There was a problem hiding this comment.
This looks wrong. Don't we need to pass a context to ListClass, like we do everywhere else? (same for the other new definitions)
| @@ -147,7 +152,12 @@ class PlainPrinter(_ctx: Context) extends Printer { | |||
| case tp: TermRef if tp.denot.isOverloaded => | |||
| "<overloaded " ~ toTextRef(tp) ~ ">" | |||
| case tp: TypeRef => | |||
| toTextPrefix(tp.prefix) ~ selectionString(tp) | |||
| printWithoutPrefix.find(sym => tp.isDirectRef(sym)) match { | |||
There was a problem hiding this comment.
I would prefer not to hard-code these. Can't we instead check when printing whether a class has an alias in Predef or scala with the same name?
There was a problem hiding this comment.
Possibly, but that would be more expensive and may require forcing things.
smarter
force-pushed
the
fix-repl-alias
branch
3 times, most recently
from
db6d057 to
18c55d3
Compare
|
test performance please |
|
performance test scheduled: 1 job(s) in queue, 0 running. |
|
Performance test finished successfully: Visit http://dotty-bench.epfl.ch/3566/ to see the changes. Benchmarks is based on merging with master (d929fc9) |
Also simplify the mechanism used to avoid printing prefixes. This is now handled in the PlainPrinter and limited to List, Map, Set, Seq.
…la.Predef In the previous commit, this was limited to a hardcoded subset of these types.
smarter
force-pushed
the
fix-repl-alias
branch
from
18c55d3 to
f1f3558
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also simplify the mechanism used to avoid printing prefixes. This is now
handled in the PlainPrinter and limited to List, Map, Set, Seq.