Merge branch 'ag/userdiff-go-funcname'
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Mar 2018 20:36:30 +0000 (12:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Mar 2018 20:36:30 +0000 (12:36 -0800)
"git diff" and friends learned funcname patterns for Go language
source files.

* ag/userdiff-go-funcname:
  userdiff: add built-in pattern for golang

Documentation/gitattributes.txt
t/t4018-diff-funcname.sh
t/t4018/golang-complex-function [new file with mode: 0644]
t/t4018/golang-func [new file with mode: 0644]
t/t4018/golang-interface [new file with mode: 0644]
t/t4018/golang-long-func [new file with mode: 0644]
t/t4018/golang-struct [new file with mode: 0644]
userdiff.c

index c21f5ca..d52b254 100644 (file)
@@ -714,6 +714,8 @@ patterns are available:
 
 - `fountain` suitable for Fountain documents.
 
+- `golang` suitable for source code in the Go language.
+
 - `html` suitable for HTML/XHTML documents.
 
 - `java` suitable for source code in the Java language.
index 1795ffc..22f9f88 100755 (executable)
@@ -33,6 +33,7 @@ diffpatterns="
        css
        fortran
        fountain
+       golang
        html
        java
        matlab
diff --git a/t/t4018/golang-complex-function b/t/t4018/golang-complex-function
new file mode 100644 (file)
index 0000000..e057dce
--- /dev/null
@@ -0,0 +1,8 @@
+type Test struct {
+       a Type
+}
+
+func (t *Test) RIGHT(a Type) (Type, error) {
+       t.a = a
+       return ChangeMe, nil
+}
diff --git a/t/t4018/golang-func b/t/t4018/golang-func
new file mode 100644 (file)
index 0000000..8e9c9ac
--- /dev/null
@@ -0,0 +1,4 @@
+func RIGHT() {
+       a := 5
+       b := ChangeMe
+}
diff --git a/t/t4018/golang-interface b/t/t4018/golang-interface
new file mode 100644 (file)
index 0000000..553bede
--- /dev/null
@@ -0,0 +1,4 @@
+type RIGHT interface {
+       a() Type
+       b() ChangeMe
+}
diff --git a/t/t4018/golang-long-func b/t/t4018/golang-long-func
new file mode 100644 (file)
index 0000000..ac3a77b
--- /dev/null
@@ -0,0 +1,5 @@
+func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
+       anotherLongVariableName AnotherLongType) {
+       a := 5
+       b := ChangeMe
+}
diff --git a/t/t4018/golang-struct b/t/t4018/golang-struct
new file mode 100644 (file)
index 0000000..5deda77
--- /dev/null
@@ -0,0 +1,4 @@
+type RIGHT struct {
+       a Type
+       b ChangeMe
+}
index dbfb4e1..8f5028f 100644 (file)
@@ -38,6 +38,15 @@ IPATTERN("fortran",
         "|//|\\*\\*|::|[/<>=]="),
 IPATTERN("fountain", "^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$",
         "[^ \t-]+"),
+PATTERNS("golang",
+        /* Functions */
+        "^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n"
+        /* Structs and interfaces */
+        "^[ \t]*(type[ \t].*(struct|interface)[ \t]*(\\{[ \t]*)?)",
+        /* -- */
+        "[a-zA-Z_][a-zA-Z0-9_]*"
+        "|[-+0-9.eE]+i?|0[xX]?[0-9a-fA-F]+i?"
+        "|[-+*/<>%&^|=!:]=|--|\\+\\+|<<=?|>>=?|&\\^=?|&&|\\|\\||<-|\\.{3}"),
 PATTERNS("html", "^[ \t]*(<[Hh][1-6]([ \t].*)?>.*)$",
         "[^<>= \t]+"),
 PATTERNS("java",