Skip to content

Commit 9532169

Browse files
bnbarhambnbarham
authored
Merge pull request swiftlang#34548 from bnbarham/completion-string-interp-init-70833348
[CodeCompletion] Do not include decl in own initializer/default argument
2 parents 11267c3 + c3d1e34 commit 9532169

File tree

5 files changed

+50
-14
lines changed

5 files changed

+50
-14
lines changed

‎include/swift/AST/NameLookup.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,14 @@ class AccessFilteringDeclConsumer final : public VisibleDeclConsumer {
418418
/// a decl inside its own initializer or a non-type decl before its definition.
419419
class UsableFilteringDeclConsumer final : public VisibleDeclConsumer {
420420
const SourceManager &SM;
421+
const DeclContext *DC;
421422
SourceLoc Loc;
422423
VisibleDeclConsumer &ChainedConsumer;
423424

424425
public:
425-
UsableFilteringDeclConsumer(const SourceManager &SM, SourceLoc loc,
426-
VisibleDeclConsumer &consumer)
427-
: SM(SM), Loc(loc), ChainedConsumer(consumer) {}
426+
UsableFilteringDeclConsumer(const SourceManager &SM, const DeclContext *DC,
427+
SourceLoc loc, VisibleDeclConsumer &consumer)
428+
: SM(SM), DC(DC), Loc(loc), ChainedConsumer(consumer) {}
428429

429430
void foundDecl(ValueDecl *D, DeclVisibilityKind reason,
430431
DynamicLookupInfo dynamicLookupInfo) override;

‎lib/AST/NameLookup.cpp‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#include "clang/AST/DeclObjC.h"
1817
#include "swift/AST/NameLookup.h"
1918
#include "swift/AST/ASTContext.h"
2019
#include "swift/AST/ASTVisitor.h"
@@ -31,9 +30,11 @@
3130
#include "swift/AST/ParameterList.h"
3231
#include "swift/AST/SourceFile.h"
3332
#include "swift/Basic/Debug.h"
33+
#include "swift/Basic/STLExtras.h"
3434
#include "swift/Basic/SourceManager.h"
3535
#include "swift/Basic/Statistic.h"
36-
#include "swift/Basic/STLExtras.h"
36+
#include "swift/Parse/Lexer.h"
37+
#include "clang/AST/DeclObjC.h"
3738
#include "llvm/ADT/DenseMap.h"
3839
#include "llvm/ADT/TinyPtrVector.h"
3940
#include "llvm/Support/Debug.h"
@@ -148,10 +149,21 @@ void UsableFilteringDeclConsumer::foundDecl(ValueDecl *D,
148149
DeclVisibilityKind reason, DynamicLookupInfo dynamicLookupInfo) {
149150
// Skip when Loc is within the decl's own initializer
150151
if (auto *VD = dyn_cast<VarDecl>(D)) {
151-
if (auto *init = VD->getParentInitializer()) {
152-
auto initRange = init->getSourceRange();
153-
if (initRange.isValid() && SM.rangeContainsTokenLoc(initRange, Loc))
154-
return;
152+
Expr *init = VD->getParentInitializer();
153+
if (auto *PD = dyn_cast<ParamDecl>(D)) {
154+
init = PD->getStructuralDefaultExpr();
155+
}
156+
157+
// Only check if the VarDecl has the same (or parent) context to avoid
158+
// grabbing the end location for every decl with an initializer
159+
if (init != nullptr) {
160+
auto *varContext = VD->getDeclContext();
161+
if (DC == varContext || DC->isChildContextOf(varContext)) {
162+
auto initRange = Lexer::getCharSourceRangeFromSourceRange(
163+
SM, init->getSourceRange());
164+
if (initRange.isValid() && initRange.contains(Loc))
165+
return;
166+
}
155167
}
156168
}
157169

‎lib/IDE/CodeCompletion.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4652,8 +4652,9 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
46524652
: LookupKind::ValueInDeclContext;
46534653
NeedLeadingDot = false;
46544654

4655-
UsableFilteringDeclConsumer UsableFilteringConsumer(Ctx.SourceMgr,
4656-
Ctx.SourceMgr.getCodeCompletionLoc(), *this);
4655+
UsableFilteringDeclConsumer UsableFilteringConsumer(
4656+
Ctx.SourceMgr, CurrDeclContext, Ctx.SourceMgr.getCodeCompletionLoc(),
4657+
*this);
46574658
AccessFilteringDeclConsumer AccessFilteringConsumer(
46584659
CurrDeclContext, UsableFilteringConsumer);
46594660

‎lib/Sema/LookupVisibleDecls.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ void swift::lookupVisibleDecls(VisibleDeclConsumer &Consumer,
13031303
return;
13041304
}
13051305
UsableFilteringDeclConsumer FilteringConsumer(DC->getASTContext().SourceMgr,
1306-
Loc, Consumer);
1306+
DC, Loc, Consumer);
13071307
lookupVisibleDeclsImpl(FilteringConsumer, DC, IncludeTopLevel, Loc);
13081308
}
13091309

‎test/IDE/complete_expr_postfix_begin.swift‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,18 @@
7575
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TUPLE_1 | %FileCheck %s -check-prefix=IN_TUPLE_1
7676
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TUPLE_2 | %FileCheck %s -check-prefix=IN_TUPLE_2
7777

78-
// RUN-FIXME(rdar56755598): %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_1 | %FileCheck %s -check-prefix=OWN_INIT_1
79-
// RUN-FIXME(rdar56755598): %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_2 | %FileCheck %s -check-prefix=OWN_INIT_2
78+
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_1 | %FileCheck %s -check-prefix=OWN_INIT_1
79+
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_2 | %FileCheck %s -check-prefix=OWN_INIT_2
8080
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_3 | %FileCheck %s -check-prefix=OWN_INIT_3
8181
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_4 | %FileCheck %s -check-prefix=OWN_INIT_4
8282
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_5 | %FileCheck %s -check-prefix=OWN_INIT_5
8383
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_6 | %FileCheck %s -check-prefix=OWN_INIT_6
8484
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_7 | %FileCheck %s -check-prefix=OWN_INIT_7
85+
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_8 | %FileCheck %s -check-prefix=OWN_INIT_8
86+
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_9 | %FileCheck %s -check-prefix=OWN_INIT_9
87+
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_10 | %FileCheck %s -check-prefix=OWN_INIT_10
88+
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_11 | %FileCheck %s -check-prefix=OWN_INIT_11
89+
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_12 | %FileCheck %s -check-prefix=OWN_INIT_12
8590

8691
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_ACCESSOR_1 | %FileCheck %s -check-prefix=OWN_ACCESSOR_1
8792
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_ACCESSOR_2 | %FileCheck %s -check-prefix=OWN_ACCESSOR_2
@@ -584,13 +589,19 @@ func sync() {}
584589
var ownInit2: () -> Void = { #^OWN_INIT_2^# }
585590
// OWN_INIT_2: Begin completions
586591
// OWN_INIT_2-NOT: ownInit2
592+
var ownInit8: Int = "\(#^OWN_INIT_8^#)"
593+
// OWN_INIT_8: Begin completions
594+
// OWN_INIT_8-NOT: ownInit8
587595
struct OwnInitTester {
588596
var ownInit3: Int = #^OWN_INIT_3^#
589597
// OWN_INIT_3: Begin completions
590598
// OWN_INIT_3-NOT: ownInit3
591599
var ownInit4: () -> Void = { #^OWN_INIT_4^# }
592600
// OWN_INIT_4: Begin completions
593601
// OWN_INIT_4-NOT: ownInit4
602+
var ownInit9: String = "\(#^OWN_INIT_9^#)"
603+
// OWN_INIT_9: Begin completions
604+
// OWN_INIT_9-NOT: ownInit9
594605
}
595606
func ownInitTesting() {
596607
var ownInit5: Int = #^OWN_INIT_5^#
@@ -599,6 +610,17 @@ func ownInitTesting() {
599610
var ownInit6: () -> Void = { #^OWN_INIT_6^# }
600611
// OWN_INIT_6: Begin completions
601612
// OWN_INIT_6-NOT: ownInit6
613+
var ownInit10: String = "\(#^OWN_INIT_10^#)"
614+
// OWN_INIT_10: Begin completions
615+
// OWN_INIT_10-NOT: ownInit10
616+
}
617+
func ownInitTestingParam(ownInit11: Int = #^OWN_INIT_11^#) {
618+
// OWN_INIT_11: Begin completions
619+
// OWN_INIT_11-NOT: Decl[LocalVar]{{.*}}ownInit11
620+
}
621+
func ownInitTestingParamInterp(ownInit12: String = "\(#^OWN_INIT_12^#)") {
622+
// OWN_INIT_12: Begin completions
623+
// OWN_INIT_12-NOT: Decl[LocalVar]{{.*}}ownInit12
602624
}
603625
func ownInitTestingShadow(ownInit7: Int) {
604626
var ownInit7: Int = #^OWN_INIT_7^#

0 commit comments

Comments
 (0)