Fixed URI conversion for Windows

Author: spoenemann

handler/handler.go

@@ -6,12 +6,10 @@ import (
 	"encoding/json"
 	"io"
 	"log"
-	"net/url"
 	"path/filepath"
 	"regexp"
 	"strings"
 
-	"github.com/pkg/errors"
 	lsp "github.com/sourcegraph/go-lsp"
 	"github.com/sourcegraph/jsonrpc2"
 )
@@ -154,6 +152,9 @@ func (handler *InoHandler) transformClangdParams(ctx context.Context, method str
 		p := params.(*lsp.RenameParams)
 		uri = p.TextDocument.URI
 		err = handler.ino2cppRenameParams(p)
+	case "workspace/didChangeWatchedFiles":
+		p := params.(*lsp.DidChangeWatchedFilesParams)
+		err = handler.ino2cppDidChangeWatchedFilesParams(p)
 	}
 	return
 }
@@ -233,7 +234,10 @@ func (handler *InoHandler) handleError(ctx context.Context, err error, fqbn stri
 		message = "Editor support is disabled because the platform `" + fqbn + "` is not installed."
 		message += " Use the Boards Manager to install it."
 	} else if strings.Contains(errorStr, "No such file or directory") {
-		exp, _ := regexp.Compile("([\\w\\.\\-]+)\\.h: No such file or directory")
+		exp, regexpErr := regexp.Compile("([\\w\\.\\-]+)\\.h: No such file or directory")
+		if regexpErr != nil {
+			panic(regexpErr)
+		}
 		submatch := exp.FindStringSubmatch(errorStr)
 		message = "Editor support is disabled because the library `" + submatch[1] + "` is not installed."
 		message += " Use the Library Manager to install it"
@@ -246,8 +250,9 @@ func (handler *InoHandler) handleError(ctx context.Context, err error, fqbn stri
 func (handler *InoHandler) ino2cppTextDocumentIdentifier(doc *lsp.TextDocumentIdentifier) error {
 	if data, ok := handler.data[doc.URI]; ok {
 		doc.URI = data.targetURI
+		return nil
 	}
-	return nil
+	return unknownURI(doc.URI)
 }
 
 func (handler *InoHandler) ino2cppTextDocumentItem(ctx context.Context, doc *lsp.TextDocumentItem) error {
@@ -330,6 +335,16 @@ func (handler *InoHandler) ino2cppRenameParams(params *lsp.RenameParams) error {
 	return unknownURI(params.TextDocument.URI)
 }
 
+func (handler *InoHandler) ino2cppDidChangeWatchedFilesParams(params *lsp.DidChangeWatchedFilesParams) error {
+	for index := range params.Changes {
+		fileEvent := &params.Changes[index]
+		if data, ok := handler.data[fileEvent.URI]; ok {
+			fileEvent.URI = data.targetURI
+		}
+	}
+	return nil
+}
+
 func (handler *InoHandler) transformClangdResult(method string, uri lsp.DocumentURI, result interface{}) interface{} {
 	switch method {
 	case "textDocument/completion":
@@ -532,6 +547,8 @@ func (handler *InoHandler) transformStdioParams(method string, raw *json.RawMess
 }
 
 func (handler *InoHandler) cpp2inoPublishDiagnosticsParams(params *lsp.PublishDiagnosticsParams) error {
+	log.Println("diagnostics", *params)
+	log.Println("data", handler.data)
 	if data, ok := handler.data[params.URI]; ok {
 		params.URI = data.sourceURI
 		for index := range params.Diagnostics {
@@ -550,19 +567,3 @@ func (handler *InoHandler) showMessage(ctx context.Context, msgType lsp.MessageT
 	}
 	handler.StdioConn.Notify(ctx, "window/showMessage", &params)
 }
-
-func uriToPath(uri lsp.DocumentURI) string {
-	url, err := url.Parse(string(uri))
-	if err != nil {
-		return string(uri)
-	}
-	return filepath.FromSlash(url.Path)
-}
-
-func pathToURI(path string) lsp.DocumentURI {
-	return "file://" + lsp.DocumentURI(filepath.ToSlash(path))
-}
-
-func unknownURI(uri lsp.DocumentURI) error {
-	return errors.New("Document is not available: " + string(uri))
-}

handler/protocol.go

@@ -76,6 +76,10 @@ func readParams(method string, raw *json.RawMessage) (interface{}, error) {
 		params := new(lsp.WorkspaceSymbolParams)
 		err := json.Unmarshal(*raw, params)
 		return params, err
+	case "workspace/didChangeWatchedFiles":
+		params := new(lsp.DidChangeWatchedFilesParams)
+		err := json.Unmarshal(*raw, params)
+		return params, err
 	case "textDocument/publishDiagnostics":
 		params := new(lsp.PublishDiagnosticsParams)
 		err := json.Unmarshal(*raw, params)

handler/uri.go

@@ -0,0 +1,51 @@
+package handler
+
+import (
+	"net/url"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"strings"
+
+	"github.com/pkg/errors"
+	lsp "github.com/sourcegraph/go-lsp"
+)
+
+var expDriveId = regexp.MustCompile("[a-zA-Z]:")
+
+func uriToPath(uri lsp.DocumentURI) string {
+	urlObj, err := url.Parse(string(uri))
+	if err != nil {
+		return string(uri)
+	}
+	path := ""
+	segments := strings.Split(urlObj.Path, "/")
+	for _, segment := range segments {
+		decoded, err := url.PathUnescape(segment)
+		if err != nil {
+			decoded = segment
+		}
+		if runtime.GOOS == "windows" && expDriveId.MatchString(decoded) {
+			path += strings.ToUpper(decoded)
+		} else if len(decoded) > 0 {
+			path += string(filepath.Separator) + decoded
+		}
+	}
+	return path
+}
+
+func pathToURI(path string) lsp.DocumentURI {
+	urlObj, err := url.Parse("file://")
+	if err != nil {
+		panic(err)
+	}
+	segments := strings.Split(path, string(filepath.Separator))
+	for _, segment := range segments {
+		urlObj.Path += "/" + url.PathEscape(segment)
+	}
+	return lsp.DocumentURI(urlObj.String())
+}
+
+func unknownURI(uri lsp.DocumentURI) error {
+	return errors.New("Document is not available: " + string(uri))
+}

handler/uri_test.go

@@ -0,0 +1,51 @@
+package handler
+
+import (
+	"path/filepath"
+	"runtime"
+	"testing"
+
+	lsp "github.com/sourcegraph/go-lsp"
+)
+
+func TestUriToPath(t *testing.T) {
+	var path string
+	if runtime.GOOS == "windows" {
+		path = uriToPath(lsp.DocumentURI("file:///C:/Users/test/Sketch.ino"))
+		if path != "C:\\Users\\test\\Sketch.ino" {
+			t.Error(path)
+		}
+		path = uriToPath(lsp.DocumentURI("file:///c%3A/Users/test/Sketch.ino"))
+		if path != "C:\\Users\\test\\Sketch.ino" {
+			t.Error(path)
+		}
+	} else {
+		path = uriToPath(lsp.DocumentURI("file:///Users/test/Sketch.ino"))
+		if path != "/Users/test/Sketch.ino" {
+			t.Error(path)
+		}
+	}
+	path = uriToPath(lsp.DocumentURI("file:///%25F0%259F%2598%259B"))
+	if path != string(filepath.Separator)+"\U0001F61B" {
+		t.Error(path)
+	}
+}
+
+func TestPathToUri(t *testing.T) {
+	var uri lsp.DocumentURI
+	if runtime.GOOS == "windows" {
+		uri = pathToURI("C:\\Users\\test\\Sketch.ino")
+		if uri != "file:///C:/Users/test/Sketch.ino" {
+			t.Error(uri)
+		}
+	} else {
+		uri = pathToURI("/Users/test/Sketch.ino")
+		if uri != "file:///Users/test/Sketch.ino" {
+			t.Error(uri)
+		}
+	}
+	uri = pathToURI("\U0001F61B")
+	if uri != "file:///%25F0%259F%2598%259B" {
+		t.Error(uri)
+	}
+}