Merge pull request #1474 from PombeirP/failing-sanitizer-spec

Fix mismatched code span issue when sanitizing mentions

common/lib/dependabot/pull_request_creator/message_builder/link_and_mention_sanitizer.rb

@@ -13,7 +13,24 @@ class LinkAndMentionSanitizer
           github\.com/(?<repo>#{GITHUB_USERNAME}/[^/\s]+)/
           (?:issue|pull)s?/(?<number>\d+)
         }x.freeze
-        CODEBLOCK_REGEX = /(`+).*?(\1)|~~~.*?~~~/m.freeze
+        # rubocop:disable Metrics/LineLength
+        # Context:
+        # - https://github.github.com/gfm/#fenced-code-block (``` or ~~~)
+        #   (?<=\n|^)         Positive look-behind to ensure we start at a line start
+        #   (?>`{3,}|~{3,})   Atomic group marking the beginning of the block (3 or more chars)
+        #   (?>\k<fenceopen>) Atomic group marking the end of the code block (same length as opening)
+        # - https://github.github.com/gfm/#code-span
+        #   (?<codespanopen>`+)  Capturing group marking the beginning of the span (1 or more chars)
+        #   (?![^`]*?\n{2,})     Negative look-ahead to avoid empty lines inside code span
+        #   (?:.|\n)*?           Non-capturing group to consume code span content (non-eager)
+        #   (?>\k<codespanopen>) Atomic group marking the end of the code span (same length as opening)
+        # rubocop:enable Metrics/LineLength
+        CODEBLOCK_REGEX = /
+          # fenced code block
+          (?<=\n|^)(?<fenceopen>(?>`{3,}|~{3,})).*?(?>\k<fenceopen>)|
+          # code span
+          (?<codespanopen>`+)(?![^`]*?\n{2,})(?:.|\n)*?(?>\k<codespanopen>)
+        /xm.freeze
         # End of string
         EOS_REGEX = /\z/.freeze
 

common/spec/dependabot/pull_request_creator/message_builder/link_and_mention_sanitizer_spec.rb

@@ -60,6 +60,11 @@
         it { is_expected.to eq(text) }
       end
 
+      context "with unmatched single code ticks previously" do
+        let(:text) { fixture("changelogs", "sentry.md") }
+        it { is_expected.to include("@​halkeye") }
+      end
+
       context "that appears in codeblock quotes" do
         let(:text) { "``` @model ||= 123```" }
         it { is_expected.to eq(text) }