Renamed variables for clarity

Author: cmaglie

internal/arduino/builder/builder.go

@@ -144,14 +144,12 @@ func NewBuilder(
 	}
 	if sk != nil {
 		buildProperties.SetPath("sketch_path", sk.FullPath)
+		buildProperties.Set("build.project_name", sk.MainFile.Base())
+		buildProperties.SetPath("build.source.path", sk.FullPath)
 	}
 	if buildPath != nil {
 		buildProperties.SetPath("build.path", buildPath)
 	}
-	if sk != nil {
-		buildProperties.Set("build.project_name", sk.MainFile.Base())
-		buildProperties.SetPath("build.source.path", sk.FullPath)
-	}
 	if optimizeForDebug {
 		if debugFlags, ok := buildProperties.GetOk("compiler.optimization_flags.debug"); ok {
 			buildProperties.Set("compiler.optimization_flags", debugFlags)
@@ -187,16 +185,20 @@ func NewBuilder(
 	}
 
 	log := logger.New(stdout, stderr, verbosity, warningsLevel)
-	libsResolver, verboseOut, err := detector.LibrariesLoader(
-		useCachedLibrariesResolution, librariesManager,
-		builtInLibrariesDirs, customLibraryDirs, librariesDirs,
-		buildPlatform, targetPlatform,
+	libsResolver, libsLoadingWarnings, err := detector.LibrariesLoader(
+		useCachedLibrariesResolution,
+		librariesManager,
+		builtInLibrariesDirs,
+		customLibraryDirs,
+		librariesDirs,
+		buildPlatform,
+		targetPlatform,
 	)
 	if err != nil {
 		return nil, err
 	}
 	if log.VerbosityLevel() == logger.VerbosityVerbose {
-		log.Warn(string(verboseOut))
+		log.Warn(string(libsLoadingWarnings))
 	}
 
 	diagnosticStore := diagnostics.NewStore()
@@ -223,8 +225,10 @@ func NewBuilder(
 		buildPlatform:                 buildPlatform,
 		toolEnv:                       toolEnv,
 		buildOptions: newBuildOptions(
-			hardwareDirs, librariesDirs,
-			builtInLibrariesDirs, buildPath,
+			hardwareDirs,
+			librariesDirs,
+			builtInLibrariesDirs,
+			buildPath,
 			sk,
 			customBuildProperties,
 			fqbn,

internal/arduino/builder/internal/detector/detector.go

@@ -489,8 +489,11 @@ func findIncludeForOldCompilers(source string) string {
 func LibrariesLoader(
 	useCachedLibrariesResolution bool,
 	librariesManager *librariesmanager.LibrariesManager,
-	builtInLibrariesDirs *paths.Path, libraryDirs, otherLibrariesDirs paths.PathList,
-	actualPlatform, targetPlatform *cores.PlatformRelease,
+	builtInLibrariesDir *paths.Path,
+	customLibraryDirs paths.PathList,
+	librariesDirs paths.PathList,
+	buildPlatform *cores.PlatformRelease,
+	targetPlatform *cores.PlatformRelease,
 ) (*librariesresolver.Cpp, []byte, error) {
 	verboseOut := &bytes.Buffer{}
 	lm := librariesManager
@@ -502,21 +505,20 @@ func LibrariesLoader(
 	if librariesManager == nil {
 		lmb := librariesmanager.NewBuilder()
 
-		builtInLibrariesFolders := builtInLibrariesDirs
-		if builtInLibrariesFolders != nil {
-			if err := builtInLibrariesFolders.ToAbs(); err != nil {
+		if builtInLibrariesDir != nil {
+			if err := builtInLibrariesDir.ToAbs(); err != nil {
 				return nil, nil, err
 			}
 			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
-				Path:     builtInLibrariesFolders,
+				Path:     builtInLibrariesDir,
 				Location: libraries.IDEBuiltIn,
 			})
 		}
 
-		if actualPlatform != targetPlatform {
+		if buildPlatform != targetPlatform {
 			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
-				PlatformRelease: actualPlatform,
-				Path:            actualPlatform.GetLibrariesDir(),
+				PlatformRelease: buildPlatform,
+				Path:            buildPlatform.GetLibrariesDir(),
 				Location:        libraries.ReferencedPlatformBuiltIn,
 			})
 		}
@@ -526,7 +528,7 @@ func LibrariesLoader(
 			Location:        libraries.PlatformBuiltIn,
 		})
 
-		librariesFolders := otherLibrariesDirs
+		librariesFolders := librariesDirs
 		if err := librariesFolders.ToAbs(); err != nil {
 			return nil, nil, err
 		}
@@ -537,7 +539,7 @@ func LibrariesLoader(
 			})
 		}
 
-		for _, dir := range libraryDirs {
+		for _, dir := range customLibraryDirs {
 			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 				Path:            dir,
 				Location:        libraries.Unmanaged,
@@ -547,18 +549,12 @@ func LibrariesLoader(
 
 		newLm, libsLoadingWarnings := lmb.Build()
 		for _, status := range libsLoadingWarnings {
-			// With the refactoring of the initialization step of the CLI we changed how
-			// errors are returned when loading platforms and libraries, that meant returning a list of
-			// errors instead of a single one to enhance the experience for the user.
-			// I have no intention right now to start a refactoring of the legacy package too, so
-			// here's this shitty solution for now.
-			// When we're gonna refactor the legacy package this will be gone.
 			verboseOut.Write([]byte(status.Message()))
 		}
 		lm = newLm
 	}
 
 	allLibs := lm.FindAllInstalled()
-	resolver := librariesresolver.NewCppResolver(allLibs, targetPlatform, actualPlatform)
+	resolver := librariesresolver.NewCppResolver(allLibs, targetPlatform, buildPlatform)
 	return resolver, verboseOut.Bytes(), nil
 }