@@ -32,7 +32,7 @@ import (
32
32
"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
33
33
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
34
34
"github.com/arduino/arduino-cli/arduino/resources"
35
- sk "github.com/arduino/arduino-cli/arduino/sketch"
35
+ "github.com/arduino/arduino-cli/arduino/sketch"
36
36
"github.com/arduino/arduino-cli/arduino/utils"
37
37
"github.com/arduino/arduino-cli/cli/globals"
38
38
"github.com/arduino/arduino-cli/configuration"
@@ -769,29 +769,29 @@ func Upgrade(ctx context.Context, req *rpc.UpgradeRequest, downloadCB rpc.Downlo
769
769
// LoadSketch collects and returns all files composing a sketch
770
770
func LoadSketch (ctx context.Context , req * rpc.LoadSketchRequest ) (* rpc.LoadSketchResponse , error ) {
771
771
// TODO: This should be a ToRpc function for the Sketch struct
772
- sketch , err := sk .New (paths .New (req .SketchPath ))
772
+ sk , err := sketch .New (paths .New (req .SketchPath ))
773
773
if err != nil {
774
774
return nil , & arduino.CantOpenSketchError {Cause : err }
775
775
}
776
776
777
- otherSketchFiles := make ([]string , sketch .OtherSketchFiles .Len ())
778
- for i , file := range sketch .OtherSketchFiles {
777
+ otherSketchFiles := make ([]string , sk .OtherSketchFiles .Len ())
778
+ for i , file := range sk .OtherSketchFiles {
779
779
otherSketchFiles [i ] = file .String ()
780
780
}
781
781
782
- additionalFiles := make ([]string , sketch .AdditionalFiles .Len ())
783
- for i , file := range sketch .AdditionalFiles {
782
+ additionalFiles := make ([]string , sk .AdditionalFiles .Len ())
783
+ for i , file := range sk .AdditionalFiles {
784
784
additionalFiles [i ] = file .String ()
785
785
}
786
786
787
- rootFolderFiles := make ([]string , sketch .RootFolderFiles .Len ())
788
- for i , file := range sketch .RootFolderFiles {
787
+ rootFolderFiles := make ([]string , sk .RootFolderFiles .Len ())
788
+ for i , file := range sk .RootFolderFiles {
789
789
rootFolderFiles [i ] = file .String ()
790
790
}
791
791
792
792
return & rpc.LoadSketchResponse {
793
- MainFile : sketch .MainFile .String (),
794
- LocationPath : sketch .FullPath .String (),
793
+ MainFile : sk .MainFile .String (),
794
+ LocationPath : sk .FullPath .String (),
795
795
OtherSketchFiles : otherSketchFiles ,
796
796
AdditionalFiles : additionalFiles ,
797
797
RootFolderFiles : rootFolderFiles ,
0 commit comments