Merge pull request #79480 from tshortli/exclude-parser-diags

Parse: Avoid including `DiagnosticsParse.h` in `Parser.h`

Author: tshortli

include/swift/Parse/Parser.h

@@ -19,7 +19,6 @@
 
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/ASTNode.h"
-#include "swift/AST/DiagnosticsParse.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/LayoutConstraint.h"
 #include "swift/AST/LifetimeDependence.h"
@@ -543,29 +542,7 @@ class Parser {
   /// diagnose it if not permitted in this mode.
   /// \param diagnoseDollarPrefix Whether to diagnose dollar-prefixed
   /// identifiers in addition to a standalone '$'.
-  void diagnoseDollarIdentifier(const Token &tok,
-                                bool diagnoseDollarPrefix) {
-    assert(tok.getText()[0] == '$');
-
-    // If '$' is not guarded by backticks, offer
-    // to replace it with '`$`'.
-    if (Tok.getRawText() == "$") {
-      diagnose(Tok.getLoc(), diag::standalone_dollar_identifier)
-          .fixItReplace(Tok.getLoc(), "`$`");
-      return;
-    }
-
-    if (!diagnoseDollarPrefix)
-      return;
-
-    if (tok.getText().size() == 1 || Context.LangOpts.EnableDollarIdentifiers ||
-        isInSILMode() || L->isSwiftInterface() ||
-        isInMacroExpansion(tok.getLoc()))
-      return;
-
-    diagnose(tok.getLoc(), diag::dollar_identifier_decl,
-             Context.getIdentifier(tok.getText()));
-  }
+  void diagnoseDollarIdentifier(const Token &tok, bool diagnoseDollarPrefix);
 
   /// Retrieve the location just past the end of the previous
   /// source location.

lib/Parse/ParseIfConfig.cpp

@@ -19,6 +19,7 @@
 #include "swift/AST/ASTBridging.h"
 #include "swift/AST/ASTVisitor.h"
 #include "swift/AST/DiagnosticSuppression.h"
+#include "swift/AST/DiagnosticsParse.h"
 #include "swift/Basic/Assertions.h"
 #include "swift/Basic/Defer.h"
 #include "swift/Basic/LangOptions.h"

lib/Parse/ParsePattern.cpp

@@ -17,6 +17,7 @@
 #include "swift/Parse/Parser.h"
 
 #include "swift/AST/ASTWalker.h"
+#include "swift/AST/DiagnosticsParse.h"
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/Initializer.h"
 #include "swift/AST/Module.h"

lib/Parse/ParseRequests.cpp

@@ -19,6 +19,7 @@
 #include "swift/AST/AvailabilitySpec.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DeclContext.h"
+#include "swift/AST/DiagnosticsParse.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/TypeRepr.h"

lib/Parse/ParseStmt.cpp

@@ -18,6 +18,7 @@
 #include "swift/AST/Attr.h"
 #include "swift/AST/AvailabilitySpec.h"
 #include "swift/AST/Decl.h"
+#include "swift/AST/DiagnosticsParse.h"
 #include "swift/AST/FileUnit.h"
 #include "swift/Basic/Assertions.h"
 #include "swift/Basic/Defer.h"

lib/Parse/ParseType.cpp

@@ -16,6 +16,7 @@
 
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/Attr.h"
+#include "swift/AST/DiagnosticsParse.h"
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/SourceFile.h" // only for isMacroSignatureFile
 #include "swift/AST/TypeRepr.h"

lib/Parse/Parser.cpp

@@ -576,6 +576,29 @@ SourceLoc Parser::getEndOfPreviousLoc() const {
   return Lexer::getLocForEndOfToken(SourceMgr, PreviousLoc);
 }
 
+void Parser::diagnoseDollarIdentifier(const Token &tok,
+                                      bool diagnoseDollarPrefix) {
+  assert(tok.getText()[0] == '$');
+
+  // If '$' is not guarded by backticks, offer to replace it with '`$`'.
+  if (Tok.getRawText() == "$") {
+    diagnose(Tok.getLoc(), diag::standalone_dollar_identifier)
+        .fixItReplace(Tok.getLoc(), "`$`");
+    return;
+  }
+
+  if (!diagnoseDollarPrefix)
+    return;
+
+  if (tok.getText().size() == 1 || Context.LangOpts.EnableDollarIdentifiers ||
+      isInSILMode() || L->isSwiftInterface() ||
+      isInMacroExpansion(tok.getLoc()))
+    return;
+
+  diagnose(tok.getLoc(), diag::dollar_identifier_decl,
+           Context.getIdentifier(tok.getText()));
+}
+
 SourceLoc Parser::consumeAttributeLParen() {
   SourceLoc LastTokenEndLoc = getEndOfPreviousLoc();
   if (LastTokenEndLoc != Tok.getLoc() && !isInSILMode()) {

lib/SIL/Parser/SILParser.h

@@ -15,6 +15,7 @@
 
 #include "SILParserState.h"
 
+#include "swift/AST/DiagnosticsParse.h"
 #include "swift/Parse/Parser.h"
 #include "swift/SIL/SILCoverageMap.h"
 #include "swift/Sema/SILTypeResolutionContext.h"

lib/Sema/TypeCheckMacros.cpp

@@ -25,6 +25,7 @@
 #include "swift/AST/ASTNode.h"
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/DiagnosticsFrontend.h"
+#include "swift/AST/DiagnosticsParse.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/FreestandingMacroExpansion.h"
 #include "swift/AST/MacroDefinition.h"