diff --git a/Sources/SwiftParserDiagnostics/MissingNodesError.swift b/Sources/SwiftParserDiagnostics/MissingNodesError.swift
index 74f73c0d63f..0c5ad2ca6ca 100644
--- a/Sources/SwiftParserDiagnostics/MissingNodesError.swift
+++ b/Sources/SwiftParserDiagnostics/MissingNodesError.swift
@@ -161,15 +161,27 @@ func nodesDescriptionAndCommonParent(_ nodes: [some SyntaxProtocol], format: Boo
   }
 
   let partDescriptions = NodesDescriptionPart.descriptionParts(for: missingSyntaxNodes).map({ $0.description(format: format) ?? "syntax" })
-  switch partDescriptions.count {
+
+  return (nil, formatDescriptions(partDescriptions))
+}
+
+/// Formats an array of descriptions into a single string.
+///
+/// This function takes an array of descriptions and formats them into a single string. Depending on the number
+/// of descriptions in the array, it returns different formatted strings.
+///
+/// - Parameter descriptions: An array of descriptions to be formatted.
+/// - Returns: A formatted string representing the descriptions.
+func formatDescriptions(_ descriptions: [String]) -> String {
+  switch descriptions.count {
   case 0:
-    return (nil, "syntax")
+    return "syntax"
   case 1:
-    return (nil, "\(partDescriptions.first!)")
+    return descriptions.first!
   case 2:
-    return (nil, "\(partDescriptions.first!) and \(partDescriptions.last!)")
+    return "\(descriptions.first!) and \(descriptions.last!)"
   default:
-    return (nil, "\(partDescriptions[0..<partDescriptions.count - 1].joined(separator: ", ")), and \(partDescriptions.last!)")
+    return "\(descriptions[0..<descriptions.count - 1].joined(separator: ", ")), and \(descriptions.last!)"
   }
 }
 
diff --git a/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift b/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift
index 517cf281594..89625b285f8 100644
--- a/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift
+++ b/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift
@@ -788,40 +788,36 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     if shouldSkip(node) {
       return .skipChildren
     }
