fix line & column parameters

Author: lukepistrol

Sources/CodeEditCLI/Open.swift

@@ -16,25 +16,22 @@ extension CodeEditCLI {
         )
 
         @Argument(
-            help: "The path of a file/folder to open.",
+            help: """
+            The path of a file/folder to open.
+            When opening files, line and column numbers can be appended: `index.html:42:10`
+            """,
             completion: .file()
         )
         private var path: String?
 
-        @Option(name: .shortAndLong, help: "The line number to open a file at. Optional.")
-        private var line: Int?
-
-        @Option(name: .shortAndLong, help: "The column to open a file at. Optional.")
-        private var column: Int?
-
         func run() throws {
             let task = Process()
 
             // use the `open` cli as the executable
             task.launchPath = "/usr/bin/open"
 
             if let path {
-
+                let (path, line, column) = try extractLineColumn(path)
                 let openURL = try absolutePath(path, for: task)
 
                 // open CodeEdit using the url scheme
@@ -57,5 +54,24 @@ extension CodeEditCLI {
             }
             return url
         }
+
+        private func extractLineColumn(_ path: String) throws -> (path: String, line: Int?, column: Int?) {
+            let components = path.split(separator: ":")
+            let path = String(components[0])
+
+            switch components.count {
+            case 1:
+                return (path, nil, nil)
+            case 2:
+                guard let row = Int(components[1]) else { throw CLIError.invalidFileURL }
+                return (path, row, nil)
+            case (3...):
+                guard let row = Int(components[1]),
+                      let column = Int(components[2]) else { throw CLIError.invalidFileURL }
+                return (path, row, column)
+            default:
+                throw CLIError.invalidFileURL
+            }
+        }
     }
 }

Sources/CodeEditCLI/main.swift

@@ -30,6 +30,7 @@ struct CodeEditCLI: ParsableCommand {
 
     enum CLIError: Error {
         case invalidWorkingDirectory
+        case invalidFileURL
     }
 }