Fix check for 'fatal'

Author: paleite

src/git.test.ts

@@ -21,6 +21,14 @@ describe("git", () => {
     expect(getRangesForDiff(includingOnlyRemovals)).toMatchSnapshot();
   });
 
+  it("should work for hunks which include only-removal-ranges", () => {
+    expect(() =>
+      getRangesForDiff("@@ invalid hunk header @@")
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Couldn't match regex with line '@@ invalid hunk header @@'"`
+    );
+  });
+
   it("should get the staged diff of a file", () => {
     mockedChildProcess.execSync.mockReturnValue(Buffer.from(hunks));
 

src/git.ts

@@ -80,8 +80,9 @@ const getGitFileList = (): string[] => {
 
 const getIgnorePatterns = (staged = false): string[] => {
   const changedFiles = getDiffFileList(staged);
+  const repositoryFiles = getGitFileList();
 
-  const unchangedFiles = getGitFileList()
+  const unchangedFiles = repositoryFiles
     .filter((x) => !changedFiles.includes(x))
     .map((x) => path.join("/", path.relative(process.cwd(), x)));
 
@@ -130,5 +131,11 @@ const getRangesForDiff = (diff: string): Range[] =>
     .map(getRangeForChangedLines)
     .filter(removeNullRanges);
 
-export { getDiffForFile, getIgnorePatterns, getRangesForDiff, getDiffFileList };
+export {
+  getDiffForFile,
+  getIgnorePatterns,
+  getRangesForDiff,
+  getDiffFileList,
+  getGitFileList,
+};
 export type { Range };

src/processors.ts

@@ -17,21 +17,29 @@ const diff = {
     messages: Linter.LintMessage[][],
     filename: string
   ): Linter.LintMessage[] => {
-    const shouldKeepFile = getDiffFileList().includes(filename);
-
-    return shouldKeepFile
-      ? messages
-          .map((message) =>
-            message.filter(({ fatal, line }) => {
-              const shouldKeepLine = getRangesForDiff(
-                getDiffForFile(filename)
-              ).some(isLineWithinRange(line));
-
-              return fatal ?? shouldKeepLine;
-            })
-          )
-          .reduce((a, b) => a.concat(b), [])
-      : [];
+    const isFilenameExcluded = !getDiffFileList().includes(filename);
+
+    if (isFilenameExcluded) {
+      return [];
+    }
+
+    return messages
+      .map((message) => {
+        const filteredMessage = message.filter(({ fatal, line }) => {
+          if (fatal === true) {
+            return true;
+          }
+
+          const isLineWithinSomeRange = getRangesForDiff(
+            getDiffForFile(filename)
+          ).some(isLineWithinRange(line));
+
+          return isLineWithinSomeRange;
+        });
+
+        return filteredMessage;
+      })
+      .reduce((a, b) => a.concat(b), []);
   },
 
   supportsAutofix: true,
@@ -53,21 +61,29 @@ const staged = {
     messages: Linter.LintMessage[][],
     filename: string
   ): Linter.LintMessage[] => {
-    const shouldKeepFile = getDiffFileList().includes(filename);
-
-    return shouldKeepFile
-      ? messages
-          .map((message) =>
-            message.filter(({ fatal, line }) => {
-              const shouldKeepLine = getRangesForDiff(
-                getDiffForFile(filename, STAGED)
-              ).some(isLineWithinRange(line));
-
-              return fatal ?? shouldKeepLine;
-            })
-          )
-          .reduce((a, b) => a.concat(b), [])
-      : [];
+    const isFilenameExcluded = !getDiffFileList().includes(filename);
+
+    if (isFilenameExcluded) {
+      return [];
+    }
+
+    return messages
+      .map((message) => {
+        const filteredMessage = message.filter(({ fatal, line }) => {
+          if (fatal === true) {
+            return true;
+          }
+
+          const isLineWithinSomeRange = getRangesForDiff(
+            getDiffForFile(filename, STAGED)
+          ).some(isLineWithinRange(line));
+
+          return isLineWithinSomeRange;
+        });
+
+        return filteredMessage;
+      })
+      .reduce((a, b) => a.concat(b), []);
   },
 
   supportsAutofix: true,