-    if let unexpected = node.unexpectedBetweenDeinitKeywordAndEffectSpecifiers,
-      let name = unexpected.presentTokens(satisfying: { $0.tokenKind.isIdentifier == true }).only
-    {
-      addDiagnostic(
-        name,
-        .deinitCannotHaveName,
-        fixIts: [
-          FixIt(message: RemoveNodesFixIt(name), changes: .makeMissing(name))
-        ],
-        handledNodes: [name.id]
-      )
-    }
-    if let unexpected = node.unexpectedBetweenDeinitKeywordAndEffectSpecifiers,
-      let params = unexpected.compactMap({ $0.as(FunctionParameterClauseSyntax.self) }).only
-    {
-      addDiagnostic(
-        params,
-        .deinitCannotHaveParameters,
-        fixIts: [
-          FixIt(message: RemoveNodesFixIt(params), changes: .makeMissing(params))
-        ],
-        handledNodes: [params.id]
-      )
-    }
-    if let unexpected = node.unexpectedBetweenEffectSpecifiersAndBody,
-      let returnType = unexpected.compactMap({ $0.as(ReturnClauseSyntax.self) }).only
-    {
+
+    let name: TokenSyntax? = node
+      .unexpectedBetweenDeinitKeywordAndEffectSpecifiers?
+      .presentTokens(satisfying: \.tokenKind.isIdentifier)
+      .only
+
+    let params: FunctionParameterClauseSyntax? = node
+      .unexpectedBetweenDeinitKeywordAndEffectSpecifiers?
+      .compactMap({ $0.as(FunctionParameterClauseSyntax.self) })
+      .only
+
+    let returnType: ReturnClauseSyntax? = node
+      .unexpectedBetweenEffectSpecifiersAndBody?
+      .compactMap({ $0.as(ReturnClauseSyntax.self) })
+      .only
+
+    let nodes = [Syntax(name), Syntax(params), Syntax(returnType)].compactMap { $0 }
+
+    if let firstNode = nodes.first {
       addDiagnostic(
-        returnType,
-        .deinitCannotHaveReturnType,
+        firstNode,
+        DeinitializerSignatureError(name: name, params: params, returnClause: returnType),
+        highlights: nodes,
         fixIts: [
-          FixIt(message: RemoveNodesFixIt(returnType), changes: .makeMissing(returnType))
+          FixIt(
+            message: RemoveNodesFixIt(nodes),
+            changes: nodes.map { .makeMissing($0) }
+          )
         ],
-        handledNodes: [returnType.id]
+        handledNodes: nodes.map { $0.id }
       )
     }
 
diff --git a/Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift b/Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift
index 8d210bd5be6..737879d1e95 100644
--- a/Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift
+++ b/Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift
@@ -120,18 +120,9 @@ extension DiagnosticMessage where Self == StaticParserError {
   public static var defaultOutsideOfSwitch: Self {
     .init("'default' label can only appear inside a 'switch' statement")
   }
-  public static var deinitCannotHaveName: Self {
-    .init("deinitializers cannot have a name")
-  }
-  public static var deinitCannotHaveParameters: Self {
-    .init("deinitializers cannot have parameters")
-  }
   public static var deinitCannotThrow: Self {
     .init("deinitializers cannot throw")
   }
-  public static var deinitCannotHaveReturnType: Self {
-    .init("deinitializers cannot have return type")
-  }
   public static var editorPlaceholderInSourceFile: Self {
     .init("editor placeholder in source file")
   }
@@ -305,6 +296,36 @@ public struct CannotParseVersionTuple: ParserError {
   }
 }
 
+public struct DeinitializerSignatureError: ParserError {
+  public let name: TokenSyntax?
+  public let params: FunctionParameterClauseSyntax?
+  public let returnClause: ReturnClauseSyntax?
+
+  public var message: String {
+    var descriptions: [String] = []
+
+    if name != nil {
+      descriptions.append("a name")
+    }
+
+    if params != nil {
+      descriptions.append("parameters")
+    }
+
+    if returnClause != nil {
+      var message = "return clause"
+
+      if descriptions.isEmpty {
+        message = "a " + message
+      }
+
+      descriptions.append(message)
+    }
+
+    return "deinitializers cannot have \(formatDescriptions(descriptions))"
+  }
+}
+
 public struct DuplicateEffectSpecifiers: ParserError {
   public let correctSpecifier: TokenSyntax
   public let unexpectedSpecifier: TokenSyntax
diff --git a/Tests/SwiftParserTest/translated/InitDeinitTests.swift b/Tests/SwiftParserTest/translated/InitDeinitTests.swift
index e1b5690e0bd..c9a6ce56ead 100644
--- a/Tests/SwiftParserTest/translated/InitDeinitTests.swift
+++ b/Tests/SwiftParserTest/translated/InitDeinitTests.swift
@@ -143,12 +143,15 @@ final class InitDeinitTests: ParserTestCase {
     assertParse(
       """
       struct FooStructDeinitializerA {
-        deinit 1️⃣x2️⃣()
+        deinit 1️⃣x()
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have a name", fixIts: ["remove 'x'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have parameters", fixIts: ["remove parameter clause"]),
+        DiagnosticSpec(
+          message: "deinitializers cannot have a name and parameters",
+          highlight: "x()",
+          fixIts: ["remove 'x' and parameter clause"]
+        )
       ],
       fixedSource: """
         struct FooStructDeinitializerA {
@@ -210,12 +213,15 @@ final class InitDeinitTests: ParserTestCase {
     assertParse(
       """
       class FooClassDeinitializerC {
-        deinit 1️⃣x 2️⃣(a : Int) {}
+        deinit 1️⃣x (a : Int) {}
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have a name", fixIts: ["remove 'x'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have parameters", fixIts: ["remove parameter clause"]),
+        DiagnosticSpec(
+          message: "deinitializers cannot have a name and parameters",
+          highlight: "x (a : Int)",
+          fixIts: ["remove 'x' and parameter clause"]
+        )
       ],
       fixedSource: """
         class FooClassDeinitializerC {
@@ -456,7 +462,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'await' with 'async'"])
+        DiagnosticSpec(message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'await' with 'async'"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -474,7 +480,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'reasync' with 'async'"])
+        DiagnosticSpec(message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'reasync' with 'async'"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -492,7 +498,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'throws'"])
+        DiagnosticSpec(message: "deinitializers cannot throw", fixIts: ["remove 'throws'"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -510,7 +516,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'rethrows'"])
+        DiagnosticSpec(message: "deinitializers cannot throw", fixIts: ["remove 'rethrows'"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -529,7 +535,6 @@ final class InitDeinitTests: ParserTestCase {
       """,
       diagnostics: [
         DiagnosticSpec(
-          locationMarker: "1️⃣",
           message: "'async' has already been specified",
           notes: [NoteSpec(message: "'async' declared here")],
           fixIts: ["remove redundant 'async'"]
@@ -552,7 +557,6 @@ final class InitDeinitTests: ParserTestCase {
       """,
       diagnostics: [
         DiagnosticSpec(
-          locationMarker: "1️⃣",
           message: "'await' conflicts with 'async'",
           notes: [NoteSpec(message: "'async' declared here")],
           fixIts: ["remove redundant 'await'"]
@@ -575,7 +579,6 @@ final class InitDeinitTests: ParserTestCase {
       """,
       diagnostics: [
         DiagnosticSpec(
-          locationMarker: "1️⃣",
           message: "'await' conflicts with 'async'",
           notes: [NoteSpec(message: "'async' declared here")],
           fixIts: ["remove redundant 'await'"]
@@ -597,7 +600,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'throws'"])
+        DiagnosticSpec(message: "deinitializers cannot throw", fixIts: ["remove 'throws'"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -615,7 +618,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'throws'"])
+        DiagnosticSpec(message: "deinitializers cannot throw", fixIts: ["remove 'throws'"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -633,7 +636,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'throws' and 'rethrows'"])
+        DiagnosticSpec(message: "deinitializers cannot throw", fixIts: ["remove 'throws' and 'rethrows'"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -747,13 +750,21 @@ final class InitDeinitTests: ParserTestCase {
     assertParse(
       """
       class FooClassDeinitializerA {
-        deinit 1️⃣x2️⃣() 3️⃣throws async {}
+        deinit 1️⃣x() 2️⃣throws async {}
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have a name", fixIts: ["remove 'x'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have parameters", fixIts: ["remove parameter clause"]),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'throws'"]),
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: "deinitializers cannot have a name and parameters",
+          highlight: "x()",
+          fixIts: ["remove 'x' and parameter clause"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "deinitializers cannot throw",
+          fixIts: ["remove 'throws'"]
+        ),
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -767,14 +778,26 @@ final class InitDeinitTests: ParserTestCase {
     assertParse(
       """
       class FooClassDeinitializerA {
-        deinit 1️⃣x2️⃣() 3️⃣await 4️⃣throws {}
+        deinit 1️⃣x() 2️⃣await 3️⃣throws {}
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have a name", fixIts: ["remove 'x'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have parameters", fixIts: ["remove parameter clause"]),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'await' with 'async'"]),
-        DiagnosticSpec(locationMarker: "4️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'throws'"]),
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: "deinitializers cannot have a name and parameters",
+          highlight: "x()",
+          fixIts: ["remove 'x' and parameter clause"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "expected async specifier; did you mean 'async'?",
+          fixIts: ["replace 'await' with 'async'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "3️⃣",
+          message: "deinitializers cannot throw",
+          fixIts: ["remove 'throws'"]
+        ),
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -792,7 +815,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->' and return type"])
+        DiagnosticSpec(message: "deinitializers cannot have a return clause", fixIts: ["remove '->' and return type"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -806,12 +829,15 @@ final class InitDeinitTests: ParserTestCase {
     assertParse(
       """
       class FooClassDeinitializerA {
-        deinit 1️⃣x 2️⃣-> Void {}
+        deinit 1️⃣x -> Void {}
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have a name", fixIts: ["remove 'x'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->' and return type"]),
+        DiagnosticSpec(
+          message: "deinitializers cannot have a name and return clause",
+          highlight: "x -> Void",
+          fixIts: ["remove 'x', '->', and return type"]
+        )
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -825,12 +851,15 @@ final class InitDeinitTests: ParserTestCase {
     assertParse(
       """
       class FooClassDeinitializerA {
-        deinit1️⃣() 2️⃣-> Void {}
+        deinit1️⃣() -> Void {}
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have parameters", fixIts: ["remove parameter clause"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->' and return type"]),
+        DiagnosticSpec(
+          message: "deinitializers cannot have parameters and return clause",
+          highlight: "() -> Void",
+          fixIts: ["remove parameter clause, '->', and return type"]
+        )
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -844,13 +873,15 @@ final class InitDeinitTests: ParserTestCase {
     assertParse(
       """
       class FooClassDeinitializerA {
-        deinit 1️⃣x2️⃣() 3️⃣-> Void {}
+        deinit 1️⃣x() -> Void {}
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have a name", fixIts: ["remove 'x'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have parameters", fixIts: ["remove parameter clause"]),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->' and return type"]),
+        DiagnosticSpec(
+          message: "deinitializers cannot have a name, parameters, and return clause",
+          highlight: "x() -> Void",
+          fixIts: ["remove 'x', parameter clause, '->', and return type"]
+        )
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -868,8 +899,8 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected 'async' in effect specifiers", fixIts: ["insert 'async'"]),
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->', 'async', and return type"]),
+        DiagnosticSpec(message: "expected 'async' in effect specifiers", fixIts: ["insert 'async'"]),
+        DiagnosticSpec(message: "deinitializers cannot have a return clause", fixIts: ["remove '->', 'async', and return type"]),
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -887,7 +918,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->', 'async', and return type"])
+        DiagnosticSpec(message: "deinitializers cannot have a return clause", fixIts: ["remove '->', 'async', and return type"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -906,7 +937,7 @@ final class InitDeinitTests: ParserTestCase {
       """,
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'await' with 'async'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->', 'async', and return type"]),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have a return clause", fixIts: ["remove '->', 'async', and return type"]),
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -924,7 +955,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->', 'await', and return type"])
+        DiagnosticSpec(message: "deinitializers cannot have a return clause", fixIts: ["remove '->', 'await', and return type"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -942,7 +973,7 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->', 'throws', and return type"])
+        DiagnosticSpec(message: "deinitializers cannot have a return clause", fixIts: ["remove '->', 'throws', and return type"])
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -961,7 +992,7 @@ final class InitDeinitTests: ParserTestCase {
       """,
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'throws'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->', 'throws', and return type"]),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot have a return clause", fixIts: ["remove '->', 'throws', and return type"]),
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -979,8 +1010,8 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected 'async' in effect specifiers", fixIts: ["insert 'async'"]),
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->', 'async throws', and return type"]),
+        DiagnosticSpec(message: "expected 'async' in effect specifiers", fixIts: ["insert 'async'"]),
+        DiagnosticSpec(message: "deinitializers cannot have a return clause", fixIts: ["remove '->', 'async throws', and return type"]),
       ],
       fixedSource: """
         class FooClassDeinitializerA {
@@ -998,8 +1029,8 @@ final class InitDeinitTests: ParserTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected 'async' in effect specifiers", fixIts: ["insert 'async'"]),
-        DiagnosticSpec(locationMarker: "1️⃣", message: "deinitializers cannot have return type", fixIts: ["remove '->', 'throws async', and return type"]),
+        DiagnosticSpec(message: "expected 'async' in effect specifiers", fixIts: ["insert 'async'"]),
+        DiagnosticSpec(message: "deinitializers cannot have a return clause", fixIts: ["remove '->', 'throws async', and return type"]),
       ],
       fixedSource: """
         class FooClassDeinitializerA {