fix: compatible working-directory+only-new-issues

src/run.ts

@@ -8,6 +8,7 @@ import { promisify } from "util"
 
 import { restoreCache, saveCache } from "./cache"
 import { installLint, InstallMode } from "./install"
+import { alterDiffFile } from "./utils/diffUtils"
 import { findLintVersion } from "./version"
 
 const execShellCommand = promisify(exec)
@@ -68,7 +69,7 @@ async function fetchPatch(): Promise<string> {
     const tempDir = await createTempDir()
     const patchPath = path.join(tempDir, "pull.patch")
     core.info(`Writing patch to ${patchPath}`)
-    await writeFile(patchPath, patch)
+    await writeFile(patchPath, alterDiffFile(patch))
     return patchPath
   } catch (err) {
     console.warn(`failed to save pull request patch:`, err)
@@ -157,10 +158,6 @@ async function runLint(lintPath: string, patchPath: string): Promise<void> {
   const workingDirectory = core.getInput(`working-directory`)
   const cmdArgs: ExecOptions = {}
   if (workingDirectory) {
-    if (patchPath) {
-      // TODO: make them compatible
-      throw new Error(`options working-directory and only-new-issues aren't compatible`)
-    }
     if (!fs.existsSync(workingDirectory) || !fs.lstatSync(workingDirectory).isDirectory()) {
       throw new Error(`working-directory (${workingDirectory}) was not a path`)
     }

src/utils/diffUtils.ts

@@ -0,0 +1,44 @@
+import * as core from "@actions/core"
+import * as path from "path"
+
+// If needed alter diff file to be compatible with working directory
+export function alterDiffFile(diffFile: string): string {
+  let workingDirectory = core.getInput(`working-directory`)
+  if (workingDirectory) {
+    const workspace = process.env["GITHUB_WORKSPACE"] || ""
+    const relativeFile = path.relative(workspace, workingDirectory)
+    workingDirectory = relativeFile
+
+    const diffLines = diffFile.split("\n")
+    let ignore = false
+    const filteredDiffLines = []
+
+    for (const line of diffLines) {
+      if (line.startsWith("diff --git")) {
+        if (line.includes(`a/${workingDirectory}/`)) {
+          ignore = false
+          filteredDiffLines.push(line.replace(` a/${workingDirectory}/`, " a/").replace(` b/${workingDirectory}/`, " b/"))
+        } else {
+          ignore = true
+        }
+      } else {
+        if (!ignore) {
+          if (line.startsWith(`--- a/${workingDirectory}/`)) {
+            filteredDiffLines.push(line.replace(`--- a/${workingDirectory}/`, "--- a/"))
+          } else if (line.startsWith(`+++ a/${workingDirectory}/`)) {
+            filteredDiffLines.push(line.replace(`+++ a/${workingDirectory}/`, "+++ a/"))
+          } else if (line.startsWith(`--- b/${workingDirectory}/`)) {
+            filteredDiffLines.push(line.replace(`--- b/${workingDirectory}/`, "--- b/"))
+          } else if (line.startsWith(`+++ b/${workingDirectory}/`)) {
+            filteredDiffLines.push(line.replace(`+++ b/${workingDirectory}/`, "+++ b/"))
+          } else {
+            filteredDiffLines.push(line)
+          }
+        }
+      }
+    }
+    // Join the modified lines back into a diff string
+    diffFile = filteredDiffLines.join("\n")
+  }
+  return diffFile
+}