Skip to content

[AST] Be lenient with PatternBindingIntializer without PatBindingDecl #26546

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.

Sign up for GitHub

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
Aug 13, 2019
Merged

[AST] Be lenient with PatternBindingIntializer without PatBindingDecl #26546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions lib/AST/Decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,9 +1366,11 @@ ParamDecl *PatternBindingInitializer::getImplicitSelfDecl() {
}

VarDecl *PatternBindingInitializer::getInitializedLazyVar() const {
if (auto var = getBinding()->getSingleVar()) {
if (var->getAttrs().hasAttribute<LazyAttr>())
return var;
if (auto binding = getBinding()) {
if (auto var = binding->getSingleVar()) {
if (var->getAttrs().hasAttribute<LazyAttr>())
return var;
}
}
return nullptr;
}
Expand Down
5 changes: 2 additions & 3 deletions lib/AST/UnqualifiedLookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,18 +598,17 @@ void UnqualifiedLookupFactory::lookupInModuleScopeContext(

void UnqualifiedLookupFactory::lookupNamesIntroducedByPatternBindingInitializer(
PatternBindingInitializer *PBI, Optional<bool> isCascadingUse) {
assert(PBI->getBinding());
// Lazy variable initializer contexts have a 'self' parameter for
// instance member lookup.
if (auto *selfParam = PBI->getImplicitSelfDecl())
lookupNamesIntroducedByLazyVariableInitializer(PBI, selfParam,
isCascadingUse);
else if (PBI->getBinding()->getDeclContext()->isTypeContext())
else if (PBI->getParent()->isTypeContext())
lookupNamesIntroducedByInitializerOfStoredPropertyOfAType(PBI,
isCascadingUse);
else
lookupNamesIntroducedByInitializerOfGlobalOrLocal(PBI, isCascadingUse);
}
}

void UnqualifiedLookupFactory::lookupNamesIntroducedByLazyVariableInitializer(
PatternBindingInitializer *PBI, ParamDecl *selfParam,
Expand Down
6 changes: 6 additions & 0 deletions test/IDE/complete_property_delegate_attribute.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AFTER_PAREN | %FileCheck %s -check-prefix=AFTER_PAREN
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG_MyEnum_NODOT | %FileCheck %s -check-prefix=ARG_MyEnum_NODOT
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG_MyEnum_DOT | %FileCheck %s -check-prefix=ARG_MyEnum_DOT
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARG_MyEnum_NOBINDING | %FileCheck %s -check-prefix=ARG_MyEnum_NOBINDING

enum MyEnum {
case east, west
Expand Down Expand Up @@ -38,4 +39,9 @@ struct TestStruct {
// ARG_MyEnum_DOT-DAG: Decl[EnumElement]/ExprSpecific: west[#MyEnum#]; name=west
// ARG_MyEnum_DOT: End completions

@MyStruct(arg1: MyEnum.#^ARG_MyEnum_NOBINDING^#)
// ARG_MyEnum_NOBINDING: Begin completions
// ARG_MyEnum_NOBINDING-DAG: Decl[EnumElement]/CurrNominal: east[#MyEnum#];
// ARG_MyEnum_NOBINDING-DAG: Decl[EnumElement]/CurrNominal: west[#MyEnum#];
// ARG_MyEnum_NOBINDING: End completions
}