Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkg/prealloc.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,12 @@ func (v *returnsVisitor) Visit(node ast.Node) ast.Visitor {
return v
}

if sliceDecl.hasReturn || sliceDecl.level != v.level || sliceDecl.detached {
switch {
case sliceDecl.hasReturn || sliceDecl.level != v.level || sliceDecl.detached:
sliceDecl.exclude = true
} else {
case s.Ellipsis.IsValid() && hasAny(s, v.loopVars):
sliceDecl.exclude = true
default:
if sliceDecl.assigning {
sliceDecl.assigning = false
} else {
Expand Down
15 changes: 10 additions & 5 deletions testdata/append.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ func appendEllipsisTypeConvert() {
}
}

func appendEllipsisUsesLoopVar() {
var x []byte
var y []string
for i := range 5 {
x = append(x, y[i]...)
}
}

func appendMultipleCallsRange() {
var x []int // want "Consider preallocating x with capacity 10$"
for i := range 5 {
Expand Down Expand Up @@ -126,11 +134,8 @@ func appendMultipleRangeStringVar() {
}

func appendAppend() {
s := "Hello"
var x []int // want "Consider preallocating x with capacity 2 \\* len\\(s\\)$"
for i := range s {
x = append(x, append([]int{i}, i)...)
}
var x []int // want "Consider preallocating x with capacity 4$"
x = append(x, append([]int{1, 2}, 3, 4)...)
}

func appendDetached() {
Expand Down
Loading