From 2389e3de64654bf6c0231fa56e2b5da3c2e1d6ac Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 19 Jan 2021 00:49:47 +0100
Subject: [PATCH] Fixed compiler query driver on Windows

---
 handler/handler.go | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/handler/handler.go b/handler/handler.go
index 27877de..36c9095 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -8,6 +8,7 @@ import (
 	"log"
 	"os"
 	"regexp"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -602,15 +603,26 @@ func startClangd(compileCommandsDir, sketchCpp *paths.Path) (io.WriteCloser, io.
 		panic("could not find compile_commands.json")
 	}
 	compilers := map[string]bool{}
-	for _, cmd := range compileCommands.Contents {
+	for i, cmd := range compileCommands.Contents {
 		if len(cmd.Arguments) == 0 {
 			panic("invalid empty argument field in compile_commands.json")
 		}
-		compilers[cmd.Arguments[0]] = true
+
+		// clangd requires full path to compiler (including extension .exe on Windows!)
+		compilerPath := paths.New(cmd.Arguments[0]).Canonical()
+		compiler := compilerPath.String()
+		if runtime.GOOS == "windows" && strings.ToLower(compilerPath.Ext()) != ".exe" {
+			compiler += ".exe"
+		}
+		compileCommands.Contents[i].Arguments[0] = compiler
+
+		compilers[compiler] = true
 	}
 	if len(compilers) == 0 {
 		panic("main compiler not found")
 	}
+	// Save back compile_commands.json with OS native file separator and extension
+	compileCommands.SaveToFile()
 
 	// Start clangd
 	args := []string{