[SourceKit] Pass CompletionContext by reference to CompletionInstance

Author: ahoppen

include/swift/IDE/CompletionInstance.h

@@ -154,7 +154,7 @@ class CompletionInstance {
       swift::CompilerInvocation &Invocation, llvm::ArrayRef<const char *> Args,
       llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
       llvm::MemoryBuffer *completionBuffer, unsigned int Offset,
-      DiagnosticConsumer *DiagC, ide::CodeCompletionContext &&CompletionContext,
+      DiagnosticConsumer *DiagC, ide::CodeCompletionContext &CompletionContext,
       llvm::function_ref<void(CancellableResult<CodeCompleteResult>)> Callback);
 
   void typeContextInfo(

lib/IDE/CompletionInstance.cpp

@@ -661,7 +661,7 @@ void swift::ide::CompletionInstance::codeComplete(
     swift::CompilerInvocation &Invocation, llvm::ArrayRef<const char *> Args,
     llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
     llvm::MemoryBuffer *completionBuffer, unsigned int Offset,
-    DiagnosticConsumer *DiagC, ide::CodeCompletionContext &&CompletionContext,
+    DiagnosticConsumer *DiagC, ide::CodeCompletionContext &CompletionContext,
     llvm::function_ref<void(CancellableResult<CodeCompleteResult>)> Callback) {
   using ResultType = CancellableResult<CodeCompleteResult>;
 

tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

@@ -116,7 +116,7 @@ static void swiftCodeCompleteImpl(
               Lang.getCompletionInstance()->codeComplete(
                   CIParams.Invocation, Args, FileSystem,
                   CIParams.completionBuffer, Offset, CIParams.DiagC,
-                  std::move(CompletionContext), DeliverTransformed);
+                  CompletionContext, DeliverTransformed);
             },
             Callback);
       });

tools/swift-ide-test/swift-ide-test.cpp

@@ -1156,7 +1156,7 @@ static int doCodeCompletion(const CompilerInvocation &InitInvok,
         Inst.codeComplete(
             Params.Invocation, Params.Args, Params.FileSystem,
             Params.CompletionBuffer, Params.Offset, Params.DiagC,
-            std::move(CompletionContext),
+            CompletionContext,
             [&](CancellableResult<CodeCompleteResult> Result) {
               ExitCode = printCodeCompletionResults(
                   Result, CodeCompletionKeywords, CodeCompletionComments,
@@ -1484,8 +1484,7 @@ static int doBatchCodeCompletion(const CompilerInvocation &InitInvok,
     bool CallbackCalled = false;
     CompletionInst.codeComplete(
         Invocation, /*Args=*/{}, FileSystem, completionBuffer.get(), Offset,
-        CodeCompletionDiagnostics ? &PrintDiags : nullptr,
-        std::move(CompletionContext),
+        CodeCompletionDiagnostics ? &PrintDiags : nullptr, CompletionContext,
         [&](CancellableResult<CodeCompleteResult> Result) {
           CallbackCalled = true;
           switch (Result.getKind()) {