Skip to content

[CodeCompletion] Eliminate super related completion #25787

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
Jun 26, 2019
Merged

[CodeCompletion] Eliminate super related completion #25787

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
2 changes: 0 additions & 2 deletions include/swift/IDE/CodeCompletion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,6 @@ enum class CompletionKind {
PostfixExprBeginning,
PostfixExpr,
PostfixExprParen,
SuperExpr,
SuperExprDot,
KeyPathExprObjC,
KeyPathExprSwift,
TypeDeclResultBeginning,
Expand Down
7 changes: 0 additions & 7 deletions include/swift/Parse/CodeCompletionCallbacks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,6 @@ class CodeCompletionCallbacks {
/// left parenthesis.
virtual void completePostfixExprParen(Expr *E, Expr *CodeCompletionE) {};

/// Complete expr-super after we have consumed the 'super' keyword.
virtual void completeExprSuper(SuperRefExpr *SRE) {};

/// Complete expr-super after we have consumed the 'super' keyword and
/// a dot.
virtual void completeExprSuperDot(SuperRefExpr *SRE) {};

/// Complete the argument to an Objective-C #keyPath
/// expression.
///
Expand Down
2 changes: 1 addition & 1 deletion include/swift/Parse/Parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ class Parser {
ParserResult<Expr> parseExprKeyPathObjC();
ParserResult<Expr> parseExprKeyPath();
ParserResult<Expr> parseExprSelector();
ParserResult<Expr> parseExprSuper(bool isExprBasic);
ParserResult<Expr> parseExprSuper();
ParserResult<Expr> parseExprConfiguration();
ParserResult<Expr> parseExprStringLiteral();
ParserResult<Expr> parseExprTypeOf();
Expand Down
55 changes: 8 additions & 47 deletions lib/IDE/CodeCompletion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,8 +1329,6 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks {
void completeForEachSequenceBeginning(CodeCompletionExpr *E) override;
void completePostfixExpr(Expr *E, bool hasSpace) override;
void completePostfixExprParen(Expr *E, Expr *CodeCompletionE) override;
void completeExprSuper(SuperRefExpr *SRE) override;
void completeExprSuperDot(SuperRefExpr *SRE) override;
void completeExprKeyPath(KeyPathExpr *KPE, SourceLoc DotLoc) override;

void completeTypeDeclResultBeginning() override;
Expand Down Expand Up @@ -3256,6 +3254,9 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
}

void getPostfixKeywordCompletions(Type ExprType, Expr *ParsedExpr) {
if (IsSuperRefExpr)
return;

if (!ExprType->getAs<ModuleType>()) {
addKeyword(getTokenText(tok::kw_self), ExprType->getRValueType(),
SemanticContextKind::CurrentNominal,
Expand Down Expand Up @@ -3508,6 +3509,9 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
}

void getOperatorCompletions(Expr *LHS, ArrayRef<Expr *> leadingSequence) {
if (IsSuperRefExpr)
return;

Expr *foldedExpr = typeCheckLeadingSequence(LHS, leadingSequence);

std::vector<OperatorDecl *> operators = collectOperators();
Expand Down Expand Up @@ -4558,36 +4562,6 @@ void CodeCompletionCallbacksImpl::completePostfixExprParen(Expr *E,
}
}

void CodeCompletionCallbacksImpl::completeExprSuper(SuperRefExpr *SRE) {
// Don't produce any results in an enum element.
if (InEnumElementRawValue)
return;

Kind = CompletionKind::SuperExpr;
if (ParseExprSelectorContext != ObjCSelectorContext::None) {
PreferFunctionReferencesToCalls = true;
CompleteExprSelectorContext = ParseExprSelectorContext;
}

ParsedExpr = SRE;
CurDeclContext = P.CurDeclContext;
}

void CodeCompletionCallbacksImpl::completeExprSuperDot(SuperRefExpr *SRE) {
// Don't produce any results in an enum element.
if (InEnumElementRawValue)
return;

Kind = CompletionKind::SuperExprDot;
if (ParseExprSelectorContext != ObjCSelectorContext::None) {
PreferFunctionReferencesToCalls = true;
CompleteExprSelectorContext = ParseExprSelectorContext;
}

ParsedExpr = SRE;
CurDeclContext = P.CurDeclContext;
}

void CodeCompletionCallbacksImpl::completeExprKeyPath(KeyPathExpr *KPE,
SourceLoc DotLoc) {
Kind = (!KPE || KPE->isObjC()) ? CompletionKind::KeyPathExprObjC
Expand Down Expand Up @@ -4948,8 +4922,6 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,

case CompletionKind::PostfixExpr:
case CompletionKind::PostfixExprParen:
case CompletionKind::SuperExpr:
case CompletionKind::SuperExprDot:
case CompletionKind::CaseStmtBeginning:
case CompletionKind::TypeIdentifierWithDot:
case CompletionKind::TypeIdentifierWithoutDot:
Expand Down Expand Up @@ -5172,6 +5144,8 @@ void CodeCompletionCallbacksImpl::doneParsing() {
}
if (auto *DRE = dyn_cast_or_null<DeclRefExpr>(ParsedExpr)) {
Lookup.setIsSelfRefExpr(DRE->getDecl()->getFullName() == Context.Id_self);
} else if (auto *SRE = dyn_cast_or_null<SuperRefExpr>(ParsedExpr)) {
Lookup.setIsSuperRefExpr();
}

if (isInsideObjCSelector())
Expand Down Expand Up @@ -5299,19 +5273,6 @@ void CodeCompletionCallbacksImpl::doneParsing() {
break;
}

case CompletionKind::SuperExpr: {
Lookup.setIsSuperRefExpr();
Lookup.getValueExprCompletions(*ExprType, ReferencedDecl.getDecl());
break;
}

case CompletionKind::SuperExprDot: {
Lookup.setIsSuperRefExpr();
Lookup.setHaveDot(SourceLoc());
Lookup.getValueExprCompletions(*ExprType, ReferencedDecl.getDecl());
break;
}

case CompletionKind::KeyPathExprObjC: {
if (DotLoc.isValid())
Lookup.setHaveDot(DotLoc);
Expand Down
101 changes: 21 additions & 80 deletions lib/Parse/ParseExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,89 +866,28 @@ static VarDecl *getImplicitSelfDeclForSuperContext(Parser &P,
/// 'super' '.' 'init'
/// expr-super-subscript:
/// 'super' '[' expr ']'
ParserResult<Expr> Parser::parseExprSuper(bool isExprBasic) {
ParserResult<Expr> Parser::parseExprSuper() {
SyntaxParsingContext SuperCtxt(SyntaxContext, SyntaxContextKind::Expr);
// Parse the 'super' reference.
SourceLoc superLoc = consumeToken(tok::kw_super);

VarDecl *selfDecl = getImplicitSelfDeclForSuperContext(*this,
CurDeclContext,
superLoc);
bool ErrorOccurred = selfDecl == nullptr;

SyntaxContext->createNodeInPlace(SyntaxKind::SuperRefExpr);
Expr *superRef = !ErrorOccurred
? cast<Expr>(new (Context) SuperRefExpr(selfDecl, superLoc,
/*Implicit=*/false))
: cast<Expr>(new (Context) ErrorExpr(superLoc));

if (Tok.isAny(tok::period, tok::period_prefix)) {
// 'super.' must be followed by a member or initializer ref.

SourceLoc dotLoc = consumeToken();

if (Tok.is(tok::code_complete)) {
if (CodeCompletion) {
if (auto *SRE = dyn_cast<SuperRefExpr>(superRef))
CodeCompletion->completeExprSuperDot(SRE);
}

// Eat the code completion token because we handled it.
consumeToken(tok::code_complete);
return makeParserCodeCompletionResult(superRef);
}

DeclNameLoc nameLoc;
DeclName name = parseUnqualifiedDeclName(/*afterDot=*/true, nameLoc,
diag::expected_identifier_after_super_dot_expr);
if (!name)
return nullptr;

SyntaxContext->createNodeInPlace(SyntaxKind::MemberAccessExpr);
return makeParserResult(
new (Context) UnresolvedDotExpr(superRef, dotLoc, name, nameLoc,
/*Implicit=*/false));
}

if (Tok.isFollowingLSquare()) {
// super[expr]
SourceLoc lSquareLoc, rSquareLoc;
SmallVector<Expr *, 2> indexArgs;
SmallVector<Identifier, 2> indexArgLabels;
SmallVector<SourceLoc, 2> indexArgLabelLocs;
Expr *trailingClosure;

ParserStatus status = parseExprList(tok::l_square, tok::r_square,
/*isPostfix=*/true, isExprBasic,
lSquareLoc, indexArgs, indexArgLabels,
indexArgLabelLocs,
rSquareLoc,
trailingClosure,
SyntaxKind::FunctionCallArgumentList);
SyntaxContext->createNodeInPlace(SyntaxKind::SubscriptExpr);
return makeParserResult(
status,
SubscriptExpr::create(Context, superRef, lSquareLoc, indexArgs,
indexArgLabels, indexArgLabelLocs, rSquareLoc,
trailingClosure, ConcreteDeclRef(),
/*implicit=*/false));
// 'super.' must be followed by a member ref, explicit initializer ref, or
// subscript call.
if (Tok.isNot(tok::period, tok::period_prefix, tok::l_square,
tok::code_complete)) {
if (!consumeIf(tok::unknown))
diagnose(Tok, diag::expected_dot_or_subscript_after_super);
return nullptr;
}

if (Tok.is(tok::code_complete)) {
if (CodeCompletion) {
if (auto *SRE = dyn_cast<SuperRefExpr>(superRef))
CodeCompletion->completeExprSuper(SRE);
}
// Eat the code completion token because we handled it.
consumeToken(tok::code_complete);
return makeParserCodeCompletionResult(superRef);
}

if (consumeIf(tok::unknown))
return nullptr;

diagnose(Tok, diag::expected_dot_or_subscript_after_super);
return nullptr;
VarDecl *selfDecl =
getImplicitSelfDeclForSuperContext(*this, CurDeclContext, superLoc);
if (!selfDecl)
return makeParserResult(new (Context) ErrorExpr(superLoc));

return makeParserResult(new (Context) SuperRefExpr(selfDecl, superLoc,
/*Implicit=*/false));
}

/// Copy a numeric literal value into AST-owned memory, stripping underscores
Expand Down Expand Up @@ -1188,8 +1127,10 @@ Parser::parseExprPostfixSuffix(ParserResult<Expr> Result, bool isExprBasic,
}

DeclNameLoc NameLoc;
DeclName Name = parseUnqualifiedDeclName(/*afterDot=*/true, NameLoc,
diag::expected_member_name);
Diag<> D = isa<SuperRefExpr>(Result.get())
? diag::expected_identifier_after_super_dot_expr
: diag::expected_member_name;
DeclName Name = parseUnqualifiedDeclName(/*afterDot=*/true, NameLoc, D);
if (!Name)
return nullptr;
SyntaxContext->createNodeInPlace(SyntaxKind::MemberAccessExpr);
Expand Down Expand Up @@ -1688,8 +1629,8 @@ ParserResult<Expr> Parser::parseExprPrimary(Diag<> ID, bool isExprBasic) {
/*implicit=*/false));
}

case tok::kw_super: // super.foo or super[foo]
return parseExprSuper(isExprBasic);
case tok::kw_super: // 'super'
return parseExprSuper();

case tok::l_paren:
// Build a tuple expression syntax node.
Expand Down
13 changes: 11 additions & 2 deletions test/IDE/complete_after_super.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt

// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CLOSURE_2 > %t.super.txt
// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_DOT < %t.super.txt
// RUN: %FileCheck %s -check-prefix=COMMON_BASE_A_DOT_CONTEXT < %t.super.txt
// RUN: %FileCheck %s -check-prefix=CLOSURE_2 < %t.super.txt
// RUN: %FileCheck %s -check-prefix=NO_CONSTRUCTORS < %t.super.txt

Expand Down Expand Up @@ -227,6 +227,15 @@ extension SuperBaseA {
// COMMON_BASE_A_DOT-DAG: Decl[InstanceMethod]/CurrNominal: baseExtFunc0()[#Void#]{{; name=.+$}}
// COMMON_BASE_A_DOT: End completions

// COMMON_BASE_A_DOT_CONTEXT: Begin completions
// COMMON_BASE_A_DOT_CONTEXT-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Identical]: baseInstanceVar[#Int#]{{; name=.+$}}
// COMMON_BASE_A_DOT_CONTEXT-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Identical]: baseProp[#Int#]{{; name=.+$}}
// COMMON_BASE_A_DOT_CONTEXT-DAG: Decl[InstanceMethod]/CurrNominal: baseFunc0()[#Void#]{{; name=.+$}}
// COMMON_BASE_A_DOT_CONTEXT-DAG: Decl[InstanceMethod]/CurrNominal: baseFunc1({#(a): Int#})[#Void#]{{; name=.+$}}
// COMMON_BASE_A_DOT_CONTEXT-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Identical]: baseExtProp[#Int#]{{; name=.+$}}
// COMMON_BASE_A_DOT_CONTEXT-DAG: Decl[InstanceMethod]/CurrNominal: baseExtFunc0()[#Void#]{{; name=.+$}}
// COMMON_BASE_A_DOT_CONTEXT: End completions

class SuperDerivedA : SuperBaseA {
var derivedInstanceVar: Int

Expand Down Expand Up @@ -514,7 +523,7 @@ class Closures : SuperBaseA {
}

func bar() {
let inner = { () -> Void in
let inner = { () -> Int in
// CLOSURE_2: Begin completions, 6 items
// CLOSURE_2: End completions
super.#^CLOSURE_2^#
Expand Down