aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamjan 9000 <damjan.9000@gmail.com>2024-07-28 20:50:15 +0200
committerDamjan 9000 <damjan.9000@gmail.com>2024-07-28 20:50:15 +0200
commit5a2930fe62bd4fea7a512a51dab355522736432e (patch)
treede57d6bcd0a4a035b173efcb0c6c482f6dc7a716
parente1d6094136efb6f0c1f5a9f303fb8cbbe32b5976 (diff)
parent1cef2325e0d28ec99c1d8446be4ea58b73028901 (diff)
Merge 'upstream' conform warning, redundant hlsearch
Modify conform comments to prevent deprecation warning when used Remove redundant hlsearch option
-rw-r--r--lua/keymaps.lua4
-rw-r--r--lua/kickstart/plugins/conform.lua5
2 files changed, 4 insertions, 5 deletions
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index 46e815c..c07a08a 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -1,8 +1,8 @@
-- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()`
--- Set highlight on search, but clear on pressing <Esc> in normal mode
-vim.opt.hlsearch = true
+-- Clear highlights on search when pressing <Esc> in normal mode
+-- See `:help hlsearch`
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
-- Diagnostic keymaps
diff --git a/lua/kickstart/plugins/conform.lua b/lua/kickstart/plugins/conform.lua
index 4f280f7..e7fc728 100644
--- a/lua/kickstart/plugins/conform.lua
+++ b/lua/kickstart/plugins/conform.lua
@@ -30,9 +30,8 @@ return {
-- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" },
--
- -- You can use a sub-list to tell conform to run *until* a formatter
- -- is found.
- -- javascript = { { "prettierd", "prettier" } },
+ -- You can use 'stop_after_first' to run the first available formatter from the list
+ -- javascript = { "prettierd", "prettier", stop_after_first = true },
},
},
},