Move the abstract diagnostic types to their own module

Author: ahoppen

Package.swift

@@ -58,6 +58,10 @@ let package = Package(
         "README.md"
       ]
     ),
+    .target(
+      name: "Diagnostics",
+      dependencies: ["SwiftSyntax"]
+    ),
     .target(
       name: "SwiftSyntax",
       dependencies: ["_CSwiftSyntax"],
@@ -105,15 +109,15 @@ let package = Package(
     ),
     .target(
       name: "SwiftParser",
-      dependencies: ["SwiftSyntax"]
+      dependencies: ["Diagnostics", "SwiftSyntax"]
     ),
     .executableTarget(
       name: "lit-test-helper",
       dependencies: ["SwiftSyntax", "SwiftSyntaxParser"]
     ),
     .executableTarget(
       name: "swift-parser-test",
-      dependencies: ["SwiftSyntax", "SwiftParser", .product(name: "ArgumentParser", package: "swift-argument-parser")]
+      dependencies: ["Diagnostics", "SwiftSyntax", "SwiftParser", .product(name: "ArgumentParser", package: "swift-argument-parser")]
     ),
     .executableTarget(
         name: "generate-swift-syntax-builder",
@@ -159,7 +163,7 @@ let package = Package(
     ),
     .testTarget(
       name: "SwiftParserTest",
-      dependencies: ["SwiftParser", "_SwiftSyntaxTestSupport"]
+      dependencies: ["Diagnostics", "SwiftParser", "_SwiftSyntaxTestSupport"]
     ),
   ]
 )

Sources/SwiftParser/Diagnostics/Diagnostic.swift renamed to Sources/Diagnostics/Diagnostic.swift

@@ -19,7 +19,7 @@ public struct Diagnostic {
   /// The node at whose start location the message should be displayed.
   public let node: Syntax
 
-  init(node: Syntax, message: DiagnosticMessage) {
+  public init(node: Syntax, message: DiagnosticMessage) {
     self.diagMessage = message
     self.node = node
   }

Sources/SwiftParser/Diagnostics/DiagnosticMessage.swift renamed to Sources/Diagnostics/DiagnosticMessage.swift

@@ -34,18 +34,3 @@ public protocol DiagnosticMessage {
   /// See ``DiagnosticMessageID``.
   var diagnosticID: DiagnosticMessageID { get }
 }
-
-/// A diagnostic how's ID is determined by the diagnostic's type.
-public protocol TypedDiagnosticMessage: DiagnosticMessage {
-  var diagnosticID: DiagnosticMessageID { get }
-}
-
-public extension TypedDiagnosticMessage {
-  static var diagnosticID: DiagnosticMessageID {
-    return DiagnosticMessageID("\(self)")
-  }
-
-  var diagnosticID: DiagnosticMessageID {
-    return Self.diagnosticID
-  }
-}

Sources/SwiftParser/Diagnostics/ParseDiagnosticsGenerator.swift

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Diagnostics
 import SwiftSyntax
 
 extension UnexpectedNodesSyntax {

Sources/SwiftParser/Diagnostics/ParserDiagnosticMessages.swift

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Diagnostics
 import SwiftSyntax
 
 extension Syntax {
@@ -35,6 +36,23 @@ extension Syntax {
   }
 }
 
+
+/// A diagnostic how's ID is determined by the diagnostic's type.
+public protocol TypedDiagnosticMessage: DiagnosticMessage {
+  var diagnosticID: DiagnosticMessageID { get }
+}
+
+public extension TypedDiagnosticMessage {
+  static var diagnosticID: DiagnosticMessageID {
+    return DiagnosticMessageID("\(self)")
+  }
+
+  var diagnosticID: DiagnosticMessageID {
+    return Self.diagnosticID
+  }
+}
+
+
 // MARK: - Diagnostics (please sort alphabetically)
 
 public struct CStyleForLoopDiagnostic: TypedDiagnosticMessage {

Sources/swift-parser-test/swift-parser-test.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 
+import Diagnostics
 import SwiftSyntax
 import SwiftParser
 import Foundation

Tests/SwiftParserTest/DiagnosticAssertions.swift

@@ -1,3 +1,4 @@
+import Diagnostics
 import SwiftSyntax
 import SwiftParser
 import XCTest

Tests/SwiftParserTest/DiagnosticInfrastructureTests.swift

@@ -1,4 +1,5 @@
 import XCTest
+import Diagnostics
 import SwiftParser
 
 public class DiagnosticInfrastructureTests: XCTestCase {