Skip to content

Commit cedc5c2

Browse files
committed
[CodeCompletion] Remove completeCaseStmtDotPrefix() completion
Now that, normal dot-member completion works at case position. We don't need to handle it specially. rdar://problem/45219937 (cherry picked from commit 588d87b)
1 parent ae66180 commit cedc5c2

File tree

5 files changed

+0
-35
lines changed

5 files changed

+0
-35
lines changed

include/swift/IDE/CodeCompletion.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ enum class CompletionKind {
495495
TypeIdentifierWithoutDot,
496496
CaseStmtKeyword,
497497
CaseStmtBeginning,
498-
CaseStmtDotPrefix,
499498
NominalMemberBeginning,
500499
AccessorBeginning,
501500
AttributeBegin,

include/swift/Parse/CodeCompletionCallbacks.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ class CodeCompletionCallbacks {
177177
/// Complete at the beginning of a case stmt pattern.
178178
virtual void completeCaseStmtBeginning() {};
179179

180-
/// Complete a case stmt pattern that starts with a dot.
181-
virtual void completeCaseStmtDotPrefix() {};
182-
183180
/// Complete at the beginning of member of a nominal decl member -- no tokens
184181
/// provided by user.
185182
virtual void completeNominalMemberBeginning(

lib/IDE/CodeCompletion.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,6 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks {
13801380

13811381
void completeCaseStmtKeyword() override;
13821382
void completeCaseStmtBeginning() override;
1383-
void completeCaseStmtDotPrefix() override;
13841383
void completeDeclAttrBeginning(bool Sil, bool isIndependent) override;
13851384
void completeDeclAttrParam(DeclAttrKind DK, int Index) override;
13861385
void completeInPrecedenceGroup(SyntaxKind SK) override;
@@ -4733,13 +4732,6 @@ void CodeCompletionCallbacksImpl::completeCaseStmtBeginning() {
47334732
CurDeclContext = P.CurDeclContext;
47344733
}
47354734

4736-
void CodeCompletionCallbacksImpl::completeCaseStmtDotPrefix() {
4737-
assert(!InEnumElementRawValue);
4738-
4739-
Kind = CompletionKind::CaseStmtDotPrefix;
4740-
CurDeclContext = P.CurDeclContext;
4741-
}
4742-
47434735
void CodeCompletionCallbacksImpl::completeImportDecl(
47444736
std::vector<std::pair<Identifier, SourceLoc>> &Path) {
47454737
Kind = CompletionKind::Import;
@@ -5023,7 +5015,6 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
50235015
case CompletionKind::SuperExpr:
50245016
case CompletionKind::SuperExprDot:
50255017
case CompletionKind::CaseStmtBeginning:
5026-
case CompletionKind::CaseStmtDotPrefix:
50275018
case CompletionKind::TypeIdentifierWithDot:
50285019
case CompletionKind::TypeIdentifierWithoutDot:
50295020
break;
@@ -5429,13 +5420,6 @@ void CodeCompletionCallbacksImpl::doneParsing() {
54295420
break;
54305421
}
54315422

5432-
case CompletionKind::CaseStmtDotPrefix: {
5433-
Lookup.setHaveDot(SourceLoc());
5434-
SourceLoc Loc = P.Context.SourceMgr.getCodeCompletionLoc();
5435-
Lookup.getTypeContextEnumElementCompletions(Loc);
5436-
break;
5437-
}
5438-
54395423
case CompletionKind::NominalMemberBeginning: {
54405424
CompletionOverrideLookup OverrideLookup(CompletionContext.getResultSink(),
54415425
P.Context, CurDeclContext,

lib/IDE/TypeContextInfo.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ class ContextInfoCallbacks : public CodeCompletionCallbacks {
4646

4747
void completeUnresolvedMember(CodeCompletionExpr *E,
4848
SourceLoc DotLoc) override;
49-
void completeCaseStmtDotPrefix() override;
5049

5150
void doneParsing() override;
5251
};
@@ -84,9 +83,6 @@ void ContextInfoCallbacks::completeUnresolvedMember(CodeCompletionExpr *E,
8483
void ContextInfoCallbacks::completeCaseStmtBeginning() {
8584
// TODO: Implement?
8685
}
87-
void ContextInfoCallbacks::completeCaseStmtDotPrefix() {
88-
// TODO: Implement?
89-
}
9086

9187
void ContextInfoCallbacks::doneParsing() {
9288
if (!ParsedExpr)

lib/Parse/ParseStmt.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,17 +1096,6 @@ static void parseGuardedPattern(Parser &P, GuardedPattern &result,
10961096
status.setHasCodeCompletion();
10971097
return;
10981098
}
1099-
if (parsingContext == GuardedPatternContext::Case &&
1100-
P.Tok.isAny(tok::period_prefix, tok::period) &&
1101-
P.peekToken().is(tok::code_complete)) {
1102-
P.consumeToken();
1103-
if (P.CodeCompletion)
1104-
P.CodeCompletion->completeCaseStmtDotPrefix();
1105-
auto loc = P.consumeToken(tok::code_complete);
1106-
result.ThePattern = new (P.Context) AnyPattern(loc);
1107-
status.setHasCodeCompletion();
1108-
return;
1109-
}
11101099

11111100
// If this is a 'catch' clause and we have "catch {" or "catch where...",
11121101
// then we get an implicit "let error" pattern.

0 commit comments

Comments
 (0)