Added command line argument for specifying cli path

Author: spoenemann

handler/builder.go

@@ -11,8 +11,6 @@ import (
 	"strings"
 )
 
-const arduinoCLI = "arduino-cli"
-
 func generateCpp(inoCode []byte, name, fqbn string) (cppPath string, cppCode []byte, err error) {
 	tempDir, err := ioutil.TempDir("", "ino2cpp-")
 	if err != nil {
@@ -42,9 +40,10 @@ func generateCpp(inoCode []byte, name, fqbn string) (cppPath string, cppCode []b
 	}
 
 	// Generate target file
-	preprocessCmd := exec.Command(arduinoCLI, "compile", "--fqbn", fqbn, "--preprocess", inoPath)
+	preprocessCmd := exec.Command(globalCliPath, "compile", "--fqbn", fqbn, "--preprocess", inoPath)
 	cppCode, err = preprocessCmd.Output()
 	if err != nil {
+		logCommandErr(globalCliPath, cppCode, err)
 		return
 	}
 
@@ -66,9 +65,10 @@ func updateCpp(inoCode []byte, fqbn, cppPath string) (cppCode []byte, err error)
 	}
 
 	// Generate target file
-	preprocessCmd := exec.Command(arduinoCLI, "compile", "--fqbn", fqbn, "--preprocess", inoPath)
+	preprocessCmd := exec.Command(globalCliPath, "compile", "--fqbn", fqbn, "--preprocess", inoPath)
 	cppCode, err = preprocessCmd.Output()
 	if err != nil {
+		logCommandErr(globalCliPath, cppCode, err)
 		return
 	}
 
@@ -78,9 +78,10 @@ func updateCpp(inoCode []byte, fqbn, cppPath string) (cppCode []byte, err error)
 }
 
 func generateCompileFlags(tempDir, inoPath, fqbn string) (string, error) {
-	propertiesCmd := exec.Command(arduinoCLI, "compile", "--fqbn", fqbn, "--show-properties", inoPath)
+	propertiesCmd := exec.Command(globalCliPath, "compile", "--fqbn", fqbn, "--show-properties", inoPath)
 	output, err := propertiesCmd.Output()
 	if err != nil {
+		logCommandErr(globalCliPath, output, err)
 		return "", err
 	}
 	properties, err := readProperties(bytes.NewReader(output))
@@ -119,3 +120,16 @@ func generateCompileFlags(tempDir, inoPath, fqbn string) (string, error) {
 	writer.Flush()
 	return flagsPath, nil
 }
+
+func logCommandErr(command string, stdout []byte, err error) {
+	log.Println("Command error:", command, err)
+	if len(stdout) > 0 {
+		log.Println("------------------------------BEGIN STDOUT\n", string(stdout), "\n------------------------------END STDOUT")
+	}
+	if exitErr, ok := err.(*exec.ExitError); ok {
+		stderr := exitErr.Stderr
+		if len(stderr) > 0 {
+			log.Println("------------------------------BEGIN STDERR\n", string(stderr), "\n------------------------------END STDERR")
+		}
+	}
+}

handler/handler.go

@@ -14,13 +14,18 @@ import (
 	"github.com/sourcegraph/jsonrpc2"
 )
 
+var globalCliPath string
 var enableLogging bool
 
+// Setup initializes global variables.
+func Setup(cliPath string, _enableLogging bool) {
+	globalCliPath = cliPath
+	enableLogging = _enableLogging
+}
+
 // NewInoHandler creates and configures an InoHandler.
 func NewInoHandler(stdin io.ReadCloser, stdout io.WriteCloser, stdinLog, stdoutLog io.Writer,
-	clangdIn io.ReadCloser, clangdOut io.WriteCloser, clangdinLog, clangdoutLog io.Writer,
-	logging bool) *InoHandler {
-	enableLogging = logging
+	clangdIn io.ReadCloser, clangdOut io.WriteCloser, clangdinLog, clangdoutLog io.Writer) *InoHandler {
 	handler := &InoHandler{
 		data: make(map[lsp.DocumentURI]*FileData),
 	}
@@ -128,7 +133,8 @@ func (handler *InoHandler) transformClangdParams(method string, raw *json.RawMes
 func (handler *InoHandler) createFileData(sourceURI lsp.DocumentURI, sourceText string) (*FileData, []byte, error) {
 	sourcePath := uriToPath(sourceURI)
 	// TODO get board from sketch config
-	targetPath, targetBytes, err := generateCpp([]byte(sourceText), filepath.Base(sourcePath), "arduino:avr:uno")
+	fqbn := "arduino:avr:uno"
+	targetPath, targetBytes, err := generateCpp([]byte(sourceText), filepath.Base(sourcePath), fqbn)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -158,7 +164,8 @@ func (handler *InoHandler) updateFileData(data *FileData, change *lsp.TextDocume
 			newSourceText = applyTextChange(data.sourceText, *rang, change.Text)
 		}
 		// TODO get board from sketch config
-		targetBytes, err := updateCpp([]byte(newSourceText), "arduino:avr:uno", uriToPath(data.targetURI))
+		fqbn := "arduino:avr:uno"
+		targetBytes, err := updateCpp([]byte(newSourceText), fqbn, uriToPath(data.targetURI))
 		if err != nil {
 			return err
 		}

main.go

@@ -11,11 +11,13 @@ import (
 )
 
 var clangdPath string
+var cliPath string
 var enableLogging bool
 
 func main() {
-	flag.StringVar(&clangdPath, "clangd", "clangd", "path to clangd executable")
-	flag.BoolVar(&enableLogging, "log", false, "enable logging to files")
+	flag.StringVar(&clangdPath, "clangd", "clangd", "Path to clangd executable")
+	flag.StringVar(&cliPath, "cli", "arduino-cli", "Path to arduino-cli executable")
+	flag.BoolVar(&enableLogging, "log", false, "Enable logging to files")
 	flag.Parse()
 
 	var stdinLog, stdoutLog, clangdinLog, clangdoutLog, clangderrLog io.Writer
@@ -39,7 +41,8 @@ func main() {
 		go io.Copy(clangderrLog, clangdErr)
 	}
 
-	inoHandler := handler.NewInoHandler(os.Stdin, os.Stdout, stdinLog, stdoutLog, clangdIn, clangdOut, clangdinLog, clangdoutLog, enableLogging)
+	handler.Setup(cliPath, enableLogging)
+	inoHandler := handler.NewInoHandler(os.Stdin, os.Stdout, stdinLog, stdoutLog, clangdIn, clangdOut, clangdinLog, clangdoutLog)
 	<-inoHandler.StdioConn.DisconnectNotify()
 }