Skip to content

[5.9][CodeComplete] Offer completions after ~ in an inheritance clause #65933

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions include/swift/IDE/CodeCompletionResult.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ enum class CompletionKind : uint8_t {
ForEachPatternBeginning,
TypeAttrBeginning,
OptionalBinding,

/// Completion after `~` in an inheritance clause.
WithoutConstraintType
};

enum class CodeCompletionDiagnosticSeverity : uint8_t {
Expand Down
2 changes: 2 additions & 0 deletions include/swift/IDE/CompletionLookup.h
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,8 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
void getStmtLabelCompletions(SourceLoc Loc, bool isContinue);

void getOptionalBindingCompletions(SourceLoc Loc);

void getWithoutConstraintTypes();
};

} // end namespace ide
Expand Down
2 changes: 2 additions & 0 deletions include/swift/Parse/IDEInspectionCallbacks.h
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ class CodeCompletionCallbacks {
virtual void completeTypeAttrBeginning() {};

virtual void completeOptionalBinding(){};

virtual void completeWithoutConstraintType(){};
};

class DoneParsingCallback {
Expand Down
12 changes: 12 additions & 0 deletions lib/IDE/CodeCompletion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
void completeForEachPatternBeginning(bool hasTry, bool hasAwait) override;
void completeTypeAttrBeginning() override;
void completeOptionalBinding() override;
void completeWithoutConstraintType() override;

void doneParsing(SourceFile *SrcFile) override;

Expand Down Expand Up @@ -664,6 +665,11 @@ void CodeCompletionCallbacksImpl::completeOptionalBinding() {
Kind = CompletionKind::OptionalBinding;
}

void CodeCompletionCallbacksImpl::completeWithoutConstraintType() {
CurDeclContext = P.CurDeclContext;
Kind = CompletionKind::WithoutConstraintType;
}

void CodeCompletionCallbacksImpl::completeTypeAttrBeginning() {
CurDeclContext = P.CurDeclContext;
Kind = CompletionKind::TypeAttrBeginning;
Expand Down Expand Up @@ -975,6 +981,7 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
case CompletionKind::StmtLabel:
case CompletionKind::TypeAttrBeginning:
case CompletionKind::OptionalBinding:
case CompletionKind::WithoutConstraintType:
break;

case CompletionKind::EffectsSpecifier:
Expand Down Expand Up @@ -2057,6 +2064,11 @@ void CodeCompletionCallbacksImpl::doneParsing(SourceFile *SrcFile) {
break;
}

case CompletionKind::WithoutConstraintType: {
Lookup.getWithoutConstraintTypes();
break;
}

case CompletionKind::AfterIfStmtElse:
case CompletionKind::CaseStmtKeyword:
case CompletionKind::EffectsSpecifier:
Expand Down
6 changes: 6 additions & 0 deletions lib/IDE/CompletionLookup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3348,3 +3348,9 @@ void CompletionLookup::getOptionalBindingCompletions(SourceLoc Loc) {
lookupVisibleDecls(FilteringConsumer, CurrDeclContext,
/*IncludeTopLevel=*/false, Loc);
}

void CompletionLookup::getWithoutConstraintTypes() {
// FIXME: Once we have a typealias declaration for copyable, we should be
// returning that instead of a keyword (rdar://109107817).
addKeyword("Copyable");
}
7 changes: 7 additions & 0 deletions lib/Parse/ParseDecl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5783,6 +5783,13 @@ ParserStatus Parser::parseInheritance(
TildeCopyableLoc = tildeLoc;

continue;
} else if (nextTok.is(tok::code_complete)) {
consumeToken(); // consume '~'
Status.setHasCodeCompletionAndIsError();
if (CodeCompletionCallbacks) {
CodeCompletionCallbacks->completeWithoutConstraintType();
}
consumeToken(tok::code_complete);
}

// can't suppress whatever is between '~' and ',' or '{'.
Expand Down
6 changes: 6 additions & 0 deletions test/IDE/complete_without_constraint_type.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t

struct FileDescriptor: ~#^COMPLETE^# {}
// FIXME: This should be emitting a `Copyable` declaration instead of a keyword, once there is a declaration for `Copyable`
// COMPLETE: Keyword/None: Copyable; name=Copyable