diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2010-05-23 20:05:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-27 07:12:07 -0700 |
| commit | 6d2f208c3dd39493f4d45ea67c55a1b7fe06626a (patch) | |
| tree | ac713eae000afe4ba92fd2c641c389f307b202b7 /userdiff.c | |
| parent | e498257d650529812ffe1872b3cd62e2bd604287 (diff) | |
| download | git-6d2f208c3dd39493f4d45ea67c55a1b7fe06626a.tar.gz | |
diff: Support visibility modifiers in the PHP hunk header regexp
Starting with PHP5, class methods can have a visibility modifier, which
caused the methods not to be matched by the existing regexp, so extend
the regexp to match those modifiers. And while we're at it, allow the
"static" modifier as well.
Since the "static" modifier can appear either before or after the
visibility modifier, let's just allow any number of modifiers to appear
in any order, as that simplifies the regexp and shouldn't cause any
false positives.
Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index df992490d5..38563daa3c 100644 --- a/userdiff.c +++ b/userdiff.c @@ -44,7 +44,9 @@ PATTERNS("pascal", "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" "|<>|<=|>=|:=|\\.\\." "|[^[:space:]]|[\x80-\xff]+"), -PATTERNS("php", "^[\t ]*((function|class).*)", +PATTERNS("php", + "^[\t ]*(((public|protected|private|static)[\t ]+)*function.*)$\n" + "^[\t ]*(class.*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" |