Commit 077cde91 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'ag/userdiff-go-funcname'

"git diff" and friends learned funcname patterns for Go language
source files.

* ag/userdiff-go-funcname:
  userdiff: add built-in pattern for golang
parents 9bb8eb0c 1dbf0c0a
......@@ -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.
......
......@@ -33,6 +33,7 @@ diffpatterns="
css
fortran
fountain
golang
html
java
matlab
......
type Test struct {
a Type
}
func (t *Test) RIGHT(a Type) (Type, error) {
t.a = a
return ChangeMe, nil
}
func RIGHT() {
a := 5
b := ChangeMe
}
type RIGHT interface {
a() Type
b() ChangeMe
}
func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
anotherLongVariableName AnotherLongType) {
a := 5
b := ChangeMe
}
type RIGHT struct {
a Type
b ChangeMe
}
......@@ -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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment