Skip to content

Commit 960c53f

Browse files
committed
update
1 parent 25d068b commit 960c53f

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

internal/luapi/plugin/plugin.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ type Plugin struct {
3232
result Result
3333
}
3434

35-
func NewPlugin(fileName string) (*Plugin, error) {
35+
func NewPlugin(fileName string, fileContent ...string) (*Plugin, error) {
36+
var content string
37+
if len(fileContent) > 0 {
38+
content = fileContent[0]
39+
}
3640
p := &Plugin{
37-
FileName: fileName,
41+
FileName: fileName,
42+
FileContent: content,
3843
result: Result{
3944
VersionList: make(map[string]lua_global.Item),
4045
},

internal/luapi/plugin/plugin_test.go

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,11 @@ function crawl()
146146
end`
147147

148148
func TestPlugin(t *testing.T) {
149-
p, err := NewPlugin("")
149+
p, err := NewPlugin("", pluginForGo)
150150
if err != nil {
151151
t.Error(err)
152152
return
153153
}
154-
p.FileContent = pluginForGo
155154
defer p.Close()
156155
if err := p.Load(); err != nil {
157156
t.Error(err)
@@ -242,12 +241,11 @@ func TestPluginLua(t *testing.T) {
242241
t.Skip("conda is not installed")
243242
}
244243

245-
p, err := NewPlugin("")
244+
p, err := NewPlugin("", pluginForLua)
246245
if err != nil {
247246
t.Error(err)
248247
return
249248
}
250-
p.FileContent = pluginForLua
251249
defer p.Close()
252250
if err := p.Load(); err != nil {
253251
t.Error(err)
@@ -375,12 +373,11 @@ function crawl()
375373
end`
376374

377375
func TestPluginCoursier(t *testing.T) {
378-
p, err := NewPlugin("")
376+
p, err := NewPlugin("", pluginForCoursier)
379377
if err != nil {
380378
t.Error(err)
381379
return
382380
}
383-
p.FileContent = pluginForCoursier
384381
defer p.Close()
385382
if err := p.Load(); err != nil {
386383
t.Error(err)
@@ -511,12 +508,11 @@ end
511508
`
512509

513510
func TestPluginFlutter(t *testing.T) {
514-
p, err := NewPlugin("")
511+
p, err := NewPlugin("", pluginForFlutter)
515512
if err != nil {
516513
t.Error(err)
517514
return
518515
}
519-
p.FileContent = pluginForFlutter
520516
defer p.Close()
521517
if err := p.Load(); err != nil {
522518
t.Error(err)
@@ -693,12 +689,11 @@ end`
693689

694690
func TestPluginMiniconda(t *testing.T) {
695691
// return
696-
p, err := NewPlugin("")
692+
p, err := NewPlugin("", pluginForMiniconda)
697693
if err != nil {
698694
t.Error(err)
699695
return
700696
}
701-
p.FileContent = pluginForMiniconda
702697
defer p.Close()
703698
if err := p.Load(); err != nil {
704699
t.Error(err)
@@ -828,12 +823,11 @@ end`
828823

829824
func TestPluginRustup(t *testing.T) {
830825
// return
831-
p, err := NewPlugin("")
826+
p, err := NewPlugin("", pluginForRustup)
832827
if err != nil {
833828
t.Error(err)
834829
return
835830
}
836-
p.FileContent = pluginForRustup
837831
defer p.Close()
838832
if err := p.Load(); err != nil {
839833
t.Error(err)

0 commit comments

Comments
 (0)