Skip to content

Commit 5a2930f

Browse files
committed
Merge 'upstream' conform warning, redundant hlsearch
Modify conform comments to prevent deprecation warning when used Remove redundant hlsearch option
2 parents e1d6094 + 1cef232 commit 5a2930f

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

lua/keymaps.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
-- [[ Basic Keymaps ]]
22
-- See `:help vim.keymap.set()`
33

4-
-- Set highlight on search, but clear on pressing <Esc> in normal mode
5-
vim.opt.hlsearch = true
4+
-- Clear highlights on search when pressing <Esc> in normal mode
5+
-- See `:help hlsearch`
66
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
77

88
-- Diagnostic keymaps

lua/kickstart/plugins/conform.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ return {
3030
-- Conform can also run multiple formatters sequentially
3131
-- python = { "isort", "black" },
3232
--
33-
-- You can use a sub-list to tell conform to run *until* a formatter
34-
-- is found.
35-
-- javascript = { { "prettierd", "prettier" } },
33+
-- You can use 'stop_after_first' to run the first available formatter from the list
34+
-- javascript = { "prettierd", "prettier", stop_after_first = true },
3635
},
3736
},
3837
},

0 commit comments

Comments
 (0)