RepoMirrors/cmp-buffer
1
0
Fork 0
mirror of https://github.com/hrsh7th/cmp-buffer synced 2025-05-06 10:09:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply changes based on comments from the review

Browse Source
This commit is contained in:
Dmytro Meleshko 2021-11-15 21:20:08 +02:00
parent c6a71a9237
commit 8bc0b55bf7
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lua/cmp_buffer/buffer.lua
View File

@ -16,7 +16,7 @@
---@field public closed boolean ---@field public closed boolean
---@field public on_close_cb fun()|nil ---@field public on_close_cb fun()|nil
---@field public words_distances table<string, number> ---@field public words_distances table<string, number>
---@field public words_distances_last_cursor_pos number ---@field public words_distances_last_cursor_row number
---@field public words_distances_dirty boolean ---@field public words_distances_dirty boolean
local buffer = {} local buffer = {}
@ -49,7 +49,7 @@ function buffer.new(bufnr, opts)
self.words_distances = {} self.words_distances = {}
self.words_distances_dirty = true self.words_distances_dirty = true
self.words_distances_last_cursor_pos = 0 self.words_distances_last_cursor_row = 0
return self return self
end end
@ -71,7 +71,7 @@ function buffer.close(self)
self.words_distances = {} self.words_distances = {}
self.words_distances_dirty = false self.words_distances_dirty = false
self.words_distances_last_cursor_pos = 0 self.words_distances_last_cursor_row = 0
if self.on_close_cb then if self.on_close_cb then
self.on_close_cb() self.on_close_cb()
@ -250,13 +250,17 @@ function buffer.watch(self)
}) })
end end
local function clear_table(tbl)
for k in pairs(tbl) do
tbl[k] = nil
end
end
---@param linenr number ---@param linenr number
---@param line string ---@param line string
function buffer.index_line(self, linenr, line) function buffer.index_line(self, linenr, line)
local words = self.lines_words[linenr] local words = self.lines_words[linenr]
for k, _ in ipairs(words) do clear_table(words)
words[k] = nil
end
local word_i = 1 local word_i = 1
local remaining = line local remaining = line
@ -282,20 +286,14 @@ function buffer.get_words(self)
-- watcher callback to be fired VERY frequently, and a rebuild needs to go -- watcher callback to be fired VERY frequently, and a rebuild needs to go
-- over ALL lines, not just the changed ones. -- over ALL lines, not just the changed ones.
if self.unique_words_other_lines_dirty then if self.unique_words_other_lines_dirty then
local words = self.unique_words_other_lines clear_table(self.unique_words_other_lines)
for w, _ in pairs(words) do self:rebuild_unique_words(self.unique_words_other_lines, 0, self.last_edit_first_line)
words[w] = nil self:rebuild_unique_words(self.unique_words_other_lines, self.last_edit_last_line, self.lines_count)
end
self:rebuild_unique_words(words, 0, self.last_edit_first_line)
self:rebuild_unique_words(words, self.last_edit_last_line, self.lines_count)
self.unique_words_other_lines_dirty = false self.unique_words_other_lines_dirty = false
end end
if self.unique_words_curr_line_dirty then if self.unique_words_curr_line_dirty then
local words = self.unique_words_curr_line clear_table(self.unique_words_curr_line)
for w, _ in pairs(words) do self:rebuild_unique_words(self.unique_words_curr_line, self.last_edit_first_line, self.last_edit_last_line)
words[w] = nil
end
self:rebuild_unique_words(words, self.last_edit_first_line, self.last_edit_last_line)
self.unique_words_curr_line_dirty = false self.unique_words_curr_line_dirty = false
end end
return { self.unique_words_other_lines, self.unique_words_curr_line } return { self.unique_words_other_lines, self.unique_words_curr_line }
@ -310,21 +308,19 @@ function buffer.rebuild_unique_words(self, words_table, range_start, range_end)
end end
end end
---@param cursor_pos number 1-indexed line number ---@param cursor_row number
---@return table<string, number> ---@return table<string, number>
function buffer.get_words_distances(self, cursor_pos) function buffer.get_words_distances(self, cursor_row)
if self.words_distances_dirty or cursor_pos ~= self.words_distances_last_cursor_pos then if self.words_distances_dirty or cursor_row ~= self.words_distances_last_cursor_row then
local distances = self.words_distances local distances = self.words_distances
for k in pairs(distances) do clear_table(distances)
distances[k] = nil
end
for linenr, line in ipairs(self.lines_words) do for linenr, line in ipairs(self.lines_words) do
for _, w in ipairs(line) do for _, w in ipairs(line) do
local dist = math.abs(cursor_pos - linenr) local dist = math.abs(cursor_row - linenr)
distances[w] = distances[w] and math.min(distances[w], dist) or dist distances[w] = distances[w] and math.min(distances[w], dist) or dist
end end
end end
self.words_distances_last_cursor_pos = cursor_pos self.words_distances_last_cursor_row = cursor_row
self.words_distances_dirty = false self.words_distances_dirty = false
end end
return self.words_distances return self.words_distances