jro_apps/redmine Commit - r8990:90c6a8579bb4

Merged r8876 from trunk....

Jean-Philippe Lang -

r8990:90c6a8579bb4

parent child

Context file:

r8990:90c6a8579bb4

Collapse all files

lib/redmine/unified_diff.rb +25 -24

                  private
-                 # Escape the HTML for the diff
-                 def escapeHTML(line)
-                     CGI.escapeHTML(line)
-                 end
                  def diff_for_added_line
                    if @type == 'sbs' && @removed > 0 && @added < @removed
                      self[-(@removed - @added)]
                  def parse_line(line, type="inline")
                    if line[0, 1] == "+"
                      diff = diff_for_added_line
-                     diff.line_right = escapeHTML line[1..-1]
+                     diff.line_right = line[1..-1]
                      diff.nb_line_right = @line_num_r
                      diff.type_diff_right = 'diff_in'
                      @line_num_r += 1
                      true
                    elsif line[0, 1] == "-"
                      diff = Diff.new
-                     diff.line_left = escapeHTML line[1..-1]
+                     diff.line_left = line[1..-1]
                      diff.nb_line_left = @line_num_l
                      diff.type_diff_left = 'diff_out'
                      self << diff
                      write_offsets
                      if line[0, 1] =~ /\s/
                        diff = Diff.new
-                       diff.line_right = escapeHTML line[1..-1]
+                       diff.line_right = line[1..-1]
                        diff.nb_line_right = @line_num_r
-                       diff.line_left = escapeHTML line[1..-1]
+                       diff.line_left = line[1..-1]
                        diff.nb_line_left = @line_num_l
                        self << diff
                        @line_num_l += 1
                  end
                  def html_line_left
-                   if offsets
-                     line_left.dup.insert(offsets.first, '<span>').insert(offsets.last, '</span>')
-                   else
-                     line_left
-                   end
+                   line_to_html(line_left, offsets)
                  end
                  def html_line_right
-                   if offsets
-                     line_right.dup.insert(offsets.first, '<span>').insert(offsets.last, '</span>')
-                   else
-                     line_right
-                   end
+                   line_to_html(line_right, offsets)
                  end
                  def html_line
-                   if offsets
-                     line.dup.insert(offsets.first, '<span>').insert(offsets.last, '</span>')
-                   else
-                     line
-                   end
+                   line_to_html(line, offsets)
                  end
                  def inspect
                    puts self.nb_line_right
                    puts self.line_right
                  end
+                 private
+                 def line_to_html(line, offsets)
+                   if offsets
+                     s = ''
+                     unless offsets.first == 0
+                       s << CGI.escapeHTML(line[0..offsets.first-1])
+                     end
+                     s << '<span>' + CGI.escapeHTML(line[offsets.first..offsets.last]) + '</span>'
+                     unless offsets.last == -1
+                       s << CGI.escapeHTML(line[offsets.last+1..-1])
+                     end
+                     s
+                   else
+                     CGI.escapeHTML(line)
+                   end
+                 end
                end
              end

test/unit/lib/redmine/unified_diff_test.rb +23 0

		@@ -91,6 +91,29 class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
91	91
92	92	end
93	93
	94	def test_partials_with_html_entities
	95	raw = <<-DIFF
	96	--- test.orig.txt Wed Feb 15 16:10:39 2012
	97	+++ test.new.txt Wed Feb 15 16:11:25 2012
	98	@@ -1,5 +1,5 @@
	99	Semicolons were mysteriously appearing in code diffs in the repository
	100
	101	-void DoSomething(std::auto_ptr<MyClass> myObj)
	102	+void DoSomething(const MyClass& myObj)
	103
	104	DIFF
	105
	106	diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
	107	assert_equal 1, diff.size
	108	assert_equal 'void DoSomething(<span>std::auto_ptr<MyClass></span> myObj)', diff.first[2].html_line_left
	109	assert_equal 'void DoSomething(<span>const MyClass&</span> myObj)', diff.first[2].html_line_right
	110
	111	diff = Redmine::UnifiedDiff.new(raw, :type => 'inline')
	112	assert_equal 1, diff.size
	113	assert_equal 'void DoSomething(<span>std::auto_ptr<MyClass></span> myObj)', diff.first[2].html_line
	114	assert_equal 'void DoSomething(<span>const MyClass&</span> myObj)', diff.first[3].html_line
	115	end
	116
94	117	def test_line_starting_with_dashes
95	118	diff = Redmine::UnifiedDiff.new(<<-DIFF
96	119	--- old.txt Wed Nov 11 14:24:58 2009

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages