Merge pull request #500 from github/aeisenberg/paths-include

Change include path for lines of code counting
github · May 13, 2021 · 6a0bd27 · 6a0bd27
2 parents a77f6b0 + 8e61fc2
commit 6a0bd27
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/lib/count-loc.js b/lib/count-loc.js
diff --git a/lib/count-loc.js.map b/lib/count-loc.js.map
diff --git a/lib/count-loc.test.js b/lib/count-loc.test.js
diff --git a/lib/count-loc.test.js.map b/lib/count-loc.test.js.map
diff --git a/src/count-loc.test.ts b/src/count-loc.test.ts
@@ -63,7 +63,23 @@ test("ensure lines of code can handle includes", async (t) => {
   );
 
   t.deepEqual(results, {
-    javascript: 15,
+    javascript: 12,
+  });
+});
+
+test("ensure lines of code can handle empty includes", async (t) => {
+  // note that "**" is always included. The includes are for extra
+  // directories outside the normal structure.
+  const results = await countLoc(
+    path.join(__dirname, "../tests/multi-language-repo"),
+    ["idontexist"],
+    [],
+    [Language.javascript],
+    getRunnerLogger(true)
+  );
+
+  t.deepEqual(results, {
+    // should get no results
   });
 });
 

diff --git a/src/count-loc.ts b/src/count-loc.ts
@@ -69,7 +69,7 @@ export async function countLoc(
 ): Promise<Partial<Record<Language, number>>> {
   const result = await new LocDir({
     cwd,
-    include: ["**"].concat(include || []),
+    include: Array.isArray(include) && include.length > 0 ? include : ["**"],
     exclude,
     analysisLanguages: dbLanguages.flatMap((lang) => nameToLinguist[lang]),
   }).loadInfo();