averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[CodeComplete] Use ASTScope lookup in getStmtLabelCompletions

Browse Source 
Use the same lookup logic that we use for regular compilation.
This commit is contained in:
Hamish Knight
2025-04-02 23:09:17 +01:00
parent 26f91cad9a
commit bbc714d6dd
2 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/IDE/CompletionLookup.cpp
View File

@@ -3500,54 +3500,23 @@ void CompletionLookup::lookupExternalModuleDecls(
}
void CompletionLookup::getStmtLabelCompletions(SourceLoc Loc, bool isContinue) {
class LabelFinder : public ASTWalker {
SourceManager &SM;
SourceLoc TargetLoc;
bool IsContinue;
auto *SF = CurrDeclContext->getParentSourceFile();
llvm::SmallPtrSet<Identifier, 4> labels;
for (auto *LS : ASTScope::lookupLabeledStmts(SF, Loc)) {
if (isContinue && !LS->isPossibleContinueTarget())
continue;
public:
SmallVector<Identifier, 2> Result;
auto labelInfo = LS->getLabelInfo();
if (!labelInfo)
continue;
/// Walk only the arguments of a macro.
MacroWalking getMacroWalkingBehavior() const override {
return MacroWalking::Arguments;
}
auto label = labelInfo.Name;
if (!labels.insert(label).second)
continue;
LabelFinder(SourceManager &SM, SourceLoc TargetLoc, bool IsContinue)
: SM(SM), TargetLoc(TargetLoc), IsContinue(IsContinue) {}
PreWalkResult<Stmt *> walkToStmtPre(Stmt *S) override {
if (SM.isBeforeInBuffer(S->getEndLoc(), TargetLoc))
return Action::SkipNode(S);
if (LabeledStmt *LS = dyn_cast<LabeledStmt>(S)) {
if (LS->getLabelInfo()) {
if (!IsContinue || LS->isPossibleContinueTarget()) {
auto label = LS->getLabelInfo().Name;
if (!llvm::is_contained(Result, label))
Result.push_back(label);
}
}
}
return Action::Continue(S);
}
PostWalkResult<Stmt *> walkToStmtPost(Stmt *S) override {
return Action::Stop();
}
PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
if (SM.isBeforeInBuffer(E->getEndLoc(), TargetLoc))
return Action::SkipNode(E);
return Action::Continue(E);
}
} Finder(CurrDeclContext->getASTContext().SourceMgr, Loc, isContinue);
const_cast<DeclContext *>(CurrDeclContext)->walkContext(Finder);
for (auto name : Finder.Result) {
CodeCompletionResultBuilder Builder = makeResultBuilder(
CodeCompletionResultKind::Pattern, SemanticContextKind::Local);
Builder.addTextChunk(name.str());
Builder.addTextChunk(label.str());
}
}

9
test/IDE/complete_controltransfer.swift
View File

@@ -56,6 +56,15 @@ func test(subject: Int) {
// LABEL_7: Begin completions, 1 items
// LABEL_7-DAG: Pattern/Local: OUTER_FOR_1;
}
// This is illegal, but make sure we don't duplicate in completion.
DUPLICATE_LABEL: do {
DUPLICATE_LABEL: do {
break #^LABEL_8^#
// LABEL_8: Begin completions, 1 items
// LABEL_8-DAG: Pattern/Local: DUPLICATE_LABEL;
}
}
}
TOP_IF_1: if true {}