Drop Diagnostic prefix from types moved to the Diagnostics module

Author: ahoppen

Sources/Diagnostics/Diagnostic.swift

@@ -30,8 +30,8 @@ public struct Diagnostic {
   }
 
   /// An ID that identifies the diagnostic's message.
-  /// See ``DiagnosticMessageID``.
-  public var diagnosticID: DiagnosticMessageID {
+  /// See ``MessageID``.
+  public var diagnosticID: MessageID {
     return diagMessage.diagnosticID
   }
 

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

@@ -1,4 +1,4 @@
-//===--- DiagnosticMessage.swift ------------------------------------------===//
+//===--- Message.swift ----------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -17,7 +17,7 @@
 /// Two diagnostics with the same ID don’t need to necessarily have the exact
 /// same wording. Eg. it’s possible that the message contains more context when
 /// available.
-public struct DiagnosticMessageID: Hashable {
+public struct MessageID: Hashable {
   private let value: String
 
   public init(_ value: String) {
@@ -31,6 +31,6 @@ public protocol DiagnosticMessage {
   /// The diagnostic message that should be displayed in the client.
   var message: String { get }
 
-  /// See ``DiagnosticMessageID``.
-  var diagnosticID: DiagnosticMessageID { get }
+  /// See ``MessageID``.
+  var diagnosticID: MessageID { get }
 }

Sources/SwiftParser/Diagnostics/ParserDiagnosticMessages.swift

@@ -36,30 +36,28 @@ extension Syntax {
   }
 }
 
-
-/// A diagnostic how's ID is determined by the diagnostic's type.
-public protocol TypedDiagnosticMessage: DiagnosticMessage {
-  var diagnosticID: DiagnosticMessageID { get }
+/// A diagnostic whose ID is determined by the diagnostic's type.
+public protocol DiagnosticMessageType: DiagnosticMessage {
+  var diagnosticID: MessageID { get }
 }
 
-public extension TypedDiagnosticMessage {
-  static var diagnosticID: DiagnosticMessageID {
-    return DiagnosticMessageID("\(self)")
+public extension DiagnosticMessageType {
+  static var diagnosticID: MessageID {
+    return MessageID("\(self)")
   }
 
-  var diagnosticID: DiagnosticMessageID {
+  var diagnosticID: MessageID {
     return Self.diagnosticID
   }
 }
 
-
 // MARK: - Diagnostics (please sort alphabetically)
 
-public struct CStyleForLoopDiagnostic: TypedDiagnosticMessage {
+public struct CStyleForLoopDiagnostic: DiagnosticMessageType {
   public var message = "C-style for statement has been removed in Swift 3"
 }
 
-public struct MissingTokenDiagnostic: TypedDiagnosticMessage {
+public struct MissingTokenDiagnostic: DiagnosticMessageType {
   public let missingToken: TokenSyntax
 
   public var message: String {
@@ -82,11 +80,11 @@ public struct MissingTokenDiagnostic: TypedDiagnosticMessage {
   }
 }
 
-public struct ThrowsInReturnPositionDiagnostic: TypedDiagnosticMessage {
+public struct ThrowsInReturnPositionDiagnostic: DiagnosticMessageType {
   public let message = "'throws' may only occur before '->'"
 }
 
-public struct UnexpectedNodesDiagnostic: TypedDiagnosticMessage {
+public struct UnexpectedNodesDiagnostic: DiagnosticMessageType {
   public let unexpectedNodes: UnexpectedNodesSyntax
 
   public var message: String {

Tests/SwiftParserTest/DiagnosticAssertions.swift

@@ -13,7 +13,7 @@ func XCTAssertDiagnostic<T: SyntaxProtocol>(
   in tree: T,
   line: Int,
   column: Int,
-  id: DiagnosticMessageID? = nil,
+  id: MessageID? = nil,
   message: String? = nil,
   testFile: StaticString = #filePath,
   testLine: UInt = #line
@@ -38,7 +38,7 @@ func XCTAssertSingleDiagnostic<T: SyntaxProtocol>(
   in tree: T,
   line: Int,
   column: Int,
-  id: DiagnosticMessageID? = nil,
+  id: MessageID? = nil,
   message: String? = nil,
   testFile: StaticString = #filePath,
   testLine: UInt = #line

Tests/SwiftParserTest/DiagnosticInfrastructureTests.swift

@@ -4,12 +4,12 @@ import SwiftParser
 
 public class DiagnosticInfrastructureTests: XCTestCase {
   public func testDiagnosticID() throws {
-    struct TestDiagnostic: TypedDiagnosticMessage {
+    struct TestDiagnostic: DiagnosticMessageType {
       let message: String = "My test diagnostic"
     }
 
     let diag = TestDiagnostic()
-    XCTAssertEqual(diag.diagnosticID, DiagnosticMessageID("TestDiagnostic"))
+    XCTAssertEqual(diag.diagnosticID, MessageID("TestDiagnostic"))
     XCTAssertEqual(diag.message, "My test diagnostic")
   }
 }