userdiff/perl: anchor "sub" and "package" patterns on the left

The userdiff funcname mechanism has no concept of nested scopes ---
instead, "git diff" and "git grep --show-function" simply label the
diff header with the most recent matching line.  Unfortunately that
means text following a subroutine in a POD section:

=head1 DESCRIPTION

You might use this facility like so:

sub example {
foo;
}

Now, having said that, let's say more about the facility.
Blah blah blah ... etc etc.

gets the subroutine name instead of the POD header in its diff/grep
funcname header, making it harder to get oriented when reading a
diff without enough context.

The fix is simple: anchor the funcname syntax to the left margin so
nested subroutines and packages like this won't get picked up.  (The
builtin C++ funcname pattern already does the same thing.)  This means
the userdiff driver will misparse the idiom

{
my $static;
sub foo {
... use $static ...
}
}

but I think that's worth it; we can revisit this later if the userdiff
mechanism learns to keep track of the beginning and end of nested
scopes.

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index ad74c605a4a63e61593646110d651ebbf05f7e4e..f071a8fdd11eb9da650488fee18995ad9905441f 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -29,6 +29,47 @@ public class Beer
 }
 EOF
 sed 's/beer\\/beer,\\/' <Beer.java >Beer-correct.java
 }
 EOF
 sed 's/beer\\/beer,\\/' <Beer.java >Beer-correct.java

+cat >Beer.perl <<\EOF
+package Beer;
+
+use strict;
+use warnings;
+use parent qw(Exporter);
+our @EXPORT_OK = qw(round);
+
+sub round {
+       my ($n) = @_;
+       print "$n bottles of beer on the wall ";
+       print "$n bottles of beer\n";
+       print "Take one down, pass it around, ";
+       $n = $n - 1;
+       print "$n bottles of beer on the wall.\n";
+}
+
+__END__
+
+=head1 NAME
+
+Beer - subroutine to output fragment of a drinking song
+
+=head1 SYNOPSIS
+
+       use Beer qw(round);
+
+       sub song {
+               for (my $i = 99; $i > 0; $i--) {
+                       round $i;
+               }
+       }
+
+       song;
+
+=cut
+EOF
+sed -e '
+       s/beer\\/beer,\\/
+       s/song;/song();/
+' <Beer.perl >Beer-correct.perl

 
 test_config () {
        git config "$1" "$2" &&
 
 test_config () {
        git config "$1" "$2" &&


@@ -36,8 +77,9 @@ test_config () {
 }
 
 test_expect_funcname () {
 }
 
 test_expect_funcname () {

-       test_expect_code 1 git diff --no-index \
-               Beer.java Beer-correct.java >diff &&
+       lang=${2-java}
+       test_expect_code 1 git diff --no-index -U1 \
+               "Beer.$lang" "Beer-correct.$lang" >diff &&

        grep "^@@.*@@ $1" diff
 }
 
        grep "^@@.*@@ $1" diff
 }
 


@@ -65,13 +107,24 @@ test_expect_success 'default behaviour' '
 '
 
 test_expect_success 'set up .gitattributes declaring drivers to test' '
 '
 
 test_expect_success 'set up .gitattributes declaring drivers to test' '

-       echo "*.java diff=java" >.gitattributes
+       cat >.gitattributes <<-\EOF
+       *.java diff=java
+       *.perl diff=perl
+       EOF

 '
 
 test_expect_success 'preset java pattern' '
        test_expect_funcname "public static void main("
 '
 
 '
 
 test_expect_success 'preset java pattern' '
        test_expect_funcname "public static void main("
 '
 

+test_expect_success 'preset perl pattern' '
+       test_expect_funcname "sub round {\$" perl
+'
+
+test_expect_success 'perl pattern is not distracted by sub within POD' '
+       test_expect_funcname "=head" perl
+'
+

 test_expect_success 'custom pattern' '
        test_config diff.java.funcname "!static
 !String
 test_expect_success 'custom pattern' '
        test_config diff.java.funcname "!static
 !String

diff --git a/userdiff.c b/userdiff.c
index 1ff47977d549992ada8c1236187d4516b648ee7d..2cca0af8e26df9ab89805cd0cf65b66e0640e032 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -60,8 +60,8 @@ PATTERNS("pascal",
         "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
         "|<>|<=|>=|:=|\\.\\."),
 PATTERNS("perl",
         "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
         "|<>|<=|>=|:=|\\.\\."),
 PATTERNS("perl",

-        "^[ \t]*package .*;\n"
-        "^[ \t]*sub .* \\{\n"
+        "^package .*;\n"
+        "^sub .* \\{\n"

         "^[A-Z]+ \\{\n"        /* BEGIN, END, ... */
         "^=head[0-9] ",        /* POD */
         /* -- */
         "^[A-Z]+ \\{\n"        /* BEGIN, END, ... */
         "^=head[0-9] ",        /* POD */
         /* -- */