Skip to content

Commit 16b7d2a

Browse files
committed
simplify fs logic
1 parent 3cf58c8 commit 16b7d2a

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

generate/generate.go

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,16 @@ var VimBuffer bytes.Buffer
4242
//go:embed vim_template/vimrc
4343
var vimrc string
4444

45-
//go:embed vim_template/langs
46-
var langs embed.FS
45+
//go:embed vim_template
46+
var vimTemplate embed.FS
4747

48-
//go:embed vim_template/frameworks
49-
var frameworks embed.FS
50-
51-
//go:embed vim_template/themes
52-
var themes embed.FS
53-
54-
func buff(list []string, t string, fs embed.FS) (mList, mBundle map[string]string) {
48+
func buff(list []string, t string) (mList, mBundle map[string]string) {
5549
mList = make(map[string]string)
5650
mBundle = make(map[string]string)
5751
for _, name := range list {
5852
for _, ext := range []string{"bundle", "vim"} {
5953
filePath := fmt.Sprintf("vim_template/%s/%s/%s.%s", t, name, name, ext)
60-
read, _ := fs.ReadFile(filePath)
54+
read, _ := vimTemplate.ReadFile(filePath)
6155
if ext == "vim" {
6256
mList[name] = string(read)
6357
} else {
@@ -89,14 +83,14 @@ func Generate(obj *Object) (buffer string) {
8983

9084
obj.Config = &config
9185

92-
mLang, mBundle := buff(obj.Language, "langs", langs)
86+
mLang, mBundle := buff(obj.Language, "langs")
9387
obj.BufferLang = mLang
9488

95-
mFrameworks, bundles := buff(obj.Frameworks, "frameworks", frameworks)
89+
mFrameworks, bundles := buff(obj.Frameworks, "frameworks")
9690
obj.BufferFramework = mFrameworks
9791

9892
choosenThemes := []string{obj.Theme}
99-
mThemes, tBundles := buff(choosenThemes, "themes", themes)
93+
mThemes, tBundles := buff(choosenThemes, "themes")
10094
obj.BufferTheme.Bundle = tBundles[obj.Theme]
10195
obj.BufferTheme.Coloscheme = mThemes[obj.Theme]
10296

0 commit comments

Comments
 (0)