Skip to content

Commit 0f63e59

Browse files
committed
replace go-bindate with new go-embed directive
* remove go-bindata as dependency * move vim_template directory to generate directory (because of FS) * modify generate to use new embed directive
1 parent 1f03d0d commit 0f63e59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+21
-2165
lines changed

generate/bindata.go

Lines changed: 0 additions & 2149 deletions
This file was deleted.

generate/generate.go

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package generate
22

33
import (
44
"bytes"
5+
"embed"
56
"fmt"
6-
"log"
77
"path/filepath"
88
"text/template"
99
)
@@ -39,13 +39,25 @@ type Object struct {
3939
// VimBuffer ...
4040
var VimBuffer bytes.Buffer
4141

42-
func buff(list []string, t string) (mList, mBundle map[string]string) {
42+
//go:embed vim_template/vimrc
43+
var vimrc string
44+
45+
//go:embed vim_template/langs
46+
var langs embed.FS
47+
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) {
4355
mList = make(map[string]string)
4456
mBundle = make(map[string]string)
4557
for _, name := range list {
4658
for _, ext := range []string{"bundle", "vim"} {
4759
filePath := fmt.Sprintf("vim_template/%s/%s/%s.%s", t, name, name, ext)
48-
read, _ := Asset(filePath)
60+
read, _ := fs.ReadFile(filePath)
4961
if ext == "vim" {
5062
mList[name] = string(read)
5163
} else {
@@ -77,14 +89,14 @@ func Generate(obj *Object) (buffer string) {
7789

7890
obj.Config = &config
7991

80-
mLang, mBundle := buff(obj.Language, "langs")
92+
mLang, mBundle := buff(obj.Language, "langs", langs)
8193
obj.BufferLang = mLang
8294

83-
mFrameworks, bundles := buff(obj.Frameworks, "frameworks")
95+
mFrameworks, bundles := buff(obj.Frameworks, "frameworks", frameworks)
8496
obj.BufferFramework = mFrameworks
8597

86-
themes := []string{obj.Theme}
87-
mThemes, tBundles := buff(themes, "themes")
98+
choosenThemes := []string{obj.Theme}
99+
mThemes, tBundles := buff(choosenThemes, "themes", themes)
88100
obj.BufferTheme.Bundle = tBundles[obj.Theme]
89101
obj.BufferTheme.Coloscheme = mThemes[obj.Theme]
90102

@@ -93,11 +105,7 @@ func Generate(obj *Object) (buffer string) {
93105
}
94106
obj.BufferBundle = mBundle
95107

96-
vimrc, err := Asset("vim_template/vimrc")
97-
if err != nil {
98-
log.Fatal(err)
99-
}
100-
t := template.Must(template.New("vimrc").Parse(string(vimrc)))
108+
t := template.Must(template.New("vimrc").Parse(vimrc))
101109
t.Execute(&VimBuffer, obj)
102110

103111
buffer = VimBuffer.String()
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)