romdo/go-conver
1
0
Fork 0
mirror of https://github.com/romdo/go-conver.git synced 2026-02-19 08:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip: less horrible footer parsing

Browse Source
This commit is contained in:
Jim Myhrberg
2020-11-01 14:03:56 +00:00
parent 12ad99911a
commit 068477c1e5
1 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/commit/parser.go
View File

@@ -16,11 +16,8 @@ var (
rHeader = regexp.MustCompile(
`^([\w\-]*)(?:\(([\w\$\.\/\-\* ]*)\))?(!)?\: (.*)$`,
)
rFooterToken = regexp.MustCompile(
`^([\w-]+|BREAKING CHANGE):\s\s*(.*)$`,
)
rFooterTicket = regexp.MustCompile(
`^([\w-]+)\s+(#\S.*)$`,
rFooter = regexp.MustCompile(
`^([\w-]+)\s+(#.*)|([\w-]+|BREAKING CHANGE):\s\s*(.*)$`,
)
)
@@ -46,7 +43,7 @@ func footers(paragraph []byte) []*Footer {
footers := []*Footer{}
lines := bytes.Split(paragraph, []byte{lf})
if !rFooterToken.Match(lines[0]) && !rFooterTicket.Match(lines[0]) {
if !rFooter.Match(lines[0]) {
return footers
}
@@ -54,34 +51,25 @@ func footers(paragraph []byte) []*Footer {
var cBody []byte
var cRef bool
for _, line := range lines {
if m := rFooterToken.FindSubmatch(line); m != nil {
if m := rFooter.FindSubmatch(line); m != nil {
if cName != "" {
footers = append(footers, &Footer{
Name: cName,
Body: string(bytes.TrimSpace(cBody)),
Reference: cRef,
})
cName = ""
}
if len(m[1]) > 0 {
cName = string(m[1])
cBody = m[2]
cRef = true
} else if len(m[3]) > 0 {
cName = string(m[3])
cBody = m[4]
cRef = false
}
cName = string(m[1])
cBody = m[2]
cRef = false
} else if m := rFooterTicket.FindSubmatch(line); m != nil {
if cName != "" {
footers = append(footers, &Footer{
Name: cName,
Body: string(bytes.TrimSpace(cBody)),
Reference: cRef,
})
cName = ""
cRef = false
}
cName = string(m[1])
cBody = m[2]
cRef = true
} else {
cBody = append(cBody, []byte{lf}...)
} else if cName != "" {
cBody = append(cBody, lf)
cBody = append(cBody, line...)
}
}