Use newly introduced esc_html_match_hl() subroutine in
git_search_files() ('grep' search), instead of handcrafted code using
captures, which highlighted only first match in line.
This required to enhance esc_html_match_hl() to be able to pass-thru
options for esc_html like -nbsp=>1.
Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
---
Note: because untabify() is run before match, some regexp might not
show match; this is not regression, because earlier versions had the
same behavior.
Code is shorter, and behavior is improved.
gitweb/gitweb.perl | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 6bc68c5..d489640 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1692,24 +1692,24 @@ sub chop_and_escape_str {
# highlight match (if any), and escape HTML
sub esc_html_match_hl {
- my ($str, $regexp) = @_;
- return esc_html($str) unless defined $regexp;
+ my ($str, $regexp, @opts) = @_;
+ return esc_html($str, @opts) unless defined $regexp;
my @matches;
while ($str =~ /$regexp/g) {
push @matches, [$-[0], $+[0]];
}
- return esc_html($str) unless @matches;
+ return esc_html($str, @opts) unless @matches;
my $out = '';
my $pos = 0;
for my $m (@matches) {
- $out .= esc_html(substr $str, $pos, $m->[0] - $pos);
+ $out .= esc_html(substr($str, $pos, $m->[0] - $pos), @opts);
$out .= $cgi->span({-class => 'match'},
- esc_html(substr $str, $m->[0], $m->[1] -
$m->[0]));
+ esc_html(substr($str, $m->[0], $m->[1] - $m->[0]),
@opts));
$pos = $m->[1];
}
- $out .= esc_html(substr $str, $pos);
+ $out .= esc_html(substr($str, $pos), @opts);
return $out;
}
@@ -5796,15 +5796,7 @@ sub git_search_files {
print "<div class=\"binary\">Binary file</div>\n";
} else {
$ltext = untabify($ltext);
- if ($ltext =~ m/^(.*)($search_regexp)(.*)$/i) {
- $ltext = esc_html($1, -nbsp=>1);
- $ltext .= '<span class="match">';
- $ltext .= esc_html($2, -nbsp=>1);
- $ltext .= '</span>';
- $ltext .= esc_html($3, -nbsp=>1);
- } else {
- $ltext = esc_html($ltext, -nbsp=>1);
- }
+ esc_html_match_hl($ltext, $search_regexp, -nbsp => 1);
print "<div class=\"pre\">" .
$cgi->a({-href => href(action=>"blob", hash=>$co{'hash'},
file_name=>"$file").'#l'.$lno,
--
1.7.5
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html