Improve the "golang" built-in pattern to match "package" lines, as
they weren't matched before changing e.g. the imports would commonly
result in an empty hunk header, now we'll instead show the package
name.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
t/t4018/golang.sh | 10 ++++++++++
userdiff.c | 2 ++
2 files changed, 12 insertions(+)
diff --git a/t/t4018/golang.sh b/t/t4018/golang.sh
index bf22f58c12..cdf9d6f8aa 100755
--- a/t/t4018/golang.sh
+++ b/t/t4018/golang.sh
@@ -3,6 +3,16 @@
# See ../t4018-diff-funcname.sh's test_diff_funcname()
#
+test_diff_funcname 'golang: package' \
+ 8<<\EOF_HUNK 9<<\EOF_TEST
+package main
+EOF_HUNK
+package main
+
+import "fmt"
+// ChangeMe
+EOF_TEST
+
test_diff_funcname 'golang: complex function' \
8<<\EOF_HUNK 9<<\EOF_TEST
func (t *Test) RIGHT(a Type) (Type, error) {
diff --git a/userdiff.c b/userdiff.c
index 55f4f769bd..f975aac8fe 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -128,6 +128,8 @@ IPATTERN("fountain",
/* -- */
"[^ \t-]+"),
PATTERNS("golang",
+ /* Packages */
+ "^[ \t]*(package[ \t]*(.*))\n"
/* Functions */
"^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n"
/* Structs and interfaces */
--
2.30.0.284.gd98b1dd5eaa7
