[SourceKit] Make completion-like helper functions static

Author: ahoppen

tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

@@ -92,19 +92,6 @@ static UIdent getUIDForCodeCompletionKindToReport(CompletionKind kind) {
   }
 }
 
-/// The result returned via the Callback of \c swiftCodeCompleteImpl.
-/// If \c HasResults is \c false, code completion did not fail, but did not
-/// produce any values either. All other fields of the struct should be ignored
-/// in that case.
-struct CodeCompleteImplResult {
-  bool HasResults;
-  swift::ASTContext *Context;
-  const swift::CompilerInvocation *Invocation;
-  swift::ide::CodeCompletionContext *CompletionContext;
-  ArrayRef<RequestedCachedModule> RequestedModules;
-  DeclContext *DC;
-};
-
 static void swiftCodeCompleteImpl(
     SwiftLangSupport &Lang, llvm::MemoryBuffer *UnresolvedInputFile,
     unsigned Offset, ArrayRef<const char *> Args,
@@ -141,9 +128,10 @@ static void translateCodeCompletionOptions(OptionsDictionary &from,
                                            unsigned &resultOffset,
                                            unsigned &maxResults);
 
-void deliverCodeCompleteResults(SourceKit::CodeCompletionConsumer &SKConsumer,
-                                const CodeCompletion::Options &CCOpts,
-                                CancellableResult<CodeCompleteResult> Result) {
+static void
+deliverCodeCompleteResults(SourceKit::CodeCompletionConsumer &SKConsumer,
+                           const CodeCompletion::Options &CCOpts,
+                           CancellableResult<CodeCompleteResult> Result) {
   switch (Result.getKind()) {
   case CancellableResultKind::Success: {
     auto kind = getUIDForCodeCompletionKindToReport(

tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp

@@ -32,8 +32,9 @@ translateConformingMethodListOptions(OptionsDictionary &from,
   // ConformingMethodList doesn't receive any options at this point.
 }
 
-void deliverResults(SourceKit::ConformingMethodListConsumer &SKConsumer,
-                    CancellableResult<ConformingMethodListResults> Result) {
+static void
+deliverResults(SourceKit::ConformingMethodListConsumer &SKConsumer,
+               CancellableResult<ConformingMethodListResults> Result) {
   switch (Result.getKind()) {
   case CancellableResultKind::Success: {
     SKConsumer.setReusingASTContext(Result->DidReuseAST);

tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp

@@ -30,8 +30,8 @@ static void translateTypeContextInfoOptions(OptionsDictionary &from,
   // TypeContextInfo doesn't receive any options at this point.
 }
 
-void deliverResults(SourceKit::TypeContextInfoConsumer &SKConsumer,
-                    CancellableResult<TypeContextInfoResult> Result) {
+static void deliverResults(SourceKit::TypeContextInfoConsumer &SKConsumer,
+                           CancellableResult<TypeContextInfoResult> Result) {
   switch (Result.getKind()) {
   case CancellableResultKind::Success: {
     SKConsumer.setReusingASTContext(Result->DidReuseAST);