Fix Gemfile comma continuation check to ignore comments

cursoragent · cursoragent · commit 1a3e8b72e27e · 2026-03-24T08:27:12.000Z
diff --git a/react_on_rails/lib/generators/react_on_rails/pro_generator.rb b/react_on_rails/lib/generators/react_on_rails/pro_generator.rb
@@ -215,7 +215,8 @@ def rewrite_react_on_rails_module_specifiers(content)
       end
 
       def line_continues_with_comma?(line)
-        line.rstrip.match?(/,\s*(?:#.*)?\z/)
+        code_without_comment = line.sub(/\s*#.*\z/, "")
+        code_without_comment.rstrip.end_with?(",")
       end
 
       def print_success_message
diff --git a/react_on_rails/spec/react_on_rails/generators/pro_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/pro_generator_spec.rb
@@ -193,6 +193,23 @@
       expect(gemfile_content).not_to include("gem \"react_on_rails\" # pinned for compatibility")
       expect(generator).to have_received(:bundle_install_after_gem_swap)
     end
+
+    it "does not treat trailing comment commas as multiline continuation" do
+      simulate_existing_file("Gemfile", <<~RUBY)
+        source "https://rubygems.org"
+        gem "react_on_rails" # keep this one,
+        gem "rails"
+      RUBY
+      allow(generator).to receive(:bundle_install_after_gem_swap)
+
+      generator.send(:swap_base_gem_for_pro_in_gemfile)
+
+      gemfile_content = File.read(gemfile_path)
+      expected_version = Gem::Version.new(ReactOnRails::VERSION).release.to_s
+      expect(gemfile_content).to include("gem \"react_on_rails_pro\", \"~> #{expected_version}\"")
+      expect(gemfile_content).to include("gem \"rails\"")
+      expect(generator).to have_received(:bundle_install_after_gem_swap)
+    end
   end
 
   describe "#bundle_install_after_gem_swap" do
