Enable comment again

phntmxyz · Apr 12, 2024 · 94e5de4 · 94e5de4
1 parent 4061bc9
commit 94e5de4
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 36 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -29076,20 +29076,22 @@ function run() {
                 }
                 return;
             }
-            const editIssueId = core.getInput('edit-issue-id');
-            if (editIssueId) {
-                console.log('Edit issue id:', editIssueId);
-                return;
+            else {
+                const editIssueId = core.getInput('edit-issue-id');
+                if (editIssueId) {
+                    console.log('Edit issue id:', editIssueId);
+                    return;
+                }
+                const pr = github.context.payload.pull_request;
+                if (!pr) {
+                    throw new Error('This action can only be run on pull requests');
+                }
+                const prDiff = yield getPrDiff(octokit, pr.base.sha, pr.head.sha);
+                const todos = findTodos(prDiff);
+                console.log('Todos:', JSON.stringify(todos));
+                const useOutput = core.getInput('use-output');
+                yield commentPr(octokit, pr.number, todos);
             }
-            //   const pr = github.context.payload.pull_request
-            //   if (!pr) {
-            //     throw new Error('This action can only be run on pull requests')
-            //   }
-            //   const prDiff = await getPrDiff(octokit, pr.base.sha, pr.head.sha)
-            //   const todos = findTodos(prDiff)
-            //   console.log('Todos:', JSON.stringify(todos))
-            //   const useOutput = core.getInput('use-output')
-            //   await commentPr(octokit, pr.number, todos)
         }
         catch (error) {
             if (error instanceof Error) {
@@ -29154,7 +29156,7 @@ function findTodos(prDiff) {
 }
 exports.findTodos = findTodos;
 function getTodoIfFound(line) {
-    const regex = /[/*#]+.*(TODO.*)/i;
+    const regex = /[/*#]+.*(TODO.*|FIXME.*)/i;
     const matches = [...line.matchAll(regex)];
     if (matches === undefined || matches.length === 0)
         return;
@@ -29173,7 +29175,7 @@ function commentPr(octokit, prNumber, todos) {
             const addedTodos = todo.todos.filter(todo => todo.added);
             const removedTodos = todo.todos.filter(todo => !todo.added);
             for (const innerTodo of addedTodos) {
-                let response = yield octokit.rest.pulls.createReviewComment({
+                yield octokit.rest.pulls.createReviewComment({
                     owner,
                     repo,
                     pull_number: prNumber,
@@ -29185,7 +29187,7 @@ function commentPr(octokit, prNumber, todos) {
                 });
             }
             for (const innerTodo of removedTodos) {
-                let response = yield octokit.rest.pulls.createReviewComment({
+                yield octokit.rest.pulls.createReviewComment({
                     owner,
                     repo,
                     pull_number: prNumber,

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -69,25 +69,25 @@ export async function run(): Promise<void> {
         console.log('Error creating commit status', error)
       }
       return
-    }
-
-    const editIssueId = core.getInput('edit-issue-id')
-    if (editIssueId) {
-      console.log('Edit issue id:', editIssueId)
-      return
-    }
+    } else {
+      const editIssueId = core.getInput('edit-issue-id')
+      if (editIssueId) {
+        console.log('Edit issue id:', editIssueId)
+        return
+      }
 
-    //   const pr = github.context.payload.pull_request
-    //   if (!pr) {
-    //     throw new Error('This action can only be run on pull requests')
-    //   }
-    //   const prDiff = await getPrDiff(octokit, pr.base.sha, pr.head.sha)
+      const pr = github.context.payload.pull_request
+      if (!pr) {
+        throw new Error('This action can only be run on pull requests')
+      }
+      const prDiff = await getPrDiff(octokit, pr.base.sha, pr.head.sha)
 
-    //   const todos = findTodos(prDiff)
-    //   console.log('Todos:', JSON.stringify(todos))
+      const todos = findTodos(prDiff)
+      console.log('Todos:', JSON.stringify(todos))
 
-    //   const useOutput = core.getInput('use-output')
-    //   await commentPr(octokit, pr.number, todos)
+      const useOutput = core.getInput('use-output')
+      await commentPr(octokit, pr.number, todos)
+    }
   } catch (error) {
     if (error instanceof Error) {
       core.setFailed(error.message)
@@ -154,7 +154,7 @@ export function findTodos(prDiff: PrDiff): Todo[] {
 }
 
 function getTodoIfFound(line: string): string | undefined {
-  const regex = /[/*#]+.*(TODO.*)/i
+  const regex = /[/*#]+.*(TODO.*|FIXME.*)/i
   const matches = [...line.matchAll(regex)]
   if (matches === undefined || matches.length === 0) return
   return matches[0][1]
@@ -178,7 +178,7 @@ async function commentPr(
     const removedTodos = todo.todos.filter(todo => !todo.added)
 
     for (const innerTodo of addedTodos) {
-      let response = await octokit.rest.pulls.createReviewComment({
+      await octokit.rest.pulls.createReviewComment({
         owner,
         repo,
         pull_number: prNumber,
@@ -191,7 +191,7 @@ async function commentPr(
     }
 
     for (const innerTodo of removedTodos) {
-      let response = await octokit.rest.pulls.createReviewComment({
+      await octokit.rest.pulls.createReviewComment({
         owner,
         repo,
         pull_number: prNumber,