Merge branch '24083-tableflip-quick-action-is-interpreted-even-if-inside-code-block' into 'master'

24083 /tableflip quick action is interpreted even if inside code block

Closes #24083

See merge request gitlab-org/gitlab!24947

changelogs/unreleased/24083-tableflip-quick-action-is-interpreted-even-if-inside-code-block.yml

+---
+title: 'Fix: tableflip quick action is interpreted even if inside code block'
+merge_request:
+author: Pavlo Dudchenko
+type: fixed

lib/gitlab/quick_actions/extractor.rb

@@ -13,6 +13,7 @@ module Gitlab
 
       def initialize(command_definitions)
         @command_definitions = command_definitions
+        @commands_regex = {}
       end
 
       # Extracts commands from content and return an array of commands.
@@ -58,7 +59,8 @@ module Gitlab
         content = content.dup
         content.delete!("\r")
 
-        content.gsub!(commands_regex(only: only)) do
+        names = command_names(limit_to_commands: only).map(&:to_s)
+        content.gsub!(commands_regex(names: names)) do
           command, output = process_commands($~, redact)
           commands << command
           output
@@ -91,10 +93,8 @@ module Gitlab
       # It looks something like:
       #
       #   /^\/(?<cmd>close|reopen|...)(?:( |$))(?<arg>[^\/\n]*)(?:\n|$)/
-      def commands_regex(only:)
-        names = command_names(limit_to_commands: only).map(&:to_s)
-
-        @commands_regex ||= %r{
+      def commands_regex(names:)
+        @commands_regex[names] ||= %r{
             (?<code>
               # Code blocks:
               # ```
@@ -151,14 +151,18 @@ module Gitlab
         end
 
         substitution_definitions.each do |substitution|
-          match_data = substitution.match(content.downcase)
-          if match_data
-            command = [substitution.name.to_s]
-            command << match_data[1] unless match_data[1].empty?
-            commands << command
+          regex = commands_regex(names: substitution.all_names)
+          content = content.gsub(regex) do |text|
+            if $~[:cmd]
+              command = [substitution.name.to_s]
+              command << $~[:arg] if $~[:arg].present?
+              commands << command
+
+              substitution.perform_substitution(self, text)
+            else
+              text
+            end
           end
-
-          content = substitution.perform_substitution(self, content)
         end
 
         [content, commands]

lib/gitlab/quick_actions/substitution_definition.rb

@@ -17,7 +17,7 @@ module Gitlab
         return unless content
 
         all_names.each do |a_name|
-          content = content.gsub(%r{/#{a_name}(?![\S]) ?(.*)$}i, execute_block(action_block, context, '\1'))
+          content = content.sub(%r{/#{a_name}(?![\S]) ?(.*)$}i, execute_block(action_block, context, '\1'))
         end
 
         content

spec/lib/gitlab/quick_actions/extractor_spec.rb

@@ -216,6 +216,22 @@ describe Gitlab::QuickActions::Extractor do
       expect(msg).to eq "hello\nworld\nthis is great? SHRUG"
     end
 
+    it 'extracts and performs multiple substitution commands' do
+      msg = %(hello\nworld\n/reopen\n/shrug this is great?\n/shrug meh)
+      msg, commands = extractor.extract_commands(msg)
+
+      expect(commands).to eq [['reopen'], ['shrug', 'this is great?'], %w(shrug meh)]
+      expect(msg).to eq "hello\nworld\nthis is great? SHRUG\nmeh SHRUG"
+    end
+
+    it 'does not extract substitution command in inline code' do
+      msg = %(hello\nworld\n/reopen\n`/tableflip this is great`?)
+      msg, commands = extractor.extract_commands(msg)
+
+      expect(commands).to eq [['reopen']]
+      expect(msg).to eq "hello\nworld\n`/tableflip this is great`?"
+    end
+
     it 'extracts and performs substitution commands case insensitive' do
       msg = %(hello\nworld\n/reOpen\n/sHRuG this is great?)
       msg, commands = extractor.extract_commands(msg)

spec/lib/gitlab/quick_actions/substitution_definition_spec.rb

@@ -7,6 +7,7 @@ describe Gitlab::QuickActions::SubstitutionDefinition do
     <<EOF
 Hello! Let's do this!
 /sub_name I like this stuff
+/sub_name second substitution
 EOF
   end
 
@@ -24,6 +25,7 @@ EOF
         expect(subject.perform_substitution(self, content)).to eq <<EOF
 Hello! Let's do this!
 I like this stuff foo
+/sub_name second substitution
 EOF
       end
     end