Call findIncludesUntilDone from only one place

Previously, it was called once for the main cpp file, and then in a loop
for any extra source files from the sketch or dependent libraries.
However, this can be simplified by just adding the main .cpp file to the
queue, and then letting the loop handle it.

This produces a tiny change in the order in which source files are
processed for includes, but any setups affected by this are already
prone to errors.

Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>

Author: matthijskooijman

src/arduino.cc/builder/container_find_includes.go

@@ -49,10 +49,7 @@ func (s *ContainerFindIncludes) Run(ctx *types.Context) error {
 
 	sketchBuildPath := ctx.SketchBuildPath
 	sketch := ctx.Sketch
-	err := findIncludesUntilDone(ctx, filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"))
-	if err != nil {
-		return i18n.WrapError(err)
-	}
+	ctx.CollectedSourceFiles.Push(filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"))
 
 	foldersWithSources := ctx.FoldersWithSourceFiles
 	foldersWithSources.Push(types.SourceFolder{Folder: ctx.SketchBuildPath, Recurse: false})
@@ -61,7 +58,7 @@ func (s *ContainerFindIncludes) Run(ctx *types.Context) error {
 		foldersWithSources.Push(types.SourceFolder{Folder: srcSubfolderPath, Recurse: true})
 	}
 
-	err = runCommand(ctx, &CollectAllSourceFilesFromFoldersWithSources{})
+	err := runCommand(ctx, &CollectAllSourceFilesFromFoldersWithSources{})
 	if err != nil {
 		return i18n.WrapError(err)
 	}