Add support for UserSpace.selectedText in input commands

zenangst · Oct 11, 2023 · c0bfaa0 · c0bfaa0
1 parent 8ca0f69
commit c0bfaa0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/App/Sources/Core/Runners/CommandRunner.swift b/App/Sources/Core/Runners/CommandRunner.swift
@@ -190,7 +190,8 @@ final class CommandRunner: CommandRunning {
           output = command.name
         }
       case .type(let typeCommand):
-        try await runners.type.run(typeCommand)
+        let input = snapshot.replaceSelectedText(typeCommand.input)
+        try await runners.type.run(input, mode: typeCommand.mode)
         output = command.name
       case .systemCommand(let systemCommand):
         try await runners.system.run(systemCommand)

diff --git a/App/Sources/Core/Runners/TypeCommandRunner.swift b/App/Sources/Core/Runners/TypeCommandRunner.swift
@@ -10,10 +10,8 @@ final class TypeCommandRunner {
     self.keyboardCommandRunner = keyboardCommandRunner
   }
 
-  func run(_ command: TypeCommand) async throws {
-    let input = command.input
-
-    switch command.mode {
+  func run(_ input: String, mode: TypeCommand.Mode) async throws {
+    switch mode {
     case .typing:
       let newLines = CharacterSet.newlines
       for character in input {
@@ -39,7 +37,7 @@ final class TypeCommandRunner {
     case .instant:
       let pasteboard = NSPasteboard.general
       pasteboard.clearContents()
-      pasteboard.setString(command.input, forType: .string)
+      pasteboard.setString(input, forType: .string)
 
       let keyCode = 9 // v
       try keyboardCommandRunner.machPort?.post(keyCode, type: .keyDown, flags: .maskCommand)