[CodeComplete] Fix code completion of initialization for variable wrapped by generic property wrapper #36517
Conversation
|
@swift-ci Please smoke test |
| @@ -580,7 +580,6 @@ PropertyWrapperBackingPropertyTypeRequest::evaluate( | |||
|
|
|||
| ASTContext &ctx = var->getASTContext(); | |||
| Type type = ctx.getSideCachedPropertyWrapperBackingPropertyType(var); | |||
| assert(type || ctx.Diags.hadAnyError()); | |||
There was a problem hiding this comment.
Instead of removing this assertion, could you insert
if (binding->isInvalid())
return Type();
at the end of if (binding && binding->isInitialized(index)) branch?
There was a problem hiding this comment.
Ah, that looks like a cleaner solution. Applied it.
| @@ -0,0 +1,32 @@ | |||
| // RUN: %complete-test %s -tok=COMPLETE_GENERIC | |||
There was a problem hiding this comment.
complete-test is SourceKit test. For non-SourceKit specific changes we use swift-ide-test in test/IDE/complete_*.swift. But in this specific case, please use validation-test/IDE/crashers_2_fixed/.
There was a problem hiding this comment.
Ah, didn’t know about validation-test/IDE/crashers_2_fixed. Moved it there.
|
|
||
| public struct MyStruct { | ||
| @GenericWrapper var someProperty = #^COMPLETE_GENERIC^# | ||
| @GenericContext<Int>.GenericWrapper var someProperty2 = #^COMPLETE_IN_GENERIC_CONTEXT^# |
There was a problem hiding this comment.
When testing COMPLETE_IN_GENERIC_CONTEXT, other tokens are just erased from the source so,
@GenericWrapper var someProperty = #^COMPLETE_GENERIC^#
@GenericContext<Int>.GenericWrapper var someProperty2 = #^COMPLETE_IN_GENERIC_CONTEXT^#is (probably) parsed as
@GenericWrapper var someProperty = @GenericContext<Int>.GenericWrapper /* missing ';' */ var someProperty2 = <TOKEN>To prevent this, please wrap them separate types.
There was a problem hiding this comment.
👍 Moved them to two different types. Didn’t think about that.
|
@slavapestov could you review |
…pped by generic property wrapper If completing the initialization of a variable that’s wrapped in a generic, unbound property wrapper, the expression's type is an `UnboundGenericType`. AFAICT that’s expected and the correct type to assign. We hit the first assertion failure by trying to retrieve that type's substitution map. `UnboundGenericType`s were not handled here, so we crashed. AFAICT we can't get any substitutions out of an unbound generic type, so we should just continue looking into the parent type. We hit the second assertion when trying to retrieve the property wrapper’s backing type, which is null (becuase it couldn't be resolved). However, we haven’t emitted a diagnostic because the variable declaration is perfectly valid. Hence I’m removing the assertion. Fixes rdar://64141399
ahoppen
force-pushed
the
pr/rdar64141399
branch
from
81c5775
to
28ee60e
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test macOS |
If completing the initialization of a variable that’s wrapped in a generic, unbound property wrapper, the expression's type is an
UnboundGenericType. AFAICT that’s expected and the correct type to assign.We hit the first assertion failure by trying to retrieve that type's substitution map.
UnboundGenericTypes were not handled here, so we hit an assertion. AFAICT we can't get any substitutions out of an unbound generic type, so we should just continue looking into the parent type.We hit the second assertion when trying to retrieve the property wrapper’s backing type, which is null (becuase it couldn't be resolved). However, we haven’t emitted a diagnostic because the variable declaration is perfectly valid. Hence I’m removing the assertion.
Fixes rdar://64141399