Include language in RichValue.asCode

Author: fwcd

Sources/D2Commands/File/ToFileCommand.swift

@@ -29,7 +29,7 @@ public class ToFileCommand: Command {
                 return
             }
 
-            guard let data = (content.asText ?? content.asCode ?? "").data(using: .utf8) else {
+            guard let data = (content.asText ?? content.asCode?.code ?? "").data(using: .utf8) else {
                 await output.append(errorText: "Could not encode file data as UTF-8")
                 return
             }

Sources/D2Commands/Output/RichValue.swift

@@ -33,8 +33,8 @@ public enum RichValue: Addable, Sendable {
     public var asText: String? {
         extract { if case let .text(text) = $0 { text } else { nil } }.nilIfEmpty?.joined(separator: " ")
     }
-    public var asCode: String? {
-        extract { if case let .code(code, language: _) = $0 { code } else { nil } }.first
+    public var asCode: (code: String, language: String?)? {
+        extract { if case let .code(code, language: language) = $0 { (code: code, language: language) } else { nil } }.first
     }
     public var asEmbed: Embed? {
         extract { if case let .embed(embed) = $0 { embed } else { nil } }.first

Sources/D2Commands/Programming/PrologCommand.swift

@@ -17,7 +17,7 @@ public class PrologCommand: Command {
     public init() {
         subcommands = [
             "load": { [unowned self] input, output in
-                guard let rawProgram = input.asCode ?? input.asText else {
+                guard let rawProgram = input.asCode?.code ?? input.asText else {
                     await output.append("Please enter a Prolog program (a collection of rules)!")
                     return
                 }
@@ -32,7 +32,7 @@ public class PrologCommand: Command {
                     await output.append("Please load a program first!")
                     return
                 }
-                guard let rawGoal = input.asCode ?? input.asText else {
+                guard let rawGoal = input.asCode?.code ?? input.asText else {
                     await output.append("Please enter a Prolog goal (a collection of provable statements)!")
                     return
                 }

Sources/D2Commands/Programming/ReindentCommand.swift

@@ -70,6 +70,6 @@ public class ReindentCommand: Command {
             return
         }
 
-        await output.append(.code(spec.reindent(code: code), language: nil))
+        await output.append(.code(spec.reindent(code: code.code), language: code.language))
     }
 }

Sources/D2Commands/StringCommand.swift

@@ -10,6 +10,6 @@ extension StringCommand {
     public var inputValueType: RichValueType { .text }
 
     public func invoke(with input: RichValue, output: any CommandOutput, context: CommandContext) async {
-        await invoke(with: input.asText ?? input.asCode ?? "", output: output, context: context)
+        await invoke(with: input.asText ?? input.asCode?.code ?? "", output: output, context: context)
     }
 }