Fixes SR-642: Code completion does not instantiate generic arguments of a type wrapped in an optional. #1137
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
|
Could you add a test? |
| @@ -1708,7 +1708,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer { | |||
| Type ContextTy = VD->getDeclContext()->getDeclaredTypeOfContext(); | |||
| if (ContextTy) { | |||
| Type MaybeNominalType = ExprType->getRValueInstanceType(); | |||
| if (ContextTy->getAnyNominal() == MaybeNominalType->getAnyNominal() && | |||
| if (ContextTy->getDesugaredType()->getAnyNominal() == MaybeNominalType->getDesugaredType()->getAnyNominal() && | |||
|
... and it would be best if the test didn't use Set, but used a mock type instead. |
|
I added a test case and added a line break so that the lines are only 80-ish columns. Thanks for the hint with the mock type, wouldn’t have thought about that |
| let x: Foo<Bar>? = Foo<Bar>() | ||
| x.#^FOO_OPTIONAL_1^# | ||
| // FOO_OPTIONAL_1: Begin completions, 4 items | ||
| // FOO_OPTIONAL_1-DAG: ecl[InstanceMethod]/CurrNominal/Erase[1]: ?.myFunction({#(foobar): Bar#})[#Void#]; name=myFunction(foobar: Bar) |
|
Sorry, don't know how these changes happened between my tests and and the commit. Hope everything is fine now ;-) |
|
@swift-ci Please test |
tkremenek
changed the title
tkremenek
added a commit
that referenced
this pull request
Feb 4, 2016
Fixes SR-642: Code completion does not instantiate generic arguments of a type wrapped in an optional.
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.
No description provided.