Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

utf-8 strings support #52

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

utf-8 strings support #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7ffdea
removed uneeded /span
Jul 6, 2018
deec9a6
utf-8 lines support
Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions lib/Diff/Renderer/Html/Array.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@

require_once dirname(__FILE__).'/../Abstract.php';

function substr_replace_utf8($string, $replacement, $position_needle, $length_needle)
{
$str1 = mb_substr ($string, 0, $position_needle, 'UTF-8');
$str2 = mb_substr ($string, $position_needle + $length_needle, null, 'UTF-8');
return $str1 . $replacement . $str2;
}

class Diff_Renderer_Html_Array extends Diff_Renderer_Abstract
{
/**
Expand Down Expand Up @@ -83,11 +90,11 @@ public function render()
list($start, $end) = $this->getChangeExtent($fromLine, $toLine);
if($start != 0 || $end != 0) {
$last = $end + strlen($fromLine);
$fromLine = substr_replace($fromLine, "\0", $start, 0);
$fromLine = substr_replace($fromLine, "\1", $last + 1, 0);
$fromLine = substr_replace_utf8($fromLine, "\0", $start, 0);
$fromLine = substr_replace_utf8($fromLine, "\1", $last + 1, 0);
$last = $end + strlen($toLine);
$toLine = substr_replace($toLine, "\0", $start, 0);
$toLine = substr_replace($toLine, "\1", $last + 1, 0);
$toLine = substr_replace_utf8($toLine, "\0", $start, 0);
$toLine = substr_replace_utf8($toLine, "\1", $last + 1, 0);
$a[$i1 + $i] = $fromLine;
$b[$j1 + $i] = $toLine;
}
Expand Down Expand Up @@ -149,13 +156,13 @@ public function render()
private function getChangeExtent($fromLine, $toLine)
{
$start = 0;
$limit = min(strlen($fromLine), strlen($toLine));
while($start < $limit && $fromLine{$start} == $toLine{$start}) {
$limit = min(mb_strlen($fromLine, 'UTF-8'), mb_strlen($toLine, 'UTF-8'));
while($start < $limit && mb_substr($fromLine, $start, 1, 'UTF-8') == mb_substr($toLine, $start, 1, 'UTF-8')) {
++$start;
}
$end = -1;
$limit = $limit - $start;
while(-$end <= $limit && substr($fromLine, $end, 1) == substr($toLine, $end, 1)) {
while(-$end <= $limit && mb_substr($fromLine, $end, 1, 'UTF-8') == mb_substr($toLine, $end, 1, 'UTF-8')) {
--$end;
}
return array(
Expand Down
4 changes: 2 additions & 2 deletions lib/Diff/Renderer/Html/SideBySide.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ public function render()
$toLine = $change['changed']['offset'] + $no + 1;
$html .= '<tr>';
$html .= '<th>'.$fromLine.'</th>';
$html .= '<td class="Left"><span>'.$line.'</span>&nbsp;</span></td>';
$html .= '<td class="Left"><span>'.$line.'</span>&nbsp;</td>';
$html .= '<th>'.$toLine.'</th>';
$html .= '<td class="Right"><span>'.$line.'</span>&nbsp;</span></td>';
$html .= '<td class="Right"><span>'.$line.'</span>&nbsp;</td>';
$html .= '</tr>';
}
}
Expand Down