@@ -18,35 +18,32 @@ import (
18
18
)
19
19
20
20
type version struct {
21
- Major int
22
- Minor int
23
- Patch int
21
+ Major int64
22
+ Minor int64
23
+ Patch int64
24
24
}
25
25
26
- var (
27
- channelID int64
28
- nvimVersion version
29
- )
26
+ var nvimVersion version
30
27
31
- func parseVersion (tb testing.TB , version string ) (major , minor , patch int ) {
28
+ func parseVersion (tb testing.TB , version string ) (major , minor , patch int64 ) {
32
29
tb .Helper ()
33
30
34
31
version = strings .TrimPrefix (version , "v" )
35
32
vpair := strings .Split (version , "." )
36
33
if len (vpair ) != 3 {
37
- tb .Fatal ("could not parse neovim version" )
34
+ tb .Fatalf ("could not parse neovim version: %s" , version )
38
35
}
39
36
40
37
var err error
41
- major , err = strconv .Atoi (vpair [0 ])
38
+ major , err = strconv .ParseInt (vpair [0 ], 10 , 0 )
42
39
if err != nil {
43
40
tb .Fatal (err )
44
41
}
45
- minor , err = strconv .Atoi (vpair [1 ])
42
+ minor , err = strconv .ParseInt (vpair [1 ], 10 , 0 )
46
43
if err != nil {
47
44
tb .Fatal (err )
48
45
}
49
- patch , err = strconv .Atoi (vpair [2 ])
46
+ patch , err = strconv .ParseInt (vpair [2 ], 10 , 0 )
50
47
if err != nil {
51
48
tb .Fatal (err )
52
49
}
@@ -72,6 +69,8 @@ func clearBuffer(tb testing.TB, v *Nvim, buffer Buffer) {
72
69
}
73
70
}
74
71
72
+ var channelID int64
73
+
75
74
func TestAPI (t * testing.T ) {
76
75
t .Parallel ()
77
76
@@ -96,9 +95,9 @@ func TestAPI(t *testing.T) {
96
95
t .Fatalf ("apiInfo[1] is not map[string]interface{} type: %T" , apiInfo [1 ])
97
96
}
98
97
infoV := info ["version" ].(map [string ]interface {})
99
- nvimVersion .Major = int ( infoV ["major" ].(int64 ) )
100
- nvimVersion .Minor = int ( infoV ["minor" ].(int64 ) )
101
- nvimVersion .Patch = int ( infoV ["patch" ].(int64 ) )
98
+ nvimVersion .Major = infoV ["major" ].(int64 )
99
+ nvimVersion .Minor = infoV ["minor" ].(int64 )
100
+ nvimVersion .Patch = infoV ["patch" ].(int64 )
102
101
103
102
t .Run ("BufAttach" , testBufAttach (v ))
104
103
t .Run ("APIInfo" , testAPIInfo (v ))
0 commit comments