Merge pull request #319 from jaroslawhartman/pet-main-knqyf263-issue-314

Fix for #314 - unnecessary +0 as a cmd parameter in editFile

cmd/util.go

@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"os"
-	"strconv"
 	"strings"
 
 	"github.com/fatih/color"
@@ -14,13 +12,6 @@ import (
 	"github.com/knqyf263/pet/snippet"
 )
 
-func editFile(command, file string, startingLine int) error {
-	// Note that this works for most unix editors (nano, vi, vim, etc)
-	// TODO: Remove for other kinds of editors - this is only for UX
-	command += " +" + strconv.Itoa(startingLine) + " " + file
-	return run(command, os.Stdin, os.Stdout)
-}
-
 func filter(options []string, tag string) (commands []string, err error) {
 	var snippets snippet.Snippets
 	if err := snippets.Load(true); err != nil {

cmd/util_unix.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"strconv"
 
 	"github.com/knqyf263/pet/config"
 )
@@ -23,3 +24,8 @@ func run(command string, r io.Reader, w io.Writer) error {
 	cmd.Stdin = r
 	return cmd.Run()
 }
+
+func editFile(command, file string, startingLine int) error {
+	command += " +" + strconv.Itoa(startingLine) + " " + file
+	return run(command, os.Stdin, os.Stdout)
+}

cmd/util_windows.go

@@ -26,3 +26,8 @@ func run(command string, r io.Reader, w io.Writer) error {
 	cmd.Stdin = r
 	return cmd.Run()
 }
+
+func editFile(command, file string, startingLine int) error {
+	command += " " + file
+	return run(command, os.Stdin, os.Stdout)
+}