Swift: Rename diagnostics consumer

AlexDenisov · AlexDenisov · commit 609c7cf84d27 · 2022-11-08T14:56:50.000+01:00
diff --git a/swift/extractor/invocation/SwiftDiagnosticsConsumer.cpp b/swift/extractor/invocation/SwiftDiagnosticsConsumer.cpp
@@ -1,4 +1,4 @@
-#include "swift/extractor/invocation/CodeQLDiagnosticsConsumer.h"
+#include "swift/extractor/invocation/SwiftDiagnosticsConsumer.h"
 #include "swift/extractor/trap/generated/TrapEntries.h"
 
 #include <swift/AST/DiagnosticEngine.h>
@@ -25,8 +25,8 @@ static int diagnosticsKind(const swift::DiagnosticInfo& diagInfo) {
   return 0;
 }
 
-void CodeQLDiagnosticsConsumer::handleDiagnostic(swift::SourceManager& sourceManager,
-                                                 const swift::DiagnosticInfo& diagInfo) {
+void SwiftDiagnosticsConsumer::handleDiagnostic(swift::SourceManager& sourceManager,
+                                                const swift::DiagnosticInfo& diagInfo) {
   auto message = getDiagMessage(sourceManager, diagInfo);
   DiagnosticsTrap diag{};
   diag.id = trap.createLabel<DiagnosticsTag>();
@@ -36,8 +36,8 @@ void CodeQLDiagnosticsConsumer::handleDiagnostic(swift::SourceManager& sourceMan
   locationExtractor.attachLocation(sourceManager, diagInfo.Loc, diagInfo.Loc, diag.id);
 }
 
-std::string CodeQLDiagnosticsConsumer::getDiagMessage(swift::SourceManager& sourceManager,
-                                                      const swift::DiagnosticInfo& diagInfo) {
+std::string SwiftDiagnosticsConsumer::getDiagMessage(swift::SourceManager& sourceManager,
+                                                     const swift::DiagnosticInfo& diagInfo) {
   // Translate ranges.
   llvm::SmallVector<llvm::SMRange, 2> ranges;
   for (auto R : diagInfo.Ranges)
diff --git a/swift/extractor/invocation/SwiftDiagnosticsConsumer.h b/swift/extractor/invocation/SwiftDiagnosticsConsumer.h
@@ -7,9 +7,9 @@ namespace codeql {
 
 class TrapDomain;
 
-class CodeQLDiagnosticsConsumer : public swift::DiagnosticConsumer {
+class SwiftDiagnosticsConsumer : public swift::DiagnosticConsumer {
  public:
-  explicit CodeQLDiagnosticsConsumer(TrapDomain& targetFile)
+  explicit SwiftDiagnosticsConsumer(TrapDomain& targetFile)
       : trap(targetFile), locationExtractor(targetFile) {}
   void handleDiagnostic(swift::SourceManager& sourceManager,
                         const swift::DiagnosticInfo& diagInfo) override;
diff --git a/swift/extractor/main.cpp b/swift/extractor/main.cpp
@@ -14,7 +14,7 @@
 #include "swift/extractor/TargetTrapFile.h"
 #include "swift/extractor/remapping/SwiftOutputRewrite.h"
 #include "swift/extractor/remapping/SwiftOpenInterception.h"
-#include "swift/extractor/invocation/CodeQLDiagnosticsConsumer.h"
+#include "swift/extractor/invocation/SwiftDiagnosticsConsumer.h"
 #include "swift/extractor/trap/TrapDomain.h"
 
 using namespace std::string_literals;
@@ -25,7 +25,7 @@ using namespace std::string_literals;
 class Observer : public swift::FrontendObserver {
  public:
   explicit Observer(const codeql::SwiftExtractorConfiguration& config,
-                    codeql::CodeQLDiagnosticsConsumer& diagConsumer)
+                    codeql::SwiftDiagnosticsConsumer& diagConsumer)
       : config{config}, diagConsumer{diagConsumer} {}
 
   void configuredCompiler(swift::CompilerInstance& instance) override {
@@ -38,7 +38,7 @@ class Observer : public swift::FrontendObserver {
 
  private:
   const codeql::SwiftExtractorConfiguration& config;
-  codeql::CodeQLDiagnosticsConsumer& diagConsumer;
+  codeql::SwiftDiagnosticsConsumer& diagConsumer;
 };
 
 static std::string getenv_or(const char* envvar, const std::string& def) {
@@ -158,7 +158,7 @@ int main(int argc, char** argv) {
 
   auto invocationTrapFile = invocationTargetFile(configuration);
   codeql::TrapDomain invocationDomain(invocationTrapFile);
-  codeql::CodeQLDiagnosticsConsumer diagConsumer(invocationDomain);
+  codeql::SwiftDiagnosticsConsumer diagConsumer(invocationDomain);
   Observer observer(configuration, diagConsumer);
   int frontend_rc = swift::performFrontend(args, "swift-extractor", (void*)main, &observer);
 
