arduino
diff --git a/Diff for: ‎go.mod
+1-1 b/Diff for: ‎go.mod
+1-1
diff --git a/Diff for: ‎go.sum
+2 b/Diff for: ‎go.sum
+2
diff --git a/Diff for: ‎handler/builder.go
+3-3 b/Diff for: ‎handler/builder.go
+3-3
@@ -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
 
@@ -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=
 
@@ -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")
 		}
Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,9 @@ func (handler *InoHandler) rebuildEnvironmentLoop() {`
`94`	`94`	`}`
`95`	`95`	`}()`
`96`	`96`
`97`		`- handler.synchronizer.DataMux.Lock()`
	`97`	`+ handler.dataMux.Lock()`
`98`	`98`	`handler.initializeWorkbench(nil)`
`99`		`- handler.synchronizer.DataMux.Unlock()`
	`99`	`+ handler.dataMux.Unlock()`
`100`	`100`	`done <- true`
`101`	`101`	`close(done)`
`102`	`102`	`}`
`@@ -112,7 +112,7 @@ func (handler InoHandler) generateBuildEnvironment() (paths.Path, error) {`
`112`	`112`	`}`
`113`	`113`	`data := overridesFile{Overrides: map[string]string{}}`
`114`	`114`	`for uri, trackedFile := range handler.docs {`
`115`		`- rel, err := uri.AsPath().RelFrom(handler.sketchRoot)`
	`115`	`+ rel, err := paths.New(uri).RelFrom(handler.sketchRoot)`
`116`	`116`	`if err != nil {`
`117`	`117`	`return nil, errors.WithMessage(err, "dumping tracked files")`
`118`	`118`	`}`