Fix JSON encoding for TextDocumentEdit and VersionedTextDocumentIdentifier

Author: DougGregor

Sources/LanguageServerProtocol/SupportTypes/TextDocumentEdit.swift

@@ -52,4 +52,31 @@ public struct TextDocumentEdit: Hashable, Codable, Sendable {
     self.textDocument = textDocument
     self.edits = edits
   }
+
+  public enum CodingKeys: String, CodingKey {
+    case kind
+    case textDocument
+    case edits
+  }
+
+  public func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode("textDocumentEdit", forKey: .kind)
+    try container.encode(self.textDocument, forKey: .textDocument)
+    try container.encode(self.edits, forKey: .edits)
+  }
+
+  public init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    let kind = try container.decode(String.self, forKey: .kind)
+    guard kind == "textDocumentEdit" else {
+      throw DecodingError.dataCorruptedError(
+        forKey: .kind,
+        in: container,
+        debugDescription: "Kind of TextDocumentEdit is not 'textDocumentEdit'"
+      )
+    }
+    self.textDocument = try container.decode(OptionalVersionedTextDocumentIdentifier.self, forKey: .textDocument)
+    self.edits = try container.decode([Edit].self, forKey: .edits)
+  }
 }

Sources/LanguageServerProtocol/SupportTypes/VersionedTextDocumentIdentifier.swift

@@ -53,4 +53,18 @@ public struct OptionalVersionedTextDocumentIdentifier: Hashable, Codable, Sendab
     self.uri = uri
     self.version = version
   }
+
+  enum CodingKeys: CodingKey {
+    case uri
+    case version
+  }
+
+  public func encode(to encoder: any Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(self.uri, forKey: .uri)
+
+    // Note: we use encode(_:forKey:) here instead of encodeIf(_:forKey:)
+    // because VSCode will drop requests without the explicit 'null'.
+    try container.encode(self.version, forKey: .version)
+  }
 }