Fix #6415: Enable REPL code completion for opaque types #6429
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
|
(the first commit is from #6414) |
smarter
requested changes
May 2, 2019
| @@ -820,7 +820,7 @@ object desugar { | |||
| val moduleName = tdef.name.toTermName | |||
| val localRef = Select(Ident(moduleName), tdef.name) | |||
| localRef.pushAttachment(SuppressAccessCheck, ()) | |||
| val aliasType = cpy.TypeDef(tdef)(rhs = completeForwarder(localRef)) | |||
| val aliasType = cpy.TypeDef(tdef)(rhs = completeForwarder(localRef)).withSpan(Span(MaxOffset)) | |||
There was a problem hiding this comment.
Synthetic trees should always have a position where the start and the end are identical, that's how we distinguish them from user-written trees, but they should still point to the closest position where they were defined in the source code (otherwise, error messages involving them will point to the wrong line) so you should do .withSpan(tdef.span.startPos)
There was a problem hiding this comment.
Ok, this also works
The completion did not work because the desugared version of the opaque type's definition shared the span with its private definition inside the companion object.
smarter
approved these changes
May 3, 2019
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.
opaque type T = Intdesugars to (roughly):So one
opaque type Tdesugars to twoopaque type T's. One of them is synthetic – the first one. It shadows the second one during code completion due to the fact that it has the same span.