Skip to content

Commit 8ae8f1d

Browse files
committed
[Completion] Remove unused DocWords
The various keyword/recommended/etc fields were parsed and added to completions, but never actually plumbed through SourceKit. Since they're still unused and the implementation is not particularly lightweight, just remove for now. Resolves rdar://82464220
1 parent 382f04a commit 8ae8f1d

File tree

8 files changed

+38
-464
lines changed

8 files changed

+38
-464
lines changed

include/swift/IDE/CodeCompletion.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,6 @@ class CodeCompletionResult {
646646
StringRef SourceFilePath;
647647
StringRef BriefDocComment;
648648
ArrayRef<StringRef> AssociatedUSRs;
649-
ArrayRef<std::pair<StringRef, StringRef>> DocWords;
650649
unsigned TypeDistance : 3;
651650
unsigned DiagnosticSeverity: 3;
652651
StringRef DiagnosticMessage;
@@ -731,15 +730,13 @@ class CodeCompletionResult {
731730
CodeCompletionResult::NotRecommendedReason NotRecReason,
732731
StringRef BriefDocComment,
733732
ArrayRef<StringRef> AssociatedUSRs,
734-
ArrayRef<std::pair<StringRef, StringRef>> DocWords,
735733
enum ExpectedTypeRelation TypeDistance)
736734
: Kind(ResultKind::Declaration), KnownOperatorKind(0),
737735
SemanticContext(unsigned(SemanticContext)), Flair(unsigned(Flair.toRaw())),
738736
NotRecommended(unsigned(NotRecReason)),
739737
NumBytesToErase(NumBytesToErase), CompletionString(CompletionString),
740738
ModuleName(ModuleName), BriefDocComment(BriefDocComment),
741-
AssociatedUSRs(AssociatedUSRs), DocWords(DocWords),
742-
TypeDistance(TypeDistance) {
739+
AssociatedUSRs(AssociatedUSRs), TypeDistance(TypeDistance) {
743740
assert(AssociatedDecl && "should have a decl");
744741
AssociatedKind = unsigned(getCodeCompletionDeclKind(AssociatedDecl));
745742
IsSystem = getDeclIsSystem(AssociatedDecl);
@@ -762,7 +759,6 @@ class CodeCompletionResult {
762759
CodeCompletionDiagnosticSeverity diagSeverity,
763760
StringRef DiagnosticMessage, StringRef BriefDocComment,
764761
ArrayRef<StringRef> AssociatedUSRs,
765-
ArrayRef<std::pair<StringRef, StringRef>> DocWords,
766762
ExpectedTypeRelation TypeDistance,
767763
CodeCompletionOperatorKind KnownOperatorKind)
768764
: Kind(ResultKind::Declaration),
@@ -772,8 +768,7 @@ class CodeCompletionResult {
772768
NumBytesToErase(NumBytesToErase), CompletionString(CompletionString),
773769
ModuleName(ModuleName), SourceFilePath(SourceFilePath),
774770
BriefDocComment(BriefDocComment), AssociatedUSRs(AssociatedUSRs),
775-
DocWords(DocWords), TypeDistance(TypeDistance),
776-
DiagnosticSeverity(unsigned(diagSeverity)),
771+
TypeDistance(TypeDistance), DiagnosticSeverity(unsigned(diagSeverity)),
777772
DiagnosticMessage(DiagnosticMessage) {
778773
AssociatedKind = static_cast<unsigned>(DeclKind);
779774
assert(CompletionString);
@@ -869,10 +864,6 @@ class CodeCompletionResult {
869864
return AssociatedUSRs;
870865
}
871866

872-
ArrayRef<std::pair<StringRef, StringRef>> getDeclKeywords() const {
873-
return DocWords;
874-
}
875-
876867
void setSourceFilePath(StringRef value) {
877868
SourceFilePath = value;
878869
}

0 commit comments

Comments
 (0)