Skip to content

Commit 0780bf6

Browse files
committed
Rename plenary to buffer and nui to float
1 parent e609603 commit 0780bf6

4 files changed

Lines changed: 13 additions & 17 deletions

File tree

lua/spectre/config.lua

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ local config = {
1212
lnum_UI = 8, -- total line for ui you can edit it
1313
line_result = 10, -- line begin result
1414

15-
-- result_padding = '│ ',
16-
-- color_devicons = true,
17-
-- line_sep_start = '┌-----------------------------------------',
18-
-- result_padding = '¦ ',
19-
-- line_sep = '├──────────────────────────────────────',
20-
2115
line_sep_start = '┌──────────────────────────────────────────────────────',
2216
result_padding = '',
2317
line_sep = '└──────────────────────────────────────────────────────',
@@ -220,7 +214,7 @@ local config = {
220214
is_insert_mode = false,
221215
is_block_ui_break = false,
222216
open_template = {},
223-
ui = 'plenary', -- set to true to use the legacy UI
217+
ui = 'buffer',
224218
}
225219

226220
return config

lua/spectre/init.lua

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ end
4848

4949
-- Initialize UI based on user config
5050
M.init_ui = function()
51-
if state.user_config.ui == 'plenary' then
52-
ui = require('spectre.ui.plenary')
51+
if state.user_config.ui == 'buffer' then
52+
ui = require('spectre.ui.buffer')
53+
elseif state.user_config.ui == 'float' then
54+
ui = require('spectre.ui.float')
5355
else
54-
ui = require('spectre.ui.nui_components')
56+
ui = require('spectre.ui.buffer')
5557
end
5658
end
5759

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ M.mapping_buffer = function()
426426
-- Set up autocmds
427427
vim.cmd([[augroup spectre_panel
428428
au!
429-
au InsertEnter <buffer> lua require"spectre.ui.plenary".on_insert_enter()
430-
au InsertLeave <buffer> lua require"spectre.ui.plenary".on_search_change()
429+
au InsertEnter <buffer> lua require"spectre.ui.buffer".on_insert_enter()
430+
au InsertLeave <buffer> lua require"spectre.ui.buffer".on_search_change()
431431
au BufLeave <buffer> lua require("spectre").on_write()
432432
au BufUnload <buffer> lua require("spectre").close()
433433
augroup END ]])
@@ -441,28 +441,28 @@ M.mapping_buffer = function()
441441
M.bufnr,
442442
'n',
443443
'x',
444-
'x<cmd>lua require("spectre.ui.plenary").on_search_change()<CR>',
444+
'x<cmd>lua require("spectre.ui.buffer").on_search_change()<CR>',
445445
map_opt
446446
)
447447
api.nvim_buf_set_keymap(
448448
M.bufnr,
449449
'n',
450450
'p',
451-
"p<cmd>lua require('spectre.ui.plenary').on_search_change()<cr>",
451+
"p<cmd>lua require('spectre.ui.buffer').on_search_change()<cr>",
452452
map_opt
453453
)
454454
api.nvim_buf_set_keymap(
455455
M.bufnr,
456456
'v',
457457
'p',
458-
"p<cmd>lua require('spectre.ui.plenary').on_search_change()<cr>",
458+
"p<cmd>lua require('spectre.ui.buffer').on_search_change()<cr>",
459459
map_opt
460460
)
461461
api.nvim_buf_set_keymap(
462462
M.bufnr,
463463
'v',
464464
'P',
465-
"P<cmd>lua require('spectre.ui.plenary').on_search_change()<cr>",
465+
"P<cmd>lua require('spectre.ui.buffer').on_search_change()<cr>",
466466
map_opt
467467
)
468468
api.nvim_buf_set_keymap(M.bufnr, 'n', 'd', '<nop>', map_opt)
@@ -472,7 +472,7 @@ M.mapping_buffer = function()
472472
api.nvim_buf_set_keymap(M.bufnr, 'n', 'O', 'ki', map_opt)
473473
api.nvim_buf_set_keymap(M.bufnr, 'n', 'u', '', map_opt) -- disable undo, It breaks the UI.
474474
api.nvim_buf_set_keymap(M.bufnr, 'n', 'yy', "<cmd>lua require('spectre.actions').copy_current_line()<cr>", map_opt)
475-
api.nvim_buf_set_keymap(M.bufnr, 'n', '?', "<cmd>lua require('spectre.ui.plenary').show_help()<cr>", map_opt)
475+
api.nvim_buf_set_keymap(M.bufnr, 'n', '?', "<cmd>lua require('spectre.ui.buffer').show_help()<cr>", map_opt)
476476

477477
for _, map in pairs(state.user_config.mapping) do
478478
if map.cmd then

0 commit comments

Comments
 (0)