Skip to content

[CodeCompletion] Maintain LeaveClosureBodiesUnchecked when checking pattern binding #58662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/swift/AST/TypeCheckRequests.h
Original file line number Diff line number Diff line change
Expand Up @@ -2264,7 +2264,7 @@ class ResultTypeRequest
class PatternBindingEntryRequest
: public SimpleRequest<PatternBindingEntryRequest,
const PatternBindingEntry *(PatternBindingDecl *,
unsigned),
unsigned, bool),
RequestFlags::SeparatelyCached> {
public:
using SimpleRequest::SimpleRequest;
Expand All @@ -2273,8 +2273,9 @@ class PatternBindingEntryRequest
friend SimpleRequest;

// Evaluation.
const PatternBindingEntry *
evaluate(Evaluator &evaluator, PatternBindingDecl *PBD, unsigned i) const;
const PatternBindingEntry *evaluate(Evaluator &evaluator,
PatternBindingDecl *PBD, unsigned i,
bool LeaveClosureBodiesUnchecked) const;

public:
// Separate caching.
Expand Down
2 changes: 1 addition & 1 deletion include/swift/AST/TypeCheckerTypeIDZone.def
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ SWIFT_REQUEST(TypeChecker, OverriddenDeclsRequest,
llvm::TinyPtrVector<ValueDecl *>(ValueDecl *), SeparatelyCached,
NoLocationInfo)
SWIFT_REQUEST(TypeChecker, PatternBindingEntryRequest,
const PatternBindingEntry *(PatternBindingDecl *, unsigned),
const PatternBindingEntry *(PatternBindingDecl *, unsigned, bool),
SeparatelyCached, NoLocationInfo)
SWIFT_REQUEST(TypeChecker, PrimarySourceFilesRequest,
ArrayRef<SourceFile *>(ModuleDecl *), Cached, NoLocationInfo)
Expand Down
3 changes: 2 additions & 1 deletion lib/AST/Decl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,8 @@ bool PatternBindingDecl::isComputingPatternBindingEntry(
const VarDecl *vd) const {
unsigned i = getPatternEntryIndexForVarDecl(vd);
return getASTContext().evaluator.hasActiveRequest(
PatternBindingEntryRequest{const_cast<PatternBindingDecl *>(this), i});
PatternBindingEntryRequest{const_cast<PatternBindingDecl *>(this), i,
/*LeaveClosureBodyUnchecked=*/false});
}

bool PatternBindingDecl::isExplicitlyInitialized(unsigned i) const {
Expand Down
3 changes: 2 additions & 1 deletion lib/Sema/TypeCheckDecl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2453,7 +2453,8 @@ NamingPatternRequest::evaluate(Evaluator &evaluator, VarDecl *VD) const {
// and TypeCheckPattern handle the others. But that's all really gross.
unsigned i = PBD->getPatternEntryIndexForVarDecl(VD);
(void)evaluateOrDefault(evaluator,
PatternBindingEntryRequest{PBD, i},
PatternBindingEntryRequest{
PBD, i, /*LeaveClosureBodiesUnchecked=*/false},
nullptr);
if (PBD->isInvalid()) {
VD->getParentPattern()->setType(ErrorType::get(Context));
Expand Down
4 changes: 3 additions & 1 deletion lib/Sema/TypeCheckDeclPrimary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2023,7 +2023,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
PBD->isFullyValidated(i)
? &PBD->getPatternList()[i]
: evaluateOrDefault(Ctx.evaluator,
PatternBindingEntryRequest{PBD, i}, nullptr);
PatternBindingEntryRequest{
PBD, i, LeaveClosureBodiesUnchecked},
nullptr);
assert(entry && "No pattern binding entry?");

const auto *Pat = PBD->getPattern(i);
Expand Down
15 changes: 9 additions & 6 deletions lib/Sema/TypeCheckStorage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,9 @@ StoredPropertiesAndMissingMembersRequest::evaluate(Evaluator &evaluator,
}

/// Validate the \c entryNumber'th entry in \c binding.
const PatternBindingEntry *
PatternBindingEntryRequest::evaluate(Evaluator &eval,
PatternBindingDecl *binding,
unsigned entryNumber) const {
const PatternBindingEntry *PatternBindingEntryRequest::evaluate(
Evaluator &eval, PatternBindingDecl *binding, unsigned entryNumber,
bool LeaveClosureBodiesUnchecked) const {
const auto &pbe = binding->getPatternList()[entryNumber];
auto &Context = binding->getASTContext();

Expand Down Expand Up @@ -363,8 +362,12 @@ PatternBindingEntryRequest::evaluate(Evaluator &eval,
if (patternType->hasUnresolvedType() ||
patternType->hasPlaceholder() ||
patternType->hasUnboundGenericType()) {
if (TypeChecker::typeCheckPatternBinding(binding, entryNumber,
patternType)) {
TypeCheckExprOptions options;
if (LeaveClosureBodiesUnchecked) {
options |= TypeCheckExprFlags::LeaveClosureBodyUnchecked;
}
if (TypeChecker::typeCheckPatternBinding(binding, entryNumber, patternType,
options)) {
binding->setInvalid();
return &pbe;
}
Expand Down
20 changes: 20 additions & 0 deletions test/IDE/complete_in_closures.swift
Original file line number Diff line number Diff line change
Expand Up @@ -396,3 +396,23 @@ func testSignature() {

// NOTE: For effects specifiers completion (e.g. '() <HERE> -> Void') see test/IDE/complete_concurrency_specifier.swift
}

func testClosureInPatternBindingInit() {
enum DragState {
case dragging(translation: Int, predictedLocation: Int)
}

func pnChanged(_ action: () -> Void) {}

func foo() {
var gestureViewState: DragState = .dragging(translation: 0, predictedLocation: 0)
let longPressDrag = pnChanged {
_ = 1
gestureViewState = .dragging(translation: 0, #^CLOSURE_IN_PATTERN_BINDING^#predictedLocation: 0)
}
}
// CLOSURE_IN_PATTERN_BINDING: Begin completions, 1 items
// CLOSURE_IN_PATTERN_BINDING-DAG: Pattern/Local/Flair[ArgLabels]: {#predictedLocation: Int#}[#Int#];
// CLOSURE_IN_PATTERN_BINDING: End completion

}