[code-completion] Add type context for single-expression closures #23411
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
When completing in the only expression of closure, use the return type of the closure as the type context for the code-completion. However, since code-completion may be on an incomplete input, we only use the return type to improve the quality of the result, not to mark it invalid, since (a) we may add another statement afterwards, or (b) if the context type is Void it doesn't need to match the value.
|
@swift-ci please test |
|
@rintaro this is a bit different than we discussed. Instead of handling Void specially, I keep track of whether the type context is from a single-expression body and in that case do not mark anything as type-relation "invalid". |
|
Build failed |
|
Build failed |
There usually won't be a lot of expected types, so just use a SmallVector and copy it instead of trying to get tricky with the lifetime.
|
@swift-ci please test |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Seen in validation-test/IDE/crashers_fixed/019-swift-vardecl-emitlettovarnoteifsimple.swift
|
@swift-ci please test |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
rintaro
reviewed
Mar 19, 2019
lib/IDE/ExprContextAnalysis.cpp
Outdated
| case 1: | ||
| return body->getElements()[0].is<Expr *>(); | ||
| default: | ||
| return false; |
There was a problem hiding this comment.
Do we already have test cases for this path? like:
var floatVal: Float = 2
let _: () -> Float = {
#^COMPLETE^# // Should be normal completion.
return 42
}
let _: () -> SomeEnum = {
.#^COMPLETE^# // Should not provide anything.
return 42
}If not, please add them.
There was a problem hiding this comment.
Good catch, this code for handling getNumElements() == 0 is from before I changed the parser to add the CodeCompletionExpr in completeStmtOrExpr. I'll remove the 0 case and add the additional test.
benlangmuir
commented
Mar 19, 2019
| @@ -1976,7 +1976,8 @@ bool MissingArgumentsFailure::diagnoseAsError() { | |||
| auto path = locator->getPath(); | |||
|
|
|||
| // TODO: Currently this is only intended to diagnose contextual failures. | |||
| if (!(path.back().getKind() == ConstraintLocator::ApplyArgToParam || | |||
| if (path.empty() || | |||
There was a problem hiding this comment.
@xedin FYI
Avoids assertion failure:
https://ci.swift.org/job/swift-PR-osx/11875/consoleFull#-1251633450ef3c3c00-f496-40b9-85a7-0eb69d0f491b
(lldb) p locator->anchor->dump()
(assign_expr type='<null>'
(unresolved_dot_expr type='<null>' field 'a' function_ref=unapplied
(type_expr implicit type='<null>' typerepr='l'))
(closure_expr type='<null>' discriminator=0
(parameter_list range=[/Users/blangmuir/src/swift/validation-test/IDE/crashers_fixed/019-swift-vardecl-emitlettovarnoteifsimple.swift:2:38 - line:2:38])
(brace_stmt range=[/Users/blangmuir/src/swift/validation-test/IDE/crashers_fixed/019-swift-vardecl-emitlettovarnoteifsimple.swift:2:38 - line:2:39]
(code_completion_expr implicit type='<null>'))))
abort + 127
basename_r + 0
swift::constraints::MissingArgumentsFailure::diagnoseAsError() + 150
swift::constraints::AddMissingArguments::diagnose(swift::Expr*, bool) const + 122
swift::constraints::ConstraintSystem::applySolutionFixes(swift::Expr*, :$_12::operator()(swift::Expr*) const + 203
swift::constraints::ConstraintSystem::applySolutionFixes(swift::Expr*, + 548
swift::constraints::ConstraintSystem::applySolution(swift::constraints::Solution&, ) + 73
swift::TypeChecker::typeCheckExpressionImpl(swift::Expr*&, swift::DeclContext*, Purpose, swift::OptionSet<rFlags, unsigned int>, swift::ExprTypeCheckListener&, ) + 1047
swift::TypeChecker::typeCheckBinding(swift::Pattern*&, swift::Expr*&, swift::DeclContext*)
swift::TypeChecker::typeCheckPatternBinding(swift::PatternBindingDecl*, unsigned int) + 247
swift::typeCheckPatternBinding(swift::PatternBindingDecl*, unsigned int) + 144
(anonymous namespace)::typeCheckContextImpl(swift::DeclContext*, swift::SourceLoc) + 226
(anonymous namespace)::CodeCompletionCallbacksImpl::doneParsing() + 3452
swift::performDelayedParsing(swift::DeclContext*, swift::PersistentParserState&, *) + 458
swift::CompilerInstance::parseAndCheckTypesUpTo(swift::CompilerInstance::ImplicitImports ) + 710
swift::CompilerInstance::performSemaUpTo(swift::SourceFile::ASTStage_t) + 615
Ensure that we get the correct behaviour when we are not in the single-expression case, and remove code that handled 0-element bodies, which is no longer needed after the parser change.
|
@swift-ci please test |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
@swift-ci please test macOS |
rintaro
approved these changes
Mar 19, 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.
When completing in the only expression of closure, use the return type of the closure as the type context for the code-completion. However, since code-completion may be on an incomplete input, we only use the return type to improve the quality of the result, not to mark it invalid, since (a) we may add another statement afterwards, or (b) if the context type is Void it doesn't need to match the value.