Omit more prefixes in non-package module printing #17758
Merged
Conversation
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
When we pretty-print a type in a module class, we end up printing the module class's symbol. For instance in a reduction failure of Tuple.Union, we end up printing Tuple.Fold, with Tuple being an internal (ThisType) reference to the Tuple module class. I tweaked the logic in fullNameString so that we omit more prefixes, if the module is non-package (and make it consistent across -Ytest-pickler). The package part is important, because we want to continue to get "import scala.concurrent.duration..." instead of "import concurrent.duration..".
dwijnand
force-pushed
the
fix-module-omittable-prefix
branch
3 times, most recently
from
1cc5c18 to
77ee20b
Compare
If you refer to a package by name, e.g. `scala.quoted.Quotes`, the type may have a "quoted" prefix that is a TermRef. Rather than unravel the rest of the prefixes, we print the fully package name.
dwijnand
force-pushed
the
fix-module-omittable-prefix
branch
from
77ee20b to
c04bb4f
Compare
nicolasstucki
approved these changes
Jun 6, 2023
tgodzik
reviewed
Jun 10, 2023
| @@ -106,6 +109,9 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { | |||
| if (tp.cls.isAnonymousClass) keywordStr("this") | |||
| if (tp.cls.is(ModuleClass)) fullNameString(tp.cls.sourceModule) | |||
| else super.toTextRef(tp) | |||
| case tp: TermRef if !printDebug => | |||
| if tp.symbol.is(Package) then fullNameString(tp.symbol) | |||
There was a problem hiding this comment.
This caused a bit of regression in metals since we are no longer able to omit a package when printing : scalameta/metals#5327
I wonder if you could do a bit more full proof mechanism here so that we always correctly skip prefixes in both metals and compiler 🤔 It's influenced by the imports within metals.
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.
When we pretty-print a type in a module class, we end up printing the
module class's symbol. For instance in a reduction failure of
Tuple.Union, we end up printing Tuple.Fold, with Tuple being an internal
(ThisType) reference to the Tuple module class. I tweaked the logic in
fullNameString so that we omit more prefixes, if the module is
non-package (and make it consistent across -Ytest-pickler). The package
part is important, because we want to continue to get "import
scala.concurrent.duration..." instead of "import concurrent.duration..".