Added -format-conf-path flag

Author: cmaglie

handler/handler.go

@@ -30,12 +30,16 @@ import (
 
 var globalCliPath string
 var globalClangdPath string
+var globalFormatterConf *paths.Path
 var enableLogging bool
 
 // Setup initializes global variables.
-func Setup(cliPath string, clangdPath string, _enableLogging bool) {
+func Setup(cliPath string, clangdPath string, formatFilePath string, _enableLogging bool) {
 	globalCliPath = cliPath
 	globalClangdPath = clangdPath
+	if formatFilePath != "" {
+		globalFormatterConf = paths.New(formatFilePath)
+	}
 	enableLogging = _enableLogging
 }
 
@@ -1769,15 +1773,22 @@ func (handler *InoHandler) createClangdFormatterConfig(cppuri lsp.DocumentURI) (
 AllowShortFunctionsOnASingleLine: None
 `
 
-	// If a custom config is present in the sketch folder, use that one
-	customConfigFile := handler.sketchRoot.Join(".clang-format")
-	if customConfigFile.Exist() {
-		if c, err := customConfigFile.ReadFile(); err != nil {
-			log.Printf("    error reading custom formatter config file %s: %s", customConfigFile, err)
+	try := func(conf *paths.Path) bool {
+		if c, err := conf.ReadFile(); err != nil {
+			log.Printf("    error reading custom formatter config file %s: %s", conf, err)
 		} else {
-			log.Printf("    using custom formatter config file %s", customConfigFile)
+			log.Printf("    using custom formatter config file %s", conf)
 			config = string(c)
 		}
+		return true
+	}
+
+	if sketchFormatterConf := handler.sketchRoot.Join(".clang-format"); sketchFormatterConf.Exist() {
+		// If a custom config is present in the sketch folder, use that one
+		try(sketchFormatterConf)
+	} else if globalFormatterConf != nil && globalFormatterConf.Exist() {
+		// Otherwise if a global config file is present, use that one
+		try(globalFormatterConf)
 	}
 
 	targetFile := cppuri.AsPath()

main.go

@@ -20,6 +20,7 @@ var initialFqbn string
 var initialBoardName string
 var enableLogging bool
 var loggingBasePath string
+var formatFilePath string
 
 func main() {
 	flag.StringVar(&clangdPath, "clangd", "clangd", "Path to clangd executable")
@@ -29,6 +30,7 @@ func main() {
 	flag.StringVar(&initialBoardName, "board-name", "", "User-friendly board name to use initially (can be changed via JSON-RPC)")
 	flag.BoolVar(&enableLogging, "log", false, "Enable logging to files")
 	flag.StringVar(&loggingBasePath, "logpath", ".", "Location where to write logging files to when logging is enabled")
+	flag.StringVar(&formatFilePath, "format-conf-path", "", "Path to global clang-format configuration file")
 	flag.Parse()
 
 	if loggingBasePath != "" {
@@ -45,7 +47,7 @@ func main() {
 		log.SetOutput(os.Stderr)
 	}
 
-	handler.Setup(cliPath, clangdPath, enableLogging)
+	handler.Setup(cliPath, clangdPath, formatFilePath, enableLogging)
 	initialBoard := lsp.Board{Fqbn: initialFqbn, Name: initialBoardName}
 
 	stdio := streams.NewReadWriteCloser(os.Stdin, os.Stdout)