Skip to content

Commit b3e8d9c

Browse files
authored
Merge pull request #378 from ezradiniz/fix/data-race
fix: data race in VimBuffer
2 parents 75c0ef7 + a1b7649 commit b3e8d9c

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

generate/generate.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ type Object struct {
3636
Version string
3737
}
3838

39-
// VimBuffer ...
40-
var VimBuffer bytes.Buffer
41-
4239
//go:embed vim_template/vimrc
4340
var vimrc string
4441

@@ -91,9 +88,6 @@ func ListThemes() (list []string) {
9188

9289
// Generate file from configurations
9390
func Generate(obj *Object) (buffer string) {
94-
// Clean VimBuffer, not append old result
95-
VimBuffer.Reset()
96-
9791
config := Config{}
9892
switch obj.Editor {
9993
case "nvim", "neovim":
@@ -126,9 +120,10 @@ func Generate(obj *Object) (buffer string) {
126120
}
127121
obj.BufferBundle = mBundle
128122

123+
var vimBuffer bytes.Buffer
129124
t := template.Must(template.New("vimrc").Parse(vimrc))
130-
t.Execute(&VimBuffer, obj)
125+
t.Execute(&vimBuffer, obj)
131126

132-
buffer = VimBuffer.String()
127+
buffer = vimBuffer.String()
133128
return
134129
}

0 commit comments

Comments
 (0)