sort output of definitions in repl, fixes #8677 #9005
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
dottybot
reviewed
May 19, 2020
|
/edit: changing the reporting is no longer part of this PR |
smarter
reviewed
May 19, 2020
| vals.map(rendering.renderVal).flatten | ||
| ).foreach(str => out.println(SyntaxHighlighting.highlight(str))) | ||
| val formattedMembers = ( | ||
| typeAliases.map(ta => ("// defined alias " + ta.symbol.showUser, ta.symbol.coord.toSpan)) ++ |
There was a problem hiding this comment.
You can directly call span on a Symbol
rethab
force-pushed
the
8677/output-lines-order
branch
3 times, most recently
from
b137f3f to
9d11cf6
Compare
rethab
changed the title
rethab
force-pushed
the
8677/output-lines-order
branch
2 times, most recently
from
3a1a3b0 to
78adcc8
Compare
|
@smarter please note the updated description. |
smarter
requested changes
May 25, 2020
| @@ -264,7 +280,7 @@ class ReplDriver(settings: Array[String], | |||
| name.startsWith(str.REPL_RES_PREFIX) && hasValidNumber && sym.info == defn.UnitType | |||
| } | |||
|
|
|||
| def displayMembers(symbol: Symbol) = if (tree.symbol.info.exists) { | |||
| def displayMembers(symbol: Symbol): (State, Seq[Diagnostic]) = if (tree.symbol.info.exists) { | |||
There was a problem hiding this comment.
Maybe rename this to something else like formatMembers since it doesn't directly display anything anymore?
smarter
reviewed
May 25, 2020
| @@ -323,7 +323,7 @@ class ReplDriver(settings: Array[String], | |||
| .find(_.symbol.name == newestWrapper.moduleClassName) | |||
| .map { wrapperModule => | |||
| val formattedTypeDefs = typeDefs(wrapperModule.symbol) | |||
| val (newState, formattedMembers) = displayMembers(wrapperModule.symbol) | |||
| val (newState, formattedMembers) = extractAndFormat(wrapperModule.symbol) | |||
There was a problem hiding this comment.
typo:
Suggested change
| val (newState, formattedMembers) = extractAndFormat(wrapperModule.symbol) | |
| val (newState, formattedMembers) = extractAndFormatMembers(wrapperModule.symbol) |
There was a problem hiding this comment.
You are too fast -- I already changed it locally but haven't pushed yet :)
rethab
force-pushed
the
8677/output-lines-order
branch
from
f8c3a63 to
2f5bc4f
Compare
rethab
force-pushed
the
8677/output-lines-order
branch
from
2f5bc4f to
f5db076
Compare
rethab
force-pushed
the
8677/output-lines-order
branch
from
f5db076 to
34371fa
Compare
|
There was one test failure in the worksheet tests which I didn't see before. Also, I squashed all code changes together. Hopefully CI now becomes green. |
|
@smarter should be ready to merge now :) |
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.
As opposed to the earlier version, this PR now only fixes #8677, which makes it much smaller.
Note that this change basically reverts d9549fa, which order output on a lower level, but the new order should still be deterministic. This is the reason I had to change some of the tests: the order is no longer alphabetical there.