Skip to content

Commit 0b16001

Browse files
committed
Add comment and rename var
1 parent a3689b3 commit 0b16001

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

routers/web/repo/issue.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2577,6 +2577,8 @@ func combineLabelComments(issue *models.Issue) {
25772577
if cur.Label != nil { // now cur MUST be label comment
25782578
if prev.Type == models.CommentTypeLabel { // we can combine them only prev is a label comment
25792579
if cur.Content != "1" {
2580+
// remove labels from the AddedLabels list if the label that was removed is already
2581+
// in this list, and if it's not in this list, add the label to RemovedLabels
25802582
addedAndRemoved := false
25812583
for i, label := range prev.AddedLabels {
25822584
if cur.Label.ID == label.ID {
@@ -2589,15 +2591,17 @@ func combineLabelComments(issue *models.Issue) {
25892591
prev.RemovedLabels = append(prev.RemovedLabels, cur.Label)
25902592
}
25912593
} else {
2592-
addedAndRemoved := false
2594+
// remove labels from the RemovedLabels list if the label that was added is already
2595+
// in this list, and if it's not in this list, add the label to AddedLabels
2596+
removedAndAdded := false
25932597
for i, label := range prev.RemovedLabels {
25942598
if cur.Label.ID == label.ID {
25952599
prev.RemovedLabels = append(prev.RemovedLabels[:i], prev.RemovedLabels[i+1:]...)
2596-
addedAndRemoved = true
2600+
removedAndAdded = true
25972601
break
25982602
}
25992603
}
2600-
if !addedAndRemoved {
2604+
if !removedAndAdded {
26012605
prev.AddedLabels = append(prev.AddedLabels, cur.Label)
26022606
}
26032607
}

0 commit comments

Comments
 (0)