aboutsummaryrefslogtreecommitdiffstats
path: root/models/git_diff.go
diff options
context:
space:
mode:
authorkolaente <konrad@kola-entertainments.de>2018-10-18 04:03:49 +0200
committertechknowlogick <hello@techknowlogick.com>2018-10-17 22:03:49 -0400
commite79e9248fd9d539ecc912fcc24e7a669ce98bdaf (patch)
tree69fde794506c97da66d705a092f80d6049325d54 /models/git_diff.go
parentc37d1a9e99e508048f664892c08191f3470de52f (diff)
downloadgitea-e79e9248fd9d539ecc912fcc24e7a669ce98bdaf.tar.gz
gitea-e79e9248fd9d539ecc912fcc24e7a669ce98bdaf.zip
Fix regex to support optional end line of old section in diff hunk (#5096)
+ Named groups in reges for easier group parsing
Diffstat (limited to 'models/git_diff.go')
-rw-r--r--models/git_diff.go25
1 files changed, 16 insertions, 9 deletions
diff --git a/models/git_diff.go b/models/git_diff.go
index 44e7291c1f..2a8019995d 100644
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -273,7 +273,7 @@ func (diff *Diff) NumFiles() int {
}
// Example: @@ -1,8 +1,9 @@ => [..., 1, 8, 1, 9]
-var hunkRegex = regexp.MustCompile(`^@@ -([0-9]+),([0-9]+) \+([0-9]+)(,([0-9]+))? @@`)
+var hunkRegex = regexp.MustCompile(`^@@ -(?P<beginOld>[0-9]+)(,(?P<endOld>[0-9]+))? \+(?P<beginNew>[0-9]+)(,(?P<endNew>[0-9]+))? @@`)
func isHeader(lof string) bool {
return strings.HasPrefix(lof, cmdDiffHead) || strings.HasPrefix(lof, "---") || strings.HasPrefix(lof, "+++")
@@ -311,21 +311,28 @@ func CutDiffAroundLine(originalDiff io.Reader, line int64, old bool, numbersOfLi
if len(hunk) > headerLines {
break
}
- groups := hunkRegex.FindStringSubmatch(lof)
+ // A map with named groups of our regex to recognize them later more easily
+ submatches := hunkRegex.FindStringSubmatch(lof)
+ groups := make(map[string]string)
+ for i, name := range hunkRegex.SubexpNames() {
+ if i != 0 && name != "" {
+ groups[name] = submatches[i]
+ }
+ }
if old {
- begin = com.StrTo(groups[1]).MustInt64()
- end = com.StrTo(groups[2]).MustInt64()
+ begin = com.StrTo(groups["beginOld"]).MustInt64()
+ end = com.StrTo(groups["endOld"]).MustInt64()
// init otherLine with begin of opposite side
- otherLine = com.StrTo(groups[3]).MustInt64()
+ otherLine = com.StrTo(groups["beginNew"]).MustInt64()
} else {
- begin = com.StrTo(groups[3]).MustInt64()
- if groups[5] != "" {
- end = com.StrTo(groups[5]).MustInt64()
+ begin = com.StrTo(groups["beginNew"]).MustInt64()
+ if groups["endNew"] != "" {
+ end = com.StrTo(groups["endNew"]).MustInt64()
} else {
end = 0
}
// init otherLine with begin of opposite side
- otherLine = com.StrTo(groups[1]).MustInt64()
+ otherLine = com.StrTo(groups["beginOld"]).MustInt64()
}
end += begin // end is for real only the number of lines in hunk
// lof is between begin and end