Merge pull request #49 from bcmi-labs/patch-2

Stability patchset 2

Author: cmaglie

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/arduino/arduino-cli v0.0.0-20201215104024-6a177ebf56f2
-	github.com/arduino/go-paths-helper v1.4.0
+	github.com/arduino/go-paths-helper v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37
 	github.com/stretchr/testify v1.6.1

go.sum

@@ -17,6 +17,8 @@ github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3
 github.com/arduino/go-paths-helper v1.2.0/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=
 github.com/arduino/go-paths-helper v1.4.0 h1:ilnseAdxmN1bFnLxxXHRtcdmt9jBf3O4jtYfWfqule4=
 github.com/arduino/go-paths-helper v1.4.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
+github.com/arduino/go-paths-helper v1.5.0 h1:RVo189hD+GhUS1rQ3gixwK1nSbvVR8MGIGa7Gxv2bdM=
+github.com/arduino/go-paths-helper v1.5.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
 github.com/arduino/go-properties-orderedmap v1.3.0 h1:4No/vQopB36e7WUIk6H6TxiSEJPiMrVOCZylYmua39o=
 github.com/arduino/go-properties-orderedmap v1.3.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=

handler/builder.go

@@ -94,9 +94,9 @@ func (handler *InoHandler) rebuildEnvironmentLoop() {
 			}
 		}()
 
-		handler.synchronizer.DataMux.Lock()
+		handler.dataMux.Lock()
 		handler.initializeWorkbench(nil)
-		handler.synchronizer.DataMux.Unlock()
+		handler.dataMux.Unlock()
 		done <- true
 		close(done)
 	}
@@ -112,7 +112,7 @@ func (handler *InoHandler) generateBuildEnvironment() (*paths.Path, error) {
 	}
 	data := overridesFile{Overrides: map[string]string{}}
 	for uri, trackedFile := range handler.docs {
-		rel, err := uri.AsPath().RelFrom(handler.sketchRoot)
+		rel, err := paths.New(uri).RelFrom(handler.sketchRoot)
 		if err != nil {
 			return nil, errors.WithMessage(err, "dumping tracked files")
 		}