Merge pull request #321 from ahoppen/pr/move-diagnostic-to-swiftsyntax-module

Move the Diagnostic-related types back to the SwiftSyntax module

Author: ahoppen

Sources/SwiftSyntaxParser/Diagnostic.swift renamed to Sources/SwiftSyntax/Diagnostic.swift

@@ -12,8 +12,6 @@
 // This file provides the Diagnostic, Note, and FixIt types.
 //===----------------------------------------------------------------------===//
 
-import SwiftSyntax
-
 /// A FixIt represents a change to source code in order to "correct" a
 /// diagnostic.
 public enum FixIt: Codable, CustomDebugStringConvertible {
@@ -108,7 +106,7 @@ public struct Note: Codable {
   public let fixIts: [FixIt]
 
   /// Constructs a new Note from the constituent parts.
-  internal init(message: Diagnostic.Message, location: SourceLocation?,
+  public init(message: Diagnostic.Message, location: SourceLocation?,
                 highlights: [SourceRange], fixIts: [FixIt]) {
     precondition(message.severity == .note,
                  "notes can only have the `note` severity")

Sources/SwiftSyntaxParser/DiagnosticConsumer.swift renamed to Sources/SwiftSyntax/DiagnosticConsumer.swift

@@ -14,7 +14,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import SwiftSyntax
 
 /// The DiagnosticEngine allows Swift tools to emit diagnostics.
 public class DiagnosticEngine {
@@ -56,7 +55,7 @@ public class DiagnosticEngine {
       }
   }
 
-  internal var needsLineColumn: Bool {
+  public var needsLineColumn: Bool {
     // Check if any consumer is interested in line and column.
     return consumers.first { $0.needsLineColumn } != nil
   }
@@ -71,7 +70,7 @@ public class DiagnosticEngine {
     }
   }
 
-  internal func diagnose(_ diagnostic: Diagnostic) {
+  public func diagnose(_ diagnostic: Diagnostic) {
     diagnostics.append(diagnostic)
     for consumer in consumers {
       consumer.handle(diagnostic)

Sources/SwiftSyntaxParser/DiagnosticEngine.swift renamed to Sources/SwiftSyntax/DiagnosticEngine.swift

@@ -14,7 +14,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import SwiftSyntax
 
 public final class JSONDiagnosticConsumer: DiagnosticConsumer {
   /// Enumerates the possible places this consumer might output diagnostics.

Sources/SwiftSyntaxParser/JSONDiagnosticConsumer.swift renamed to Sources/SwiftSyntax/JSONDiagnosticConsumer.swift

@@ -40,6 +40,11 @@
   ],
   "Parse": [
     "IncrementalParseTransition.swift",
+    "Diagnostic.swift",
+    "DiagnosticEngine.swift",
+    "DiagnosticConsumer.swift",
+    "JSONDiagnosticConsumer.swift",
+    "PrintingDiagnosticConsumer.swift"
   ],
   "Internal": [
     "_SyntaxParserInterop.swift",