[swift-ide-test] Use dedicated method for code completion on CompletionInstance instead of generic performOperation

Author: ahoppen

include/swift/IDE/CodeCompletion.h

@@ -1094,32 +1094,6 @@ struct SimpleCachingCodeCompletionConsumer : public CodeCompletionConsumer {
   virtual void handleResults(CodeCompletionContext &context) = 0;
 };
 
-/// A code completion result consumer that prints the results to a
-/// \c raw_ostream.
-class PrintingCodeCompletionConsumer
-    : public SimpleCachingCodeCompletionConsumer {
-  llvm::raw_ostream &OS;
-  bool IncludeKeywords;
-  bool IncludeComments;
-  bool IncludeSourceText;
-  bool PrintAnnotatedDescription;
-
-public:
- PrintingCodeCompletionConsumer(llvm::raw_ostream &OS,
-                                bool IncludeKeywords = true,
-                                bool IncludeComments = true,
-                                bool IncludeSourceText = false,
-                                bool PrintAnnotatedDescription = false)
-     : OS(OS),
-       IncludeKeywords(IncludeKeywords),
-       IncludeComments(IncludeComments),
-       IncludeSourceText(IncludeSourceText),
-       PrintAnnotatedDescription(PrintAnnotatedDescription) {}
-
-  void handleResults(CodeCompletionContext &context) override;
-  void handleResults(MutableArrayRef<CodeCompletionResult *> Results);
-};
-
 /// Create a factory for code completion callbacks.
 CodeCompletionCallbacksFactory *
 makeCodeCompletionCallbacksFactory(CodeCompletionContext &CompletionContext,

lib/IDE/CodeCompletion.cpp

@@ -7406,81 +7406,6 @@ void CodeCompletionCallbacksImpl::doneParsing() {
   deliverCompletionResults(CompletionContext, Lookup, CurDeclContext, Consumer);
 }
 
-void PrintingCodeCompletionConsumer::handleResults(
-    CodeCompletionContext &context) {
-  auto results = context.takeResults();
-  handleResults(results);
-}
-
-void PrintingCodeCompletionConsumer::handleResults(
-    MutableArrayRef<CodeCompletionResult *> Results) {
-  unsigned NumResults = 0;
-  for (auto Result : Results) {
-    if (!IncludeKeywords && Result->getKind() == CodeCompletionResult::Keyword)
-      continue;
-    ++NumResults;
-  }
-  if (NumResults == 0)
-    return;
-
-  OS << "Begin completions, " << NumResults << " items\n";
-  for (auto Result : Results) {
-    if (!IncludeKeywords && Result->getKind() == CodeCompletionResult::Keyword)
-      continue;
-    Result->printPrefix(OS);
-    if (PrintAnnotatedDescription) {
-      printCodeCompletionResultDescriptionAnnotated(*Result, OS, /*leadingPunctuation=*/false);
-      OS << "; typename=";
-      printCodeCompletionResultTypeNameAnnotated(*Result, OS);
-    } else {
-      Result->getCompletionString()->print(OS);
-    }
-
-    OS << "; name=";
-    printCodeCompletionResultFilterName(*Result, OS);
-
-    if (IncludeSourceText) {
-      OS << "; sourcetext=";
-      SmallString<64> buf;
-      {
-        llvm::raw_svector_ostream bufOS(buf);
-        printCodeCompletionResultSourceText(*Result, bufOS);
-      }
-      OS.write_escaped(buf);
-    }
-
-    StringRef comment = Result->getBriefDocComment();
-    if (IncludeComments && !comment.empty()) {
-      OS << "; comment=" << comment;
-    }
-
-    if (Result->getDiagnosticSeverity() !=
-        CodeCompletionDiagnosticSeverity::None) {
-      OS << "; diagnostics=" << comment;
-      switch (Result->getDiagnosticSeverity()) {
-      case CodeCompletionDiagnosticSeverity::Error:
-        OS << "error";
-        break;
-      case CodeCompletionDiagnosticSeverity::Warning:
-        OS << "warning";
-        break;
-      case CodeCompletionDiagnosticSeverity::Remark:
-        OS << "remark";
-        break;
-      case CodeCompletionDiagnosticSeverity::Note:
-        OS << "note";
-        break;
-      case CodeCompletionDiagnosticSeverity::None:
-        llvm_unreachable("none");
-      }
-      OS << ":" << Result->getDiagnosticMessage();
-    }
-
-    OS << "\n";
-  }
-  OS << "End completions\n";
-}
-
 namespace {
 class CodeCompletionCallbacksFactoryImpl
     : public CodeCompletionCallbacksFactory {