diff options
| author | Senghan Bright <senghan.bright@deltaprojects.com> | 2020-09-23 06:20:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-23 00:20:38 -0400 |
| commit | 203c696230cb00ffa0225c0bbc7ac96ec95273bb (patch) | |
| tree | 4748d1efd4fe41198be5939bac9c3a0a7944998e /lua | |
| parent | 7015596711323127fd11c6f53e3f1fb3a51ed18e (diff) | |
fix: small fixes from sunjon (#107)
* Don't execute `command` if target buffer is already loaded in window.
* Print node_text before entry.kind in ordinal string.
* Add new builtin for listing and reloading Lua modules.
* Revert "Add new builtin for listing and reloading Lua modules."
This reverts commit 65d9d0294eae92b347b38b8dcf807fbcdd5783fe.
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/telescope/actions.lua | 8 | ||||
| -rw-r--r-- | lua/telescope/make_entry.lua | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lua/telescope/actions.lua b/lua/telescope/actions.lua index 326773d..f8c3453 100644 --- a/lua/telescope/actions.lua +++ b/lua/telescope/actions.lua @@ -98,10 +98,12 @@ local function goto_file_selection(prompt_bufnr, command) vim.cmd(string.format(":%s #%d", command, entry_bufnr)) end else - vim.cmd(string.format(":%s %s", command, filename)) - local bufnr = vim.api.nvim_get_current_buf() - a.nvim_buf_set_option(bufnr, 'buflisted', true) + if filename ~= vim.api.nvim_buf_get_name(bufnr) then + vim.cmd(string.format(":%s %s", command, filename)) + a.nvim_buf_set_option(bufnr, "buflisted", true) + end + if row and col then local ok, err_msg = pcall(a.nvim_win_set_cursor, 0, {row, col}) if not ok then diff --git a/lua/telescope/make_entry.lua b/lua/telescope/make_entry.lua index 3077661..3ec663b 100644 --- a/lua/telescope/make_entry.lua +++ b/lua/telescope/make_entry.lua @@ -268,7 +268,7 @@ function make_entry.gen_from_treesitter(opts) valid = true, value = entry.node, - ordinal = entry.kind .. " " .. node_text, + ordinal = string.format("%s [%s]", node_text, entry.kind), display = make_display, node_text = node_text, |