[SourceKit] Pass reused node IDs by reference

Author: ahoppen

tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -265,7 +265,7 @@ class EditorConsumer {
 
   virtual void
   handleSyntaxTree(const swift::syntax::SourceFileSyntax &SyntaxTree,
-                   std::unordered_set<unsigned> ReusedNodeIds) = 0;
+                   std::unordered_set<unsigned> &ReusedNodeIds) = 0;
   virtual bool syntaxTreeEnabled() {
     return syntaxTreeTransferMode() != SyntaxTreeTransferMode::Off;
   }

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -2104,8 +2104,9 @@ void SwiftLangSupport::editorOpen(StringRef Name, llvm::MemoryBuffer *Buf,
 
   if (Consumer.syntaxTreeEnabled()) {
     assert(EditorDoc->getSyntaxTree().hasValue());
-    Consumer.handleSyntaxTree(EditorDoc->getSyntaxTree().getValue(),
-                              /*ReusedNodeIds=*/{});
+    std::unordered_set<unsigned> ReusedNodeIds;
+    Consumer.handleSyntaxTree(EditorDoc->getSyntaxTree().getValue(), 
+                              ReusedNodeIds);
   }
 }
 

tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp

@@ -2089,7 +2089,7 @@ class SKEditorConsumer : public EditorConsumer {
   void handleSourceText(StringRef Text) override;
 
   void handleSyntaxTree(const swift::syntax::SourceFileSyntax &SyntaxTree,
-                        std::unordered_set<unsigned> ReusedNodeIds) override;
+                        std::unordered_set<unsigned> &ReusedNodeIds) override;
 
   bool syntaxReuseInfoEnabled() override { return Opts.EnableSyntaxReuseInfo; }
   void
@@ -2422,7 +2422,7 @@ void SKEditorConsumer::handleSourceText(StringRef Text) {
 
 void serializeSyntaxTreeAsJson(
     const swift::syntax::SourceFileSyntax &SyntaxTree,
-    std::unordered_set<unsigned> ReusedNodeIds,
+    std::unordered_set<unsigned> &ReusedNodeIds,
     ResponseBuilder::Dictionary &Dict) {
   auto StartClock = clock();
   // 4096 is a heuristic buffer size that appears to usually be able to fit an
@@ -2453,7 +2453,7 @@ void serializeSyntaxTreeAsJson(
 
 void SKEditorConsumer::handleSyntaxTree(
     const swift::syntax::SourceFileSyntax &SyntaxTree,
-    std::unordered_set<unsigned> ReusedNodeIds) {
+    std::unordered_set<unsigned> &ReusedNodeIds) {
   if (Opts.SyntaxTransferMode == SyntaxTreeTransferMode::Off)
     return;
 

unittests/SourceKit/SwiftLang/CursorInfoTest.cpp

@@ -79,7 +79,7 @@ class NullEditorConsumer : public EditorConsumer {
 
   void handleSourceText(StringRef Text) override {}
   void handleSyntaxTree(const swift::syntax::SourceFileSyntax &SyntaxTree,
-                        std::unordered_set<unsigned> ReusedNodeIds) override {}
+                        std::unordered_set<unsigned> &ReusedNodeIds) override {}
 
   SyntaxTreeTransferMode syntaxTreeTransferMode() override {
     return SyntaxTreeTransferMode::Off;

unittests/SourceKit/SwiftLang/EditingTest.cpp

@@ -87,7 +87,7 @@ class DiagConsumer : public EditorConsumer {
 
   void handleSourceText(StringRef Text) override {}
   void handleSyntaxTree(const swift::syntax::SourceFileSyntax &SyntaxTree,
-                        std::unordered_set<unsigned> ReusedNodeIds) override {}
+                        std::unordered_set<unsigned> &ReusedNodeIds) override {}
 
   SyntaxTreeTransferMode syntaxTreeTransferMode() override {
     return SyntaxTreeTransferMode::Off;