fix conflict between issueAdd and Edit

Author: nedtwigg

src/lib/enhancers/github/githubEditComment.tsx

@@ -16,17 +16,33 @@ export class GitHubEditCommentEnhancer implements CommentEnhancer<GitHubEditComm
   }
 
   tryToEnhance(
-    _textarea: HTMLTextAreaElement,
+    textarea: HTMLTextAreaElement,
     location: StrippedLocation,
   ): GitHubEditCommentSpot | null {
     if (location.host !== 'github.com') {
       return null
     }
+
+    // Only enhance textareas that are within the issue/PR body editing container
+    const bodyContainer = textarea.closest('.react-issue-body')
+    if (!bodyContainer) {
+      return null
+    }
+
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
-    logger.info(`${this.constructor.name} examing url`, window.location.pathname)
+    const match = location.pathname.match(/^\/([^/]+)\/([^/]+)\/(?:issues|pull)\/(\d+)/)
+    if (!match) {
+      return null
+    }
+
+    const [, owner, repo, numberStr] = match
+    const number = parseInt(numberStr!, 10)
+    const unique_key = `github.com:${owner}/${repo}:${number}:edit-body`
+
+    logger.debug(`${this.constructor.name} enhanced issue/PR body textarea`, unique_key)
     return {
       type: 'GH_EDIT_COMMENT',
-      unique_key: '<not unique>',
+      unique_key,
     }
   }
 

src/lib/enhancers/github/githubIssueAddComment.tsx

@@ -31,6 +31,12 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
       return null
     }
 
+    // Don't enhance textareas that are within the issue/PR body editing container
+    const bodyContainer = textarea.closest('.react-issue-body')
+    if (bodyContainer) {
+      return null
+    }
+
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
     logger.debug(`${this.constructor.name} examing url`, location.pathname)
 

tests/lib/enhancers/github.test.ts

@@ -197,31 +197,13 @@ describe('github', () => {
         {
           "for": "id=:rc3: name=null className=prc-Textarea-TextArea-13q4j focus-visible overtype-input",
           "spot": {
-            "domain": "github.com",
-            "number": 56,
-            "slug": "diffplug/gitcasso",
-            "title": "what about the draft?",
-            "type": "GH_ISSUE_ADD_COMMENT",
-            "unique_key": "github.com:diffplug/gitcasso:56",
+            "type": "GH_EDIT_COMMENT",
+            "unique_key": "github.com:diffplug/gitcasso:56:edit-body",
           },
-          "title": "what about the draft?",
-          "upperDecoration": <React.Fragment>
-            <span
-              className="flex h-4 w-4 flex-shrink-0 items-center justify-center"
-            >
-              <IssueOpenedIcon
-                size={16}
-              />
-            </span>
-            #
-            56
-            <a
-              className="truncate hover:underline"
-              href="https://github.com/diffplug/gitcasso"
-            >
-              diffplug/gitcasso
-            </a>
-          </React.Fragment>,
+          "title": "N/A",
+          "upperDecoration": <span>
+            N/A
+          </span>,
         },
         {
           "for": "id=:ra7: name=null className=prc-Textarea-TextArea-13q4j overtype-input",
@@ -259,29 +241,8 @@ describe('github', () => {
     expect(enhancements(document, window)).toMatchInlineSnapshot(`
       [
         {
-          "for": "id=issue-3429313834-body name=pull_request[body] className=js-comment-field js-paste-markdown js-task-list-field js-quick-submit js-size-to-fit size-to-fit js-session-resumable CommentBox-input FormControl-textarea js-saved-reply-shortcut-comment-field focus-visible overtype-input",
-          "spot": {
-            "domain": "github.com",
-            "number": NaN,
-            "slug": "diffplug/gitcasso",
-            "title": "TODO_TITLE",
-            "type": "GH_EDIT_COMMENT",
-            "unique_key": "github.com:diffplug/gitcasso:NaN",
-          },
-          "title": "TITLE_TODO",
-          "upperDecoration": <React.Fragment>
-            <span
-              className="font-mono text-muted-foreground text-sm"
-            >
-              diffplug/gitcasso
-            </span>
-            <span
-              className="ml-2 font-medium"
-            >
-              PR #
-              NaN
-            </span>
-          </React.Fragment>,
+          "for": "id=issue-3429313834-body name=pull_request[body] className=js-comment-field js-paste-markdown js-task-list-field js-quick-submit js-size-to-fit size-to-fit js-session-resumable CommentBox-input FormControl-textarea js-saved-reply-shortcut-comment-field focus-visible",
+          "spot": "NO_SPOT",
         },
         {
           "for": "id=new_comment_field name=comment[body] className=js-comment-field js-paste-markdown js-task-list-field js-quick-submit FormControl-textarea CommentBox-input js-size-to-fit size-to-fit js-session-resumable js-saved-reply-shortcut-comment-field overtype-input",