[NFC] preliminary formatting

Author: J-MR-T

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

@@ -391,7 +391,8 @@ class EditorConsumer {
   virtual void handleSemanticAnnotation(unsigned Offset, unsigned Length,
                                         UIdent Kind, bool isSystem) = 0;
 
-  virtual void handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind, StringRef USR) = 0;
+  virtual void handleDeclaration(unsigned Offset, unsigned Length,
+                                 UIdent Kind, StringRef USR) = 0;
 
   virtual void beginDocumentSubStructure(unsigned Offset, unsigned Length,
                                          UIdent Kind, UIdent AccessLevel,

tools/SourceKit/lib/SwiftLang/SwiftEditorInterfaceGen.cpp

@@ -68,7 +68,8 @@ class SwiftInterfaceGenContext::Implementation {
     std::string Text;
     std::vector<TextReference> References;
     std::vector<TextDecl> Decls;
-    /// Do not clear the map or erase elements, without keeping the Decls vector in sync
+    /// Do not clear the map or erase elements,
+    /// without keeping the Decls vector in sync
     llvm::StringMap<TextDecl> USRMap;
   };
 
@@ -160,10 +161,14 @@ class AnnotatingPrinter : public StreamPrinter {
         StringRef USR = OS.str();
         DeclUSRs.emplace_back(VD, USR);
         auto iterator = Info.USRMap.insert_or_assign(USR, Entry).first;
-        // Set the USR in the declarations to the key in the USRMap, because the lifetime of that matches/exceeds the lifetime of Decls
-        // String keys in the StringMap are heap allocated and only get destroyed on explicit erase() or clear() calls, or on destructor calls
-        // (the ProgrammersManual description itself also states that StringMap "only ever copies a string if a value is inserted").
-        // Thus this never results in a dangling reference, as the USRMap is never cleared and no elements are erased in its lifetime.
+        // Set the USR in the declarations to the key in the USRMap, because the
+        // lifetime of that matches/exceeds the lifetime of Decls String keys in
+        // the StringMap are heap allocated and only get destroyed on explicit
+        // erase() or clear() calls, or on destructor calls (the Programmer's
+        // Manual description itself also states that StringMap "only ever
+        // copies a string if a value is inserted").
+        // Thus this never results in a dangling reference, as the USRMap is
+        // never cleared and no elements are erased in its lifetime.
         Info.Decls.back().USR = iterator->getKey();
       }
     }
@@ -273,16 +278,18 @@ static void reportSemanticAnnotations(const SourceTextInfo &IFaceInfo,
   }
 }
 
-/// Create the declarations array (sourcekitd::DeclarationsArrayBuilder) from the SourceTextInfo about declarations
+/// Create the declarations array (sourcekitd::DeclarationsArrayBuilder) from
+/// the SourceTextInfo about declarations
 static void reportDeclarations(const SourceTextInfo &IFaceInfo,
-                                      EditorConsumer &Consumer) {
+                               EditorConsumer &Consumer) {
   for (auto &Dcl : IFaceInfo.Decls) {
-    if(!Dcl.Dcl)
+    if (!Dcl.Dcl)
       continue;
     UIdent Kind = SwiftLangSupport::getUIDForDecl(Dcl.Dcl);
     if (Kind.isInvalid())
       continue;
-    Consumer.handleDeclaration(Dcl.Range.Offset, Dcl.Range.Length, Kind, Dcl.USR);
+    Consumer.handleDeclaration(Dcl.Range.Offset, Dcl.Range.Length, Kind,
+                               Dcl.USR);
   }
 }
 

tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp

