Update: Added officially CPP to json recipe

Author: MrcSnm

adv_diff/source/redub/libs/adv_diff/files.d

@@ -97,6 +97,28 @@ enum DirectoryFilterType : ubyte
 	c,
 	cpp,
 }
+
+bool shouldIncludeByExt(DirectoryFilterType filter, string target)
+{
+	import std.path;
+	string ext = target.extension;
+	final switch(filter)
+	{
+		case DirectoryFilterType.c:
+			return ext == ".c" || ext == ".i" || ext == ".h";
+		case DirectoryFilterType.cpp:
+			return ext == ".c" || ext == ".i" || ext == ".h" || ext == ".cpp" || ext == ".cc" || ext == ".cxx" || ext == ".c++" || ext == ".hpp";
+		case DirectoryFilterType.d:
+			if(ext.length == 0 || ext.length > 3) return false;
+			if(ext[1] == 'd') {
+				return ext.length == 2 ||
+					(ext.length == 3 && ext[2] == 'i');
+			}
+			return false;
+		case DirectoryFilterType.none: return true;
+	}
+}
+
 struct DirectoriesWithFilter
 {
 	const string[] dirs;
@@ -108,32 +130,10 @@ struct DirectoriesWithFilter
 	///Uses the simplified hashing whenever inside that dir. May be used on directories with bigger files
 	bool useSimplifiedHashing;
 
-	pragma(inline, true)
-	bool shouldIncludeByExt(string target)
-	{
-		import std.path;
-		string ext = target.extension;
-		final switch(filterType)
-		{
-			case DirectoryFilterType.c:
-				return ext == ".c" || ext == ".i" || ext == ".h";
-			case DirectoryFilterType.cpp:
-				return ext == ".c" || ext == ".i" || ext == ".h" || ext == ".cpp" || ext == ".cc" || ext == ".cxx" || ext == ".c++" || ext == ".hpp";
-			case DirectoryFilterType.d:
-				if(ext.length == 0 || ext.length > 3) return false;
-				if(ext[1] == 'd') {
-					return ext.length == 2 ||
-						(ext.length == 3 && ext[2] == 'i');
-				}
-				return false;
-			case DirectoryFilterType.none: return true;
-		}
-	}
-
 	pragma(inline, true) bool shouldInclude(string target)
 	{
 		import redub.libs.adv_diff.helpers.index_of;
-		return shouldIncludeByExt(target) && indexOf(ignoreFiles, target) == -1;
+		return filterType.shouldIncludeByExt(target) && indexOf(ignoreFiles, target) == -1;
 	}
 }
 

source/redub/buildapi.d

@@ -160,7 +160,8 @@ RedubLanguages redubLanguage(string input)
 enum RedubLanguages : ubyte
 {
     D,
-    C
+    C,
+    CPP
 }
 
 enum RedubCommands : ubyte
@@ -315,6 +316,7 @@ struct BuildConfiguration
         final switch(language)
         {
             case RedubLanguages.C: return c.c;
+            case RedubLanguages.CPP: return c.c;
             case RedubLanguages.D: return c.d;
         }
     }

source/redub/command_generators/commons.d

@@ -2,6 +2,7 @@ module redub.command_generators.commons;
 public import redub.libs.semver;
 public import std.system;
 public import redub.tooling.compiler_identification;
+public import redub.libs.adv_diff.files : DirectoriesWithFilter, DirectoryFilterType;
 
 //Import the commonly shared buildapi
 import redub.buildapi;
@@ -217,6 +218,20 @@ bool isApple(OS os)
     return (os == OS.osx || os == OS.iOS || os == OS.tvOS || os == OS.watchOS);
 }
 
+
+DirectoryFilterType sourceFilter(const ref BuildConfiguration cfg)
+{
+    final switch(cfg.language)
+    {
+        case RedubLanguages.C:
+            return DirectoryFilterType.c;
+        case RedubLanguages.CPP:
+            return DirectoryFilterType.cpp;
+        case RedubLanguages.D:
+            return DirectoryFilterType.d;
+    }
+}
+
 /**
  *
  * Params:
@@ -229,7 +244,7 @@ bool hasAnySource(const ref BuildConfiguration cfg, ref bool[string] sourceCache
     import redub.libs.adv_diff.files;
 
     if(cfg.sourceFiles.length) return true;
-    DirectoriesWithFilter filter = DirectoriesWithFilter(cfg.sourcePaths, cfg.language == RedubLanguages.D ? DirectoryFilterType.d : DirectoryFilterType.cpp, cfg.excludeSourceFiles);
+    DirectoriesWithFilter filter = DirectoriesWithFilter(cfg.sourcePaths, sourceFilter(cfg), cfg.excludeSourceFiles);
 
     foreach(path; cfg.sourcePaths)
     {

source/redub/extensions/watcher.d

@@ -192,11 +192,8 @@ int watchMain(string[] args)
                     //     break WATCHERS_LOOP;
                     // }
                     // else
-                    if(event.path.endsWith(".d") || event.path.endsWith(".di"))
-                    {
-                        d = doProjectBuild(d);
-                        break WATCHERS_LOOP;
-                    }
+                    d = doProjectBuild(d);
+                    break WATCHERS_LOOP;
                 }
             }
         }