Reordered compileFileWithRecipe for clarity

Author: cmaglie

internal/arduino/builder/compilation.go

@@ -111,7 +111,6 @@ func (b *Builder) compileFiles(
 	return objectFiles, nil
 }
 
-// CompileFilesRecursive fixdoc
 func (b *Builder) compileFileWithRecipe(
 	sourcePath *paths.Path,
 	source *paths.Path,
@@ -129,11 +128,6 @@ func (b *Builder) compileFileWithRecipe(
 		return nil, err
 	}
 
-	objIsUpToDate, err := utils.ObjFileIsUpToDate(source, objectFile, depsFile)
-	if err != nil {
-		return nil, err
-	}
-
 	properties := b.buildProperties.Clone()
 	properties.Set("compiler.warning_flags", properties.Get("compiler.warning_flags."+b.logger.WarningsLevel()))
 	properties.Set("includes", strings.Join(includes, " "))
@@ -146,41 +140,50 @@ func (b *Builder) compileFileWithRecipe(
 	if b.compilationDatabase != nil {
 		b.compilationDatabase.Add(source, command)
 	}
-	if !objIsUpToDate && !b.onlyUpdateCompilationDatabase {
-		commandStdout, commandStderr := &bytes.Buffer{}, &bytes.Buffer{}
-		command.RedirectStdoutTo(commandStdout)
-		command.RedirectStderrTo(commandStderr)
 
+	objIsUpToDate, err := utils.ObjFileIsUpToDate(source, objectFile, depsFile)
+	if err != nil {
+		return nil, err
+	}
+	if objIsUpToDate {
 		if b.logger.VerbosityLevel() == logger.VerbosityVerbose {
-			b.logger.Info(utils.PrintableCommand(command.GetArgs()))
-		}
-		// Since this compile could be multithreaded, we first capture the command output
-		if err := command.Start(); err != nil {
-			return nil, err
+			b.logger.Info(i18n.Tr("Using previously compiled file: %[1]s", objectFile))
 		}
-		err := command.Wait()
-		// and transfer all at once at the end...
+		return objectFile, nil
+	}
+	if b.onlyUpdateCompilationDatabase {
 		if b.logger.VerbosityLevel() == logger.VerbosityVerbose {
-			b.logger.WriteStdout(commandStdout.Bytes())
+			b.logger.Info(i18n.Tr("Skipping compile of: %[1]s", objectFile))
 		}
-		b.logger.WriteStderr(commandStderr.Bytes())
+		return objectFile, nil
+	}
 
-		// Parse the output of the compiler to gather errors and warnings...
-		if b.diagnosticStore != nil {
-			b.diagnosticStore.Parse(command.GetArgs(), commandStdout.Bytes())
-			b.diagnosticStore.Parse(command.GetArgs(), commandStderr.Bytes())
-		}
+	commandStdout, commandStderr := &bytes.Buffer{}, &bytes.Buffer{}
+	command.RedirectStdoutTo(commandStdout)
+	command.RedirectStderrTo(commandStderr)
+	if b.logger.VerbosityLevel() == logger.VerbosityVerbose {
+		b.logger.Info(utils.PrintableCommand(command.GetArgs()))
+	}
+	// Since this compile could be multithreaded, we first capture the command output
+	if err := command.Start(); err != nil {
+		return nil, err
+	}
+	err = command.Wait()
+	// and transfer all at once at the end...
+	if b.logger.VerbosityLevel() == logger.VerbosityVerbose {
+		b.logger.WriteStdout(commandStdout.Bytes())
+	}
+	b.logger.WriteStderr(commandStderr.Bytes())
 
-		// ...and then return the error
-		if err != nil {
-			return nil, err
-		}
-	} else if b.logger.VerbosityLevel() == logger.VerbosityVerbose {
-		if objIsUpToDate {
-			b.logger.Info(i18n.Tr("Using previously compiled file: %[1]s", objectFile))
-		} else {
-			b.logger.Info(i18n.Tr("Skipping compile of: %[1]s", objectFile))
-		}
+	// Parse the output of the compiler to gather errors and warnings...
+	if b.diagnosticStore != nil {
+		b.diagnosticStore.Parse(command.GetArgs(), commandStdout.Bytes())
+		b.diagnosticStore.Parse(command.GetArgs(), commandStderr.Bytes())
+	}
+
+	// ...and then return the error
+	if err != nil {
+		return nil, err
 	}
 
 	return objectFile, nil