Format

Author: davidungar

include/swift/AST/DiagnosticConsumer.h

@@ -210,12 +210,11 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
     /// Index into Subconsumers vector for this subconsumer.
     /// Should be const but then the sort won't compile.
     /*const*/ unsigned subconsumerIndex;
-    
+
   public:
     unsigned getSubconsumerIndex() const { return subconsumerIndex; }
-    
-    ConsumerAndRange(const CharSourceRange range,
-                                unsigned subconsumerIndex)
+
+    ConsumerAndRange(const CharSourceRange range, unsigned subconsumerIndex)
         : range(range), subconsumerIndex(subconsumerIndex) {}
 
     /// Compare according to range:
@@ -236,12 +235,12 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
       return compare(getRawLoc(range.getEnd()).getPointer(),
                      getRawLoc(loc).getPointer());
     }
- 
+
     bool contains(const SourceLoc loc) const { return range.contains(loc); }
   };
 
 private:
-  Subconsumer &operator[](const ConsumerAndRange& consumerAndRange) {
+  Subconsumer &operator[](const ConsumerAndRange &consumerAndRange) {
     return Subconsumers[consumerAndRange.getSubconsumerIndex()];
   }
   /// The consumers owned by this FileSpecificDiagnosticConsumer, sorted by
@@ -262,8 +261,7 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
   ///
   /// If None, Note diagnostics are sent to every consumer.
   /// If null, diagnostics are suppressed.
-  Optional<ConsumerAndRange *>
-      ConsumerSpecificInfoForSubsequentNotes = None;
+  Optional<ConsumerAndRange *> ConsumerSpecificInfoForSubsequentNotes = None;
 
   bool HasAnErrorBeenConsumed = false;
 
@@ -295,9 +293,8 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
   /// Returns nullptr if diagnostic is to be suppressed,
   /// None if diagnostic is to be distributed to every consumer,
   /// a particular consumer if diagnostic goes there.
-  Optional<ConsumerAndRange *>
-  consumerAndRangeForLocation(SourceManager &SM,
-                                         SourceLoc loc) const;
+  Optional<ConsumerAndRange *> consumerAndRangeForLocation(SourceManager &SM,
+                                                           SourceLoc loc) const;
 };
 
 } // end namespace swift

lib/AST/DiagnosticConsumer.cpp

@@ -146,17 +146,15 @@ FileSpecificDiagnosticConsumer::consumerAndRangeForLocation(
   // that /might/ contain 'loc'. Specifically, since the ranges are sorted
   // by end location, it's looking for the first range where the end location
   // is greater than or equal to 'loc'.
-  const ConsumerAndRange *possiblyContainingRangeIter =
-      std::lower_bound(
-          ConsumersOrderedByRange.begin(), ConsumersOrderedByRange.end(), loc,
-          [](const ConsumerAndRange &entry, SourceLoc loc) -> bool {
-            return entry.endsAfter(loc);
-          });
+  const ConsumerAndRange *possiblyContainingRangeIter = std::lower_bound(
+      ConsumersOrderedByRange.begin(), ConsumersOrderedByRange.end(), loc,
+      [](const ConsumerAndRange &entry, SourceLoc loc) -> bool {
+        return entry.endsAfter(loc);
+      });
 
   if (possiblyContainingRangeIter != ConsumersOrderedByRange.end() &&
       possiblyContainingRangeIter->contains(loc)) {
-    return const_cast<ConsumerAndRange *>(
-        possiblyContainingRangeIter);
+    return const_cast<ConsumerAndRange *>(possiblyContainingRangeIter);
   }
 
   return None;
@@ -182,7 +180,8 @@ void FileSpecificDiagnosticConsumer::handleDiagnostic(
     break;
   }
   if (consumerAndRange.hasValue()) {
-    (*this)[*consumerAndRange.getValue()].handleDiagnostic(SM,Loc, Kind, FormatString, FormatArgs, Info);
+    (*this)[*consumerAndRange.getValue()].handleDiagnostic(
+        SM, Loc, Kind, FormatString, FormatArgs, Info);
     return;
   }
   for (auto &subconsumer : Subconsumers)

lib/FrontendTool/FrontendTool.cpp

@@ -1586,7 +1586,7 @@ static std::unique_ptr<DiagnosticConsumer>
 createDispatchingDiagnosticConsumerIfNeeded(
     const FrontendInputsAndOutputs &inputsAndOutputs,
     llvm::function_ref<std::unique_ptr<DiagnosticConsumer>(const InputFile &)>
-      maybeCreateConsumerForDiagnosticsFrom) {
+        maybeCreateConsumerForDiagnosticsFrom) {
 
   // The "4" here is somewhat arbitrary. In practice we're going to have one
   // sub-consumer for each diagnostic file we're trying to output, which (again