Skip to content

Commit db5c3d9

Browse files
committed
vendor: update deps
1 parent a7b0e98 commit db5c3d9

3 files changed

Lines changed: 23 additions & 15 deletions

File tree

lua/_vendor/mini/completion.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ H.keys = {
690690
}
691691

692692
-- Flags for whether there is support for dedicated options
693-
H.has_winborder = vim.fn.has('nvim-0.11') == 1
693+
H.has_no_winborder = vim.fn.has('nvim-0.11') == 0
694694
H.has_pumborder = vim.fn.exists('+pumborder') == 1 -- Neovim>=0.12
695695

696696
-- Caches for different actions -----------------------------------------------
@@ -1516,8 +1516,8 @@ H.info_window_lines = function(info_id)
15161516
-- Do nothing if completion item was changed
15171517
if H.info.id ~= info_id then return end
15181518

1519-
-- Still use original item if there was error during resolve
1520-
if err ~= nil then result = result or lsp_data.item end
1519+
-- Still use original item if there was no response (usually due to error)
1520+
result = result or lsp_data.item
15211521

15221522
H.info.lsp.result = result
15231523
-- - Cache resolved item to not have to send same request on revisit.
@@ -1533,7 +1533,7 @@ end
15331533

15341534
H.info_window_options = function()
15351535
local win_config = H.get_config().window.info
1536-
local default_border = (H.has_winborder and vim.o.winborder ~= '') and vim.o.winborder or 'single'
1536+
local default_border = (H.has_no_winborder or vim.o.winborder == '') and 'single' or nil
15371537
local border = win_config.border or default_border
15381538
local pumborder = H.has_pumborder and vim.o.pumborder or ''
15391539

@@ -1709,7 +1709,7 @@ end
17091709

17101710
H.signature_window_opts = function()
17111711
local win_config = H.get_config().window.signature
1712-
local default_border = (H.has_winborder and vim.o.winborder ~= '') and vim.o.winborder or 'single'
1712+
local default_border = (H.has_no_winborder or vim.o.winborder == '') and 'single' or nil
17131713
local border = win_config.border or default_border
17141714
local lines = vim.api.nvim_buf_get_lines(H.signature.bufnr, 0, -1, false)
17151715
local height, width = H.floating_dimensions(lines, win_config.height, win_config.width)

lua/_vendor/mini/surround.lua

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,15 @@ H.map = function(mode, lhs, rhs, opts)
22652265
if lhs == '' then return end
22662266
opts = vim.tbl_deep_extend('force', { silent = true }, opts or {})
22672267
vim.keymap.set(mode, lhs, rhs, opts)
2268-
if vim.fn.maparg('s', mode) == '' and lhs:find('^s.') ~= nil then vim.keymap.set(mode, 's', '<Nop>') end
2268+
local no_global_s_mapping = not H.has_global_mapping(mode, 's')
2269+
if no_global_s_mapping and lhs:find('^s.') ~= nil then vim.keymap.set(mode, 's', '<Nop>') end
2270+
end
2271+
2272+
H.has_global_mapping = function(mode, lhs)
2273+
for _, map in ipairs(vim.api.nvim_get_keymap(mode)) do
2274+
if map.lhs == lhs then return true end
2275+
end
2276+
return false
22692277
end
22702278

22712279
H.get_line_cols = function(line_num) return vim.fn.getline(line_num):len() end

peru.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@ imports:
1111

1212
git module deps:
1313
url: https://github.com/echasnovski/mini.deps
14-
rev: 4c11a93f841e9bfb001321796dae339c8cb57e44
14+
rev: 8f6f74a8b68dbad02f1813dff4ddae5afeee92df
1515

1616
git module basics:
1717
url: https://github.com/echasnovski/mini.basics
18-
rev: 131a4f91387dd490eb9d40b262129ca9fec5ff97
18+
rev: 862b940b1ea67993893c6fd39ca1000beed1af46
1919

2020
git module completion:
2121
url: https://github.com/echasnovski/mini.completion
22-
rev: 3eb90e9c6c8d01f6b7a39fe03e1f3ff95edc0502
22+
rev: 7c5edfc0e479dd4edd898cc9ddd1920d8c1ce420
2323

2424
git module ai:
2525
url: https://github.com/echasnovski/mini.ai
26-
rev: 11c57180bc9084089206e211ac7aa598bedc9673
26+
rev: 0d3c9cf22e37b86b7a0dfbe7ef129ee7a5f4f93c
2727

2828
git module comment:
2929
url: https://github.com/echasnovski/mini.comment
30-
rev: c40bc46e72f41d3db265f6d86deb3dc259c0985d
30+
rev: a0c721115faff8d05505c0a12dab410084d9e536
3131

3232
git module bufremove:
3333
url: https://github.com/echasnovski/mini.bufremove
34-
rev: 1b5d7e7bc81cd02476bdd964c3d850c48eb91a07
34+
rev: 10857aa39160c127694151828914df3131ba83b6
3535

3636
git module jump:
3737
url: https://github.com/echasnovski/mini.jump
38-
rev: 7574c48a707aedcf1ad428a9cdefb8fdf871a638
38+
rev: 99799e8ca33fe936b81a70b5ab9a081f8794c8a1
3939

4040
git module pairs:
4141
url: https://github.com/echasnovski/mini.pairs
42-
rev: b9aada8c0e59f2b938e98fbf4eae0799eba96ad9
42+
rev: b316e68f2d242d5bd010deaab645daa27ed86297
4343

4444
git module surround:
4545
url: https://github.com/echasnovski/mini.surround
46-
rev: 444e155147e2b5159dd28a65f9736254c16cb817
46+
rev: 88c52297ed3e69ecf9f8652837888ecc727a28ee
4747

4848
rule mini:
4949
export: lua/mini/

0 commit comments

Comments
 (0)