@@ -2456,11 +2456,12 @@ static void printInterfaceGen(sourcekitd_variant_t Info, bool CheckASCII) {
   sourcekitd_variant_t structure =
       sourcekitd_variant_dictionary_get_value(Info, KeySubStructure);
   printRawVariant(structure);
-  sourcekitd_variant_t declarations = 
+  sourcekitd_variant_t declarations =
       sourcekitd_variant_dictionary_get_value(Info, KeyDeclarations);
-  // only output declarations if there are any (because this might have been disabled in the request itself)
-  if(sourcekitd_variant_get_type(declarations) != SOURCEKITD_VARIANT_TYPE_NULL)
-      printRawVariant(declarations);
+  // only output declarations if there are any (because this might have been
+  // disabled in the request itself)
+  if (sourcekitd_variant_get_type(declarations) != SOURCEKITD_VARIANT_TYPE_NULL)
+    printRawVariant(declarations);
 }
 
 static void printRelatedIdents(sourcekitd_variant_t Info, StringRef Filename,

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

@@ -148,7 +148,8 @@ struct CompactVariantFuncs<DeclarationsArray> {
 
   template <typename FnTy>
   static auto getElement(sourcekitd_variant_t dict, sourcekitd_uid_t key,
-                const FnTy &Fn) -> decltype(Fn(nullptr, nullptr, 0, 0, nullptr)) {
+                const FnTy &Fn) -> decltype(Fn(nullptr, nullptr, 0, 0,
+                                               nullptr)) {
     void *Buf = (void*)dict.data[1];
     size_t Index = dict.data[2];
 

tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-XPC.cpp

@@ -11,13 +11,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "sourcekitd/CodeCompletionResultsArray.h"
-#include "sourcekitd/DeclarationsArray.h"
 #include "sourcekitd/DictionaryKeys.h"
 #include "sourcekitd/DocStructureArray.h"
 #include "sourcekitd/DocSupportAnnotationArray.h"
 #include "sourcekitd/TokenAnnotationsArray.h"
 #include "sourcekitd/ExpressionTypeArray.h"
 #include "sourcekitd/VariableTypeArray.h"
+#include "sourcekitd/DeclarationsArray.h"
 #include "sourcekitd/RawData.h"
 #include "sourcekitd/RequestResponsePrinterBase.h"
 #include "SourceKit/Support/UIdent.h"

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

@@ -280,10 +280,12 @@ editorOpenHeaderInterface(StringRef Name, StringRef HeaderName,
                           StringRef swiftVersion,
                           bool EnableDeclarations);
 
-static void editorOpenSwiftSourceInterface(
-    StringRef Name, StringRef SourceName, ArrayRef<const char *> Args,
-    SourceKitCancellationToken CancellationToken, ResponseReceiver Rec,
-    bool EnableDeclarations);
+static void
+editorOpenSwiftSourceInterface(StringRef Name, StringRef SourceName,
+                               ArrayRef<const char *> Args,
+                               SourceKitCancellationToken CancellationToken,
+                               ResponseReceiver Rec,
+                               bool EnableDeclarations);
 
 static void
 editorOpenSwiftTypeInterface(StringRef TypeUsr, ArrayRef<const char *> Args,
@@ -941,7 +943,8 @@ handleRequestEditorOpenInterface(const RequestDict &Req,
     Req.getInt64(KeySynthesizedExtension, SynthesizedExtension,
                  /*isOptional=*/true);
     std::optional<StringRef> InterestedUSR = Req.getString(KeyInterestedUSR);
-    bool EnableDeclarations = Req.getOptionalInt64(KeyEnableDeclarations).value_or(false);
+    bool EnableDeclarations =
+        Req.getOptionalInt64(KeyEnableDeclarations).value_or(false);
     return Rec(editorOpenInterface(*Name, *ModuleName, GroupName, Args,
                                    SynthesizedExtension, InterestedUSR,
                                    EnableDeclarations));
@@ -976,11 +979,11 @@ static void handleRequestEditorOpenHeaderInterface(
       if (swiftVerVal.has_value())
         swiftVer = std::to_string(*swiftVerVal);
     }
-    bool EnableDeclarations = Req.getOptionalInt64(KeyEnableDeclarations).value_or(false);
-    return Rec(editorOpenHeaderInterface(*Name, *HeaderName, Args,
-                                         UsingSwiftArgs.value_or(false),
-                                         SynthesizedExtension, swiftVer,
-                                         EnableDeclarations));
+    bool EnableDeclarations =
+        Req.getOptionalInt64(KeyEnableDeclarations).value_or(false);
+    return Rec(editorOpenHeaderInterface(
+        *Name, *HeaderName, Args, UsingSwiftArgs.value_or(false),
+        SynthesizedExtension, swiftVer, EnableDeclarations));
   }
 }
 
@@ -998,10 +1001,10 @@ static void handleRequestEditorOpenSwiftSourceInterface(
     if (!FileName.has_value())
       return Rec(createErrorRequestInvalid("missing 'key.sourcefile'"));
     // Reporting the declarations array is off by default
-    bool EnableDeclarations = Req.getOptionalInt64(KeyEnableDeclarations).value_or(false);
-    return editorOpenSwiftSourceInterface(*Name, *FileName, Args,
-                                          CancellationToken, Rec,
-                                          EnableDeclarations);
+    bool EnableDeclarations =
+        Req.getOptionalInt64(KeyEnableDeclarations).value_or(false);
+    return editorOpenSwiftSourceInterface(
+        *Name, *FileName, Args, CancellationToken, Rec, EnableDeclarations);
   }
 }
 
@@ -3550,7 +3553,8 @@ class SKEditorConsumer : public EditorConsumer {
   void handleSemanticAnnotation(unsigned Offset, unsigned Length, UIdent Kind,
                                 bool isSystem) override;
 
-  void handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind, StringRef USR) override;
+  void handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind,
+                         StringRef USR) override;
 
   bool documentStructureEnabled() override { return Opts.EnableStructure; }
 
@@ -3743,11 +3747,10 @@ sourcekitd_response_t SKEditorConsumer::createResponse() {
   if (Opts.EnableStructure) {
     Dict.setCustomBuffer(KeySubStructure, DocStructure.createBuffer());
   }
-  if(Opts.EnableDeclarations){
+  if (Opts.EnableDeclarations) {
     Dict.setCustomBuffer(KeyDeclarations, Declarations.createBuffer());
   }
 
-
   return RespBuilder.createResponse();
 }
 
@@ -3776,7 +3779,8 @@ void SKEditorConsumer::handleSemanticAnnotation(unsigned Offset,
   SemanticAnnotations.add(Kind, Offset, Length, isSystem);
 }
 
-void SKEditorConsumer::handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind, StringRef USR) {
+void SKEditorConsumer::handleDeclaration(unsigned Offset, unsigned Length,
+                                         UIdent Kind, StringRef USR) {
   assert(Kind.isValid());
   Declarations.add(Kind, Offset, Length, USR);
 }

unittests/SourceKit/SwiftLang/EditingTest.cpp

@@ -69,7 +69,8 @@ class TestConsumer : public EditorConsumer {
     Annotations.push_back({Offset, Length, Kind, isSystem});
   }
 
-  void handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind, StringRef USR) override {}
+  void handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind,
+                         StringRef USR) override {}
 
   bool documentStructureEnabled() override { return false; }
 

unittests/SourceKit/SwiftLang/NullEditorConsumer.h

@@ -29,7 +29,8 @@ class NullEditorConsumer : public EditorConsumer {
   void handleSemanticAnnotation(unsigned Offset, unsigned Length, UIdent Kind,
                                 bool isSystem) override {}
 
-  void handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind, StringRef USR) override {}
+  void handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind,
+                         StringRef USR) override {}
 
   bool documentStructureEnabled() override { return false; }