@@ -661,18 +661,28 @@ func testBuffer(v *Nvim) func(*testing.T) {
661
661
if err := v .SetBufferLines (Buffer (0 ), - 1 , - 1 , true , lines ); err != nil {
662
662
t .Fatal (err )
663
663
}
664
+ t .Cleanup (func () {
665
+ clearBuffer (t , v , Buffer (0 ))
666
+ })
667
+
664
668
if err := v .SetWindowCursor (Window (0 ), [2 ]int {3 , 4 }); err != nil {
665
669
t .Fatal (err )
666
670
}
667
- if err := v .Command ("mark v" ); err != nil {
668
- t .Fatal (err )
669
- }
670
671
671
672
const (
673
+ mark = "V"
672
674
wantLine = 3
673
675
wantCol = 0
674
676
)
675
- pos , err := v .BufferMark (Buffer (0 ), "v" )
677
+ set , err := v .SetBufferMark (Buffer (0 ), mark , wantLine , wantCol , make (map [string ]interface {}))
678
+ if err != nil {
679
+ t .Fatal (err )
680
+ }
681
+ if ! set {
682
+ t .Fatalf ("could not set %s mark" , mark )
683
+ }
684
+
685
+ pos , err := v .BufferMark (Buffer (0 ), mark )
676
686
if err != nil {
677
687
t .Fatal (err )
678
688
}
@@ -683,9 +693,21 @@ func testBuffer(v *Nvim) func(*testing.T) {
683
693
t .Fatalf ("got %d extMark col but want %d" , pos [1 ], wantCol )
684
694
}
685
695
686
- t .Cleanup (func () {
687
- clearBuffer (t , v , Buffer (0 ))
688
- })
696
+ deleted , err := v .DeleteBufferMark (Buffer (0 ), mark )
697
+ if err != nil {
698
+ t .Fatal (err )
699
+ }
700
+ if ! deleted {
701
+ t .Fatalf ("could not delete %s mark" , mark )
702
+ }
703
+
704
+ pos2 , err := v .BufferMark (Buffer (0 ), mark )
705
+ if err != nil {
706
+ t .Fatal (err )
707
+ }
708
+ if pos2 [0 ] != 0 || pos2 [1 ] != 0 {
709
+ t .Fatalf ("got %d mark but want zero" , pos2 )
710
+ }
689
711
})
690
712
})
691
713
@@ -961,18 +983,28 @@ func testBuffer(v *Nvim) func(*testing.T) {
961
983
if err := b .Execute (); err != nil {
962
984
t .Fatal (err )
963
985
}
986
+ t .Cleanup (func () {
987
+ clearBuffer (t , v , Buffer (0 ))
988
+ })
989
+
964
990
b .SetWindowCursor (Window (0 ), [2 ]int {3 , 4 })
965
- b .Command ("mark v" )
966
- if err := b .Execute (); err != nil {
967
- t .Fatal (err )
968
- }
969
991
970
992
const (
993
+ mark = "V"
971
994
wantLine = 3
972
995
wantCol = 0
973
996
)
997
+ var set bool
998
+ b .SetBufferMark (Buffer (0 ), mark , wantLine , wantCol , make (map [string ]interface {}), & set )
999
+ if err := b .Execute (); err != nil {
1000
+ t .Fatal (err )
1001
+ }
1002
+ if ! set {
1003
+ t .Fatalf ("could not set %s mark" , mark )
1004
+ }
1005
+
974
1006
var pos [2 ]int
975
- b .BufferMark (Buffer (0 ), "v" , & pos )
1007
+ b .BufferMark (Buffer (0 ), mark , & pos )
976
1008
if err := b .Execute (); err != nil {
977
1009
t .Fatal (err )
978
1010
}
@@ -983,9 +1015,23 @@ func testBuffer(v *Nvim) func(*testing.T) {
983
1015
t .Fatalf ("got %d extMark col but want %d" , pos [1 ], wantCol )
984
1016
}
985
1017
986
- t .Cleanup (func () {
987
- clearBuffer (t , v , Buffer (0 ))
988
- })
1018
+ var deleted bool
1019
+ b .DeleteBufferMark (Buffer (0 ), mark , & deleted )
1020
+ if err := b .Execute (); err != nil {
1021
+ t .Fatal (err )
1022
+ }
1023
+ if ! deleted {
1024
+ t .Fatalf ("could not delete %s mark" , mark )
1025
+ }
1026
+
1027
+ var pos2 [2 ]int
1028
+ b .BufferMark (Buffer (0 ), mark , & pos2 )
1029
+ if err := b .Execute (); err != nil {
1030
+ t .Fatal (err )
1031
+ }
1032
+ if pos2 [0 ] != 0 || pos2 [1 ] != 0 {
1033
+ t .Fatalf ("got %d mark but want zero" , pos2 )
1034
+ }
989
1035
})
990
1036
})
991
1037
}
0 commit comments