File tree Expand file tree Collapse file tree 3 files changed +16
-20
lines changed Expand file tree Collapse file tree 3 files changed +16
-20
lines changed Original file line number Diff line number Diff line change @@ -316,15 +316,11 @@ local function update_dependents(node, opts)
316
316
-- don't update if a jump/change_choice is in progress, or if we don't have
317
317
-- an active node.
318
318
if active ~= nil then
319
- local upd_res = node_update_dependents_preserve_position (
320
- node ,
321
- active ,
322
- {
323
- no_move = false ,
324
- restore_position = true ,
325
- cursor_restore_data = opts and opts .cursor_restore_data ,
326
- }
327
- )
319
+ local upd_res = node_update_dependents_preserve_position (node , active , {
320
+ no_move = false ,
321
+ restore_position = true ,
322
+ cursor_restore_data = opts and opts .cursor_restore_data ,
323
+ })
328
324
if upd_res .new_current then
329
325
upd_res .new_current :focus ()
330
326
session .current_nodes [vim .api .nvim_get_current_buf ()] =
Original file line number Diff line number Diff line change @@ -221,7 +221,7 @@ function M.multiline_to_byte_offset(str, pos)
221
221
222
222
-- allow positions one beyond the last character for all lines (even the
223
223
-- last line).
224
- if pos [2 ] >= # str [pos [1 ]+ 1 ] + 1 then
224
+ if pos [2 ] >= # str [pos [1 ] + 1 ] + 1 then
225
225
-- in this case, pos is outside of the multiline-region.
226
226
return nil
227
227
end
Original file line number Diff line number Diff line change @@ -621,7 +621,7 @@ describe("ChoiceNode", function()
621
621
}))
622
622
]] )
623
623
624
- screen :expect ([[
624
+ screen :expect ([[
625
625
:.ccee ee :^c{3:c}eeee: ee ee.: |
626
626
{0:~ }|
627
627
{2:-- SELECT --} |
@@ -630,7 +630,7 @@ screen:expect([[
630
630
feed (" <esc><right><right>i aa <left><left>" )
631
631
exec_lua (" ls.set_choice(2)" )
632
632
633
- screen :expect ([[
633
+ screen :expect ([[
634
634
:.ccee ee :.ccee ee^ee ee.: ee ee.: |
635
635
{0:~ }|
636
636
{2:-- INSERT --} |
@@ -641,20 +641,20 @@ screen:expect([[
641
641
exec_lua (" ls.jump(-1)" )
642
642
exec_lua (" ls.jump(-1)" )
643
643
exec_lua (" ls.jump(1)" )
644
- screen :expect ([[
644
+ screen :expect ([[
645
645
:.cc^e{3:e ee :.ccee eeee ee.: ee ee}.: |
646
646
{0:~ }|
647
647
{2:-- SELECT --} |
648
648
]] )
649
649
exec_lua (" ls.change_choice(1)" )
650
- screen :expect ([[
650
+ screen :expect ([[
651
651
:cc^e{3:e ee :.ccee eeee ee.: ee ee}: |
652
652
{0:~ }|
653
653
{2:-- SELECT --} |
654
654
]] )
655
655
exec_lua (" ls.jump(1)" )
656
656
exec_lua (" ls.jump(1)" )
657
- screen :expect ([[
657
+ screen :expect ([[
658
658
:ccee ee :.cc^e{3:e eeee ee}.: ee ee: |
659
659
{0:~ }|
660
660
{2:-- SELECT --} |
@@ -671,7 +671,7 @@ screen:expect([[
671
671
}, {restore_cursor = true})
672
672
}))
673
673
]=] )
674
- screen :expect ([[
674
+ screen :expect ([[
675
675
a ^ a |
676
676
{0:~ }|
677
677
{2:-- INSERT --} |
@@ -680,26 +680,26 @@ screen:expect([[
680
680
exec_lua ([=[
681
681
ls.snip_expand(s("bad", {i(1, "i…i")}))
682
682
]=] )
683
- screen :expect ([[
683
+ screen :expect ([[
684
684
a a ^i{3:…i} a a |
685
685
{0:~ }|
686
686
{2:-- SELECT --} |
687
687
]] )
688
688
689
689
exec_lua (" ls.change_choice(1)" )
690
- screen :expect ([[
690
+ screen :expect ([[
691
691
bb a ^i{3:…i} a bb |
692
692
{0:~ }|
693
693
{2:-- SELECT --} |
694
694
]] )
695
695
feed (" <Esc>la" )
696
- screen :expect ([[
696
+ screen :expect ([[
697
697
bb a i…^i a bb |
698
698
{0:~ }|
699
699
{2:-- INSERT --} |
700
700
]] )
701
701
exec_lua (" ls.change_choice(1)" )
702
- screen :expect ([[
702
+ screen :expect ([[
703
703
a a i…^i a a |
704
704
{0:~ }|
705
705
{2:-- INSERT --} |
You can’t perform that action at this time.
0 commit comments