Fixed: Redub now simulates the same behavior from dub when using sourcePaths

Author: MrcSnm

dub_sdl_to_json/source/dub_sdl_to_json.d

@@ -66,7 +66,6 @@ JSONValue sdlToJSON(SDLNode[] sdl)
 	import std.exception;
 	import std.array;
 	import redub.libs.adv_diff.helpers.index_of;
-	import std.algorithm.searching:countUntil;
 
 	JSONValue ret = JSONValue.emptyObject;
 

source/redub/buildapi.d

@@ -214,6 +214,7 @@ struct BuildConfiguration
 
     bool isDebug;
     @cacheExclude BuildConfigurationFlags flags = BuildConfigurationFlags.defaultInit;
+    @cacheExclude bool isUsingDefaultSourcePaths = true;
     RedubLanguages language = RedubLanguages.D;
     TargetType targetType;
 
@@ -331,6 +332,7 @@ struct BuildConfiguration
         ret.targetType = either(other.targetType, ret.targetType);
         ret.targetName = either(other.targetName, ret.targetName);
         ret.outputDirectory = either(other.outputDirectory, ret.outputDirectory);
+        ret.isUsingDefaultSourcePaths = ret.isUsingDefaultSourcePaths && other.isUsingDefaultSourcePaths;
         ret = ret.mergeCommands(other);
         ret.flags = other.flags;
         ret.extraDependencyFiles.exclusiveMergePaths(other.extraDependencyFiles);

source/redub/parsers/automatic.d

@@ -187,7 +187,10 @@ private void partiallyFinishBuildRequirements(ref BuildRequirements req, BuildCo
     import std.algorithm.iteration;
     auto libraries = req.cfg.sourceFiles.filter!((name) => name.extension.isLibraryExtension);
     req.cfg.libraries.exclusiveMergePaths(libraries);
-    req.cfg.importDirectories.exclusiveMergePaths(req.cfg.sourcePaths); //importPaths is always a mix of custom imports + sourcePaths
+
+    //importPaths will always contain sourcePath if it is using the default https://dub.pm/dub-reference/build_settings/#sourcepaths
+    if(req.cfg.isUsingDefaultSourcePaths)
+        req.cfg.importDirectories.exclusiveMergePaths(req.cfg.sourcePaths);
 
     ///Remove libraries from the sourceFiles.
     req.cfg.sourceFiles = inPlaceFilter(req.cfg.sourceFiles, (string file) => !file.extension.isLibraryExtension);

source/redub/parsers/base.d

@@ -126,8 +126,11 @@ void addPostBuildCommands(ref BuildRequirements req, JSONStringArray cmds, Parse
 void addSourcePaths(ref BuildRequirements req, JSONStringArray paths, ParseConfig c)
 {
     import std.array;
-    if(c.firstRun) req.cfg.sourcePaths = cast(string[])paths.array;
-    else req.cfg.sourcePaths.exclusiveMergePaths(paths);
+    req.cfg.isUsingDefaultSourcePaths = false;
+    if(c.firstRun)
+        req.cfg.sourcePaths = cast(string[])paths.array;
+    else
+        req.cfg.sourcePaths.exclusiveMergePaths(paths);
 }
 void addSourceFiles(ref BuildRequirements req, JSONStringArray files, ParseConfig c){req.cfg.sourceFiles.exclusiveMerge(files);}
 void addExcludedSourceFiles(ref BuildRequirements req, JSONStringArray files, ParseConfig c){req.cfg.excludeSourceFiles.exclusiveMerge(files);}