Skip to content

Commit 5955be9

Browse files
committed
feat(nvim-keymaps): Snacks.util.redraw on esc
Add max_symbol_len for dropbar symbols. Reference: nvim-neo-tree/neo-tree.nvim#1615
1 parent 51957f7 commit 5955be9

File tree

8 files changed

+29
-19
lines changed

8 files changed

+29
-19
lines changed

dot_config/nvim/lua/config/keymaps.lua

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
-- Add any additional keymaps here
44

55
local Lazy = require("lazy")
6-
local LazyUtil = require("lazy.util")
76
local LazyViewConfig = require("lazy.view.config")
87

98
local map = U.keymap.map
@@ -230,11 +229,11 @@ del("n", "<leader>L")
230229
-- stylua: ignore start
231230
map("n", "<leader>lL", function() LazyVim.news.changelog() end, { desc = "LazyVim Changelog" })
232231
map("n", "<leader>lN", function() LazyVim.news.lazyvim() end, { desc = "LazyVim News" })
233-
-- alternative: vim.ui.open("https://lazyvim.org")
234-
map("n", "<leader>ld", function() LazyUtil.open("https://lazyvim.org") end, { desc = "LazyVim Docs" })
235-
map("n", "<leader>lD", function() LazyUtil.open("https://lazy.folke.io") end, { desc = "lazy.nvim Docs" })
236-
map("n", "<leader>lr", function() LazyUtil.open("https://github.com/LazyVim/LazyVim") end, { desc = "LazyVim Repo" })
237-
map("n", "<leader>lR", function() LazyUtil.open("https://github.com/folke/lazy.nvim") end, { desc = "lazy.nvim Repo" })
232+
-- alternative: require("lazy.util").open("https://lazyvim.org")
233+
map("n", "<leader>ld", function() vim.ui.open("https://lazyvim.org") end, { desc = "LazyVim Docs" })
234+
map("n", "<leader>lD", function() vim.ui.open("https://lazy.folke.io") end, { desc = "lazy.nvim Docs" })
235+
map("n", "<leader>lr", function() vim.ui.open("https://github.com/LazyVim/LazyVim") end, { desc = "LazyVim Repo" })
236+
map("n", "<leader>lR", function() vim.ui.open("https://github.com/folke/lazy.nvim") end, { desc = "lazy.nvim Repo" })
238237
-- stylua: ignore end
239238

240239
local function lint_info()

dot_config/nvim/lua/plugins/coding.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ return {
195195
end
196196

197197
-- find all URLs in buffer
198-
local urlPattern = "%l%l%l-://[^%s)]+"
198+
local urlPattern = [=[%l%l%l-://[^%s)"'`]+]=] -- excludes: )"'` and whitespace
199199
local bufText = table.concat(vim.api.nvim_buf_get_lines(0, 0, -1, false), "\n")
200200
local urls = {}
201201
for url in bufText:gmatch(urlPattern) do

dot_config/nvim/lua/plugins/extras/lsp/symbol-usage.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ return {
4848
SymbolUsageRef = { fg = Snacks.util.color("Function"), italic = true },
4949
SymbolUsageDef = { fg = Snacks.util.color("Type"), italic = true },
5050
SymbolUsageImpl = { fg = Snacks.util.color("@keyword"), italic = true },
51-
}, { default = false })
51+
})
5252

5353
return {
5454
vt_position = "end_of_line",

dot_config/nvim/lua/plugins/extras/ui/dropbar.lua

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ return {
2525
local menu_utils = require("dropbar.utils.menu")
2626
local dropbar_default_opts = require("dropbar.configs").opts
2727

28+
local function truncate_string(str, max_length)
29+
if #str <= max_length then
30+
return str
31+
end
32+
return str:sub(1, max_length - 1) .. ""
33+
end
34+
2835
-- custom highlight
2936
Snacks.util.set_hl({
3037
DropBarFileName = { fg = Snacks.util.color("DropBarKindFile"), bold = true },
@@ -103,6 +110,11 @@ return {
103110
symbols = { symbols[1], symbol_ellipsis, unpack(symbols, #symbols - max_symbols + 2, #symbols) }
104111
end
105112

113+
local max_symbol_len = vim.g.user_is_termux and 10 or 20
114+
for i = 2, #symbols - 1 do
115+
symbols[i].name = truncate_string(symbols[i].name, max_symbol_len)
116+
end
117+
106118
return symbols
107119
end,
108120
}

dot_config/nvim/lua/plugins/extras/util/translate.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ return {
8787

8888
-- fix: on colorscheme change
8989
local highlights = Trans.style.theme[opts.theme or "default"]
90-
Snacks.util.set_hl(highlights, { default = false })
90+
Snacks.util.set_hl(highlights)
9191

9292
local node = Trans.util.node
9393
---@diagnostic disable-next-line: undefined-field
@@ -133,7 +133,7 @@ return {
133133
opts = function(_, opts)
134134
local actions = require("pantran.ui.actions")
135135

136-
Snacks.util.set_hl({ PantranBorder = "FloatBorder" }, { default = false })
136+
Snacks.util.set_hl({ PantranBorder = "FloatBorder" })
137137

138138
return U.extend_tbl(opts, {
139139
-- command = {

dot_config/nvim/lua/plugins/vscode.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ return {
5050
once = true,
5151
callback = function()
5252
vscode_map("n", "u", "undo", { desc = "VSCode Undo" })
53-
vscode_map("n", "<C-r>", "redo", { desc = "VSCode Redo" })
54-
vscode_map("n", "U", "redo", { desc = "VSCode Redo" })
53+
vscode_map("n", {"<C-r>", "U"}, "redo", { desc = "VSCode Redo" })
5554

5655
vscode_map("n", "<Left>", "workbench.action.navigateBack", { desc = "Go Back" })
5756
vscode_map("n", "<Right>", "workbench.action.navigateForward", { desc = "Go Forward" })

dot_config/nvim/lua/util/keymap.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function M.clear_ui_esc(opts)
150150
vim.cmd("diffupdate")
151151
end
152152
-- vim.cmd("syntax sync fromstart")
153-
vim.cmd("normal! <C-L>") -- vim.cmd.redraw({ bang = true })
153+
Snacks.util.redraw(vim.api.nvim_get_current_win()) -- vim.cmd("normal! <C-L>") -- vim.cmd.redraw({ bang = true })
154154
if opts.esc then
155155
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<esc>", true, true, true), "n", false)
156156
end

symlinks/lazyvim/lazy-lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"CopilotChat.nvim": { "branch": "main", "commit": "db95d18a4f645ec6b745ef9db91adf4665824f22" },
3-
"LazyVim": { "branch": "main", "commit": "4b86cf99007219671ed96fa59385d1d1896178c5" },
3+
"LazyVim": { "branch": "main", "commit": "9ad1c49b67a5c4330e366cde41ab11b156de03f2" },
44
"SchemaStore.nvim": { "branch": "main", "commit": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df" },
55
"Trans.nvim": { "branch": "v2", "commit": "3ebcd7b785dba7faec577b58606eb8a1c46b6260" },
66
"autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" },
@@ -71,7 +71,7 @@
7171
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
7272
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
7373
"mini.trailspace": { "branch": "main", "commit": "3a328e62559c33014e422fb9ae97afc4208208b1" },
74-
"neo-tree.nvim": { "branch": "main", "commit": "ca340e0747a85a05c08a5ba5e183c70c0a355a7c" },
74+
"neo-tree.nvim": { "branch": "main", "commit": "395ce4675a54828f9fd730d78f7910c114ab0a49" },
7575
"neoconf.nvim": { "branch": "main", "commit": "05d25c121e07c464d6b4203204aa113453eca152" },
7676
"neogen": { "branch": "main", "commit": "37dd095892e3f846418c465852f7b21f81d0f46c" },
7777
"neon.nvim": { "branch": "main", "commit": "50537d23b2ca3b482b95e572b86b26a699ab2ce4" },
@@ -101,7 +101,7 @@
101101
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
102102
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
103103
"nvim-ufo": { "branch": "main", "commit": "95cbe2e99901135704aabdc8732d722cf68b12c9" },
104-
"nvim-various-textobjs": { "branch": "main", "commit": "9fdeb2a8876c4062d9cbd15c982030d4335d6c0a" },
104+
"nvim-various-textobjs": { "branch": "main", "commit": "60c8a8bdac5cdda155934b28613b5f7d8d76b071" },
105105
"obscure.nvim": { "branch": "main", "commit": "5b35a4e1b1df49c3f66747355c75bee871c6a60f" },
106106
"obsidian.nvim": { "branch": "main", "commit": "14e0427bef6c55da0d63f9a313fd9941be3a2479" },
107107
"oil.nvim": { "branch": "master", "commit": "9a59256c8e88b29d2150e99b5960b2f111e51f75" },
@@ -117,7 +117,7 @@
117117
"render-markdown.nvim": { "branch": "main", "commit": "e41b0002fe4196825450ab5a6343300c40791d51" },
118118
"smart-open.nvim": { "branch": "0.2.x", "commit": "7770b01ce4d551c143d7ec8589879320796621b9" },
119119
"smart-splits.nvim": { "branch": "master", "commit": "264e865589389409f1ac1da7673b1b732b1e8963" },
120-
"snacks.nvim": { "branch": "main", "commit": "fc71e36c90f44e0e6180ac6c5f035817709569d8" },
120+
"snacks.nvim": { "branch": "main", "commit": "66f7daa2b5b46213d98b94b8702e5b9377c6b976" },
121121
"sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
122122
"symbol-usage.nvim": { "branch": "main", "commit": "0f9b3da014b7e41559b643e7461fcabb2a7dc83a" },
123123
"telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
@@ -133,7 +133,7 @@
133133
"tmux.nvim": { "branch": "main", "commit": "307bad95a1274f7288aaee09694c25c8cbcd6f1a" },
134134
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
135135
"tokyonight.nvim": { "branch": "main", "commit": "355e2842291dbf51b2c5878e9e37281bbef09783" },
136-
"treesj": { "branch": "main", "commit": "03415ac60791d48e120a80d37e080744faf3ac15" },
136+
"treesj": { "branch": "main", "commit": "d089d345703633cc35c460316e2a5687ec3fdab2" },
137137
"trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
138138
"ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" },
139139
"twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
@@ -149,6 +149,6 @@
149149
"wezterm.nvim": { "branch": "main", "commit": "032c33b621b96cc7228955b4352b48141c482098" },
150150
"which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" },
151151
"yanky.nvim": { "branch": "main", "commit": "f9b905994cccf3c55f41af3a0a1f4c76c844e411" },
152-
"yazi.nvim": { "branch": "main", "commit": "a084a008c1479b9e50259995fe0192714d641c44" },
152+
"yazi.nvim": { "branch": "main", "commit": "da849feb7a66becdb3a94e197fe6ae4c9e3cdc2a" },
153153
"zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
154154
}

0 commit comments

Comments
 (0)