leigh/telescope.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on ngram sorter

Browse Source
This commit is contained in:
TJ DeVries
2020-08-03 20:40:04 -04:00
parent fa0382d93e
commit 96cac0a8c8
9 changed files with 486 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lua/telescope/finders.lua
View File

@@ -1,4 +1,5 @@
local a = vim.api
local log = require('telescope.log')
local finders = {}
@@ -29,7 +30,7 @@ function Finder:new(opts)
-- ...
return setmetatable({
fn_command = opts.fn_command,
responsive = opts.responsive,
static = opts.static,
state = {},
job_id = -1,
}, Finder)
@@ -44,11 +45,28 @@ end
-- process_search
-- do_your_job
-- process_plz
function Finder:_find(prompt, process_result)
function Finder:_find(prompt, process_result, process_complete)
if (self.state.job_id or 0) > 0 then
vim.fn.jobstop(self.job_id)
end
log.info("Finding...")
if self.static and self.done then
log.info("Using previous results")
for _, v in ipairs(self._cached_lines) do
process_result(v)
end
process_complete()
return
end
if self.static then
self._cached_lines = {}
end
self.done = false
-- TODO: How to just literally pass a list...
-- TODO: How to configure what should happen here
-- TODO: How to run this over and over?
@@ -57,9 +75,21 @@ function Finder:_find(prompt, process_result)
on_stdout = function(_, data, _)
for _, line in ipairs(data) do
process_result(line)
if vim.trim(line) ~= "" then
process_result(line)
if self.static then
table.insert(self._cached_lines, line)
end
end
end
end
end,
on_exit = function()
self.done = true
process_complete()
end,
})
end

83
lua/telescope/log.lua Normal file
View File

@@ -0,0 +1,83 @@
-- https://raw.githubusercontent.com/rxi/log.lua/master/log.lua
-- log.lua
--
-- Copyright (c) 2016 rxi
--
-- This library is free software; you can redistribute it and/or modify it
-- under the terms of the MIT license. See LICENSE for details.
--
local log = { _version = "0.1.0" }
log.usecolor = true
log.outfile = vim.fn.stdpath('data') .. '/telescope.log'
log.console = false
log.level = "trace"
local modes = {
{ name = "trace", color = "\27[34m", },
{ name = "debug", color = "\27[36m", },
{ name = "info", color = "\27[32m", },
{ name = "warn", color = "\27[33m", },
{ name = "error", color = "\27[31m", },
{ name = "fatal", color = "\27[35m", },
}
local levels = {}
for i, v in ipairs(modes) do
levels[v.name] = i
end
local round = function(x, increment)
increment = increment or 1
x = x / increment
return (x > 0 and math.floor(x + .5) or math.ceil(x - .5)) * increment
end
for i, x in ipairs(modes) do
local nameupper = x.name:upper()
log[x.name] = function(...)
-- Return early if we're below the log level
if i < levels[log.level] then
return
end
local passed = {...}
local fmt = table.remove(passed, 1)
local inspected = {}
for _, v in ipairs(passed) do
table.insert(inspected, vim.inspect(v))
end
local msg = string.format(fmt, unpack(inspected))
local info = debug.getinfo(2, "Sl")
local lineinfo = info.short_src .. ":" .. info.currentline
-- Output to console
if log.console then
print(string.format("%s[%-6s%s]%s %s: %s",
log.usecolor and x.color or "",
nameupper,
os.date("%H:%M:%S"),
log.usecolor and "\27[0m" or "",
lineinfo,
msg))
end
-- Output to log file
if log.outfile then
local fp = io.open(log.outfile, "a")
local str = string.format("[%-6s%s] %s: %s\n",
nameupper, os.date(), lineinfo, msg)
fp:write(str)
fp:close()
end
end
end
log.info("Logger Succesfully Loaded")
return log

80
lua/telescope/pickers.lua
View File

@@ -1,6 +1,12 @@
local a = vim.api
local fun = require('fun')
local popup = require('popup')
local zip = fun.zip
local tomap = fun.tomap
local log = require('telescope.log')
local mappings = require('telescope.mappings')
local state = require('telescope.state')
local utils = require('telescope.utils')
@@ -119,10 +125,10 @@ function Picker:find(opts)
-- vim.fn.prompt_setprompt(prompt_bufnr, prompt_string)
-- First thing we want to do is set all the lines to blank.
local max_results = popup_opts.results.height
self.max_results = popup_opts.results.height - 1
local initial_lines = {}
for _ = 1, max_results do table.insert(initial_lines, "") end
vim.api.nvim_buf_set_lines(results_bufnr, 0, max_results, false, initial_lines)
for _ = 1, self.max_results do table.insert(initial_lines, "") end
vim.api.nvim_buf_set_lines(results_bufnr, 0, self.max_results, false, initial_lines)
local on_lines = function(_, _, _, first_line, last_line)
local prompt = vim.api.nvim_buf_get_lines(prompt_bufnr, first_line, last_line, false)[1]
@@ -145,11 +151,22 @@ function Picker:find(opts)
-- TODO: We need to handle huge lists in a good way, cause currently we'll just put too much stuff in the buffer
-- TODO: Stop having things crash if we have an error.
local replace_line = function(row, line)
local replace_line = function(score, row, line)
log.trace("Replacing @ %s w/ text '%s' (%s)", row, line, score)
vim.api.nvim_buf_set_lines(results_bufnr, row, row + 1, false, {line})
end
finder(prompt, function(line)
local insert_line = function(score, row, line)
log.trace("Inserting @ %s w/ text '%s' (%s)", row, line, score)
vim.api.nvim_buf_set_lines(results_bufnr, row, row, false, {line})
end
local process_result = function(line)
if vim.trim(line) == "" then
return
end
if sorter then
local sort_score = sorter:score(prompt, line)
if sort_score == -1 then
@@ -161,7 +178,7 @@ function Picker:find(opts)
for row, row_score in utils.reversed_ipairs(self.line_scores) do
if row_score > sort_score then
-- Insert line at row
replace_line(max_results - row, line)
insert_line(sort_score, self.max_results - row, line)
-- Insert current score in the table
table.insert(self.line_scores, row + 1, sort_score)
@@ -171,7 +188,7 @@ function Picker:find(opts)
end
-- Don't keep inserting stuff
if row > max_results then
if row > self.max_results then
return
end
end
@@ -179,19 +196,35 @@ function Picker:find(opts)
-- Worst score so far, so add to end
-- example: 5 max results, 8
local worst_line = max_results - #self.line_scores
replace_line(worst_line, line)
local worst_line = self.max_results - #self.line_scores
replace_line(sort_score, worst_line, line)
table.insert(self.line_scores, sort_score)
else
-- Just always append to the end of the buffer if this is all you got.
vim.api.nvim_buf_set_lines(results_bufnr, -1, -1, false, {line})
end
end
local process_complete = function()
local worst_line = self.max_results - #self.line_scores
local empty_lines = {}
for _ = 1, worst_line do table.insert(empty_lines, "") end
vim.api.nvim_buf_set_lines(results_bufnr, 0, worst_line, false, empty_lines)
log.info("Worst Line after process_complete: %s", worst_line)
log.trace("%s", tomap(zip(
a.nvim_buf_get_lines(results_bufnr, worst_line, self.max_results, false),
self.line_scores
)))
end
pcall(function()
return finder(prompt, process_result, process_complete)
end)
-- local results = finder:get_results(results_win, results_bufnr, line)
end
-- Call this once to pre-populate if it makes sense
vim.schedule_wrap(on_lines(nil, nil, nil, 0, 1))
-- vim.schedule_wrap(on_lines(nil, nil, nil, 0, 1))
-- Register attach
vim.api.nvim_buf_attach(prompt_bufnr, true, {
@@ -233,16 +266,12 @@ function Picker:find(opts)
finder = finder,
})
-- print(vim.inspect(state.get_status(prompt_bufnr)))
mappings.set_keymap(prompt_bufnr, results_bufnr)
vim.cmd [[startinsert]]
end
function Picker:close_windows(status)
-- vim.fn['popup#close_win'](state.prompt_win)
-- vim.fn['popup#close_win'](state.results_win)
-- vim.fn['popup#close_win'](state.preview_win)
local prompt_win = status.prompt_win
local results_win = status.results_win
local preview_win = status.preview_win
@@ -252,12 +281,13 @@ function Picker:close_windows(status)
local preview_border_win = status.preview_border_win
local function del_win(name, win_id, force)
-- local file = io.open("/home/tj/test.txt", "a")
-- file:write(string.format("Closing.... %s %s\n", name, win_id))
local ok = pcall(vim.api.nvim_win_close, win_id, force)
-- file:write(string.format("OK: %s\n", ok))
-- file:write("...Done\n\n")
-- file:close()
if not vim.api.nvim_win_is_valid(win_id) then
return
end
if not pcall(vim.api.nvim_win_close, win_id, force) then
log.trace("Unable to close window: %s/%s", name, win_id)
end
end
del_win("prompt_win", prompt_win, true)
@@ -283,7 +313,7 @@ end
local ns_telescope_selection = a.nvim_create_namespace('telescope_selection')
function Picker:get_selection()
return self.selection or #(self.line_scores or {})
return self.selection or self.max_results
end
function Picker:move_selection(change)
@@ -291,6 +321,12 @@ function Picker:move_selection(change)
end
function Picker:set_selection(row)
if row > self.max_results then
row = self.max_results
elseif row < 1 then
row = 1
end
local status = state.get_status(self.prompt_bufnr)
a.nvim_buf_clear_namespace(status.results_bufnr, ns_telescope_selection, 0, -1)

43
lua/telescope/previewers.lua
View File

@@ -1,3 +1,5 @@
local log = require('telescope.log')
local previewers = {}
local Previewer = {}
@@ -21,12 +23,14 @@ end
previewers.vim_buffer = previewers.new {
preview_fn = function(preview_win, preview_bufnr, results_bufnr, row)
assert(preview_bufnr)
local line = vim.api.nvim_buf_get_lines(results_bufnr, row, row + 1, false)[1]
if line == nil then
return
end
local file_name = vim.split(line, ":")[1]
-- print(file_name)
log.info("Previewing File: %s", file_name)
-- vim.fn.termopen(
-- string.format("bat --color=always --style=grid %s"),
-- vim.fn.fnamemodify(file_name, ":p")
@@ -45,6 +49,39 @@ previewers.vim_buffer = previewers.new {
}
previewers.vim_buffer_or_bat = previewers.new {
preview_fn = function(preview_win, preview_bufnr, results_bufnr, row)
local line = vim.api.nvim_buf_get_lines(results_bufnr, row, row + 1, false)[1]
if line == nil then
return
end
local file_name = vim.split(line, ":")[1]
log.info("Previewing File: %s", file_name)
-- vim.fn.termopen(
-- string.format("bat --color=always --style=grid %s"),
-- vim.fn.fnamemodify(file_name, ":p")
local bufnr = vim.fn.bufadd(file_name)
if vim.api.nvim_buf_is_loaded(bufnr) then
vim.fn.bufload(bufnr)
-- TODO: We should probably call something like this because we're not always getting highlight and all that stuff.
-- api.nvim_command('doautocmd filetypedetect BufRead ' .. vim.fn.fnameescape(filename))
vim.api.nvim_win_set_buf(preview_win, bufnr)
vim.api.nvim_win_set_option(preview_win, 'wrap', false)
vim.api.nvim_win_set_option(preview_win, 'winhl', 'Normal:Normal')
-- vim.api.nvim_win_set_option(preview_win, 'winblend', 20)
vim.api.nvim_win_set_option(preview_win, 'signcolumn', 'no')
vim.api.nvim_win_set_option(preview_win, 'foldlevel', 100)
else
vim.api.nvim_buf_set_lines(preview_bufnr, 0, -1, false, vim.fn.systemlist(string.format('bat %s', file_name)))
end
end,
}
previewers.Previewer = Previewer
return previewers

28
lua/telescope/sorters.lua
View File

@@ -1,3 +1,5 @@
local util = require('telescope.utils')
local sorters = {}
@@ -31,4 +33,30 @@ end
sorters.Sorter = Sorter
sorters.get_ngram_sorter = function()
return Sorter:new {
scoring_function = function(_, prompt, line)
if prompt == "" or prompt == nil then
return 1
end
local ok, result = pcall(function()
local ngram = util.new_ngram { N = 4 }
ngram:add(line)
local score = ngram:score(prompt)
if score == 0 then
return -1
end
-- return math.pow(math.max(score, 0.0001), -1)
return score
end)
print(prompt, line, result)
return ok and result or 1
end
}
end
return sorters

122
lua/telescope/utils.lua
View File

@@ -11,4 +11,126 @@ utils.reversed_ipairs = function(t)
return reversedipairsiter, t, #t + 1
end
utils.default_table_mt = {
__index = function(t, k)
local obj = {}
rawset(t, k, obj)
return obj
end
}
local NGram = {}
NGram.__index = NGram
function NGram:new(opts)
-- TODO: Add padding
opts = opts or {}
return setmetatable({
N = opts.N or 2,
split = opts.split or "/",
_depth = 5,
_grams = setmetatable({}, utils.default_table_mt)
}, self)
end
local min = math.min
function NGram:_split(word)
local word_len = #word
local result = {}
for i = 1, word_len - 1 do
-- for j = i + (self.N - 1), min(i + self._depth - 1, word_len) do
-- table.insert(result, string.sub(word, i, j))
-- end
table.insert(result, string.sub(word, i, i + self.N - 1))
end
return result
end
-- local function pairsByKeys (t, f)
-- local a = {}
-- for n in pairs(t) do table.insert(a, n) end
-- table.sort(a, f)
-- local i = 0 -- iterator variable
-- local iter = function () -- iterator function
-- i = i + 1
-- if a[i] == nil then return nil
-- else return a[i], t[a[i]]
-- end
-- end
-- return iter
-- end
function NGram:add(word)
local split_word = self:_split(word)
for _, k in ipairs(split_word) do
local counts = self._grams[k]
if counts[word] == nil then
counts[word] = 0
end
counts[word] = counts[word] + 1
end
end
function NGram:_items_sharing_ngrams(query)
local split_query = self:_split(query)
-- Matched string to number of N-grams shared with the query string.
local shared = {}
local remaining = {}
for _, ngram in ipairs(split_query) do
remaining = {}
for match, count in pairs(self._grams[ngram] or {}) do
remaining[match] = remaining[match] or count
if remaining[match] > 0 then
remaining[match] = remaining[match] - 1
shared[match] = (shared[match] or 0) + 1
end
end
end
return shared
end
function NGram:search(query, show_values)
local sharing_ngrams = self:_items_sharing_ngrams(query)
local results = {}
for name, count in pairs(sharing_ngrams) do
local allgrams = #query + #name - (2 * self.N) - count + 2
table.insert(results, {name, count / allgrams})
end
table.sort(results, function(left, right)
return left[2] > right[2]
end)
if not show_values then
for k, v in ipairs(results) do
results[k] = v[1]
end
end
return results
end
function NGram:find(query)
return self:search(query)[1]
end
function NGram:score(query)
return (self:search(query, true)[1] or {})[2] or 0
end
utils.new_ngram = function()
return NGram:new()
end
return utils

107
lua/tests/telescope_spec.lua
View File

@@ -1,15 +1,106 @@
-- require('plenary.test_harness'):setup_busted()
require('plenary.test_harness'):setup_busted()
local utils = require('telescope.utils')
--[[
require("plenary.test_harness"):test_directory("busted", "./tests/telescope_spec.lua")
require("plenary.test_harness"):test_directory("busted", "./tests/")
--]]
if false then
describe('Picker', function()
describe('window_dimensions', function()
it('', function()
assert(true)
describe('Picker', function()
describe('window_dimensions', function()
it('', function()
assert(true)
end)
end)
describe('ngrams', function()
it('should capture intself in the ngram', function()
local n = utils.new_ngram()
n:add("hi")
assert.are.same(n._grams.hi, {hi = 1})
end)
it('should have repeated strings count more than once', function()
local n = utils.new_ngram()
n:add("llll")
assert.are.same(n._grams.ll, {llll = 3})
end)
describe('_items_sharing_ngrams', function()
-- it('should be able to find similar strings', function()
-- end)
local n
before_each(function()
n = utils.new_ngram()
n:add("SPAM")
n:add("SPAN")
n:add("EG")
end)
it('should find items at the start', function()
assert.are.same({ SPAM = 1, SPAN = 1 }, n:_items_sharing_ngrams("SP"))
end)
it('should find items at the end', function()
assert.are.same({ SPAM = 1, }, n:_items_sharing_ngrams("AM"))
end)
it('should find items at the end', function()
assert.are.same({ SPAM = 2, SPAN = 1}, n:_items_sharing_ngrams("PAM"))
end)
end)
describe('search', function()
describe('for simple strings', function()
local n
before_each(function()
n = utils.new_ngram()
n:add("SPAM")
n:add("SPAN")
n:add("EG")
end)
it('should sort for equal cases', function()
assert.are.same({ "SPAM", "SPAN" }, n:search("SPAM"))
end)
it('should sort for obvious cases', function()
assert.are.same({ "SPAM", "SPAN" }, n:search("PAM"))
end)
end)
describe('for file paths', function()
local n
before_each(function()
n = utils.new_ngram()
n:add("sho/rt")
n:add("telescope/init.lua")
n:add("telescope/utils.lua")
n:add("telescope/pickers.lua")
n:add("a/random/file/pickers.lua")
n:add("microscope/init.lua")
end)
it("should find exact match", function()
assert.are.same(n:find("telescope/init.lua"), "telescope/init.lua")
assert.are.same(n:score("telescope/init.lua"), 1)
end)
it("should find unique match", function()
assert.are.same(n:find("micro"), "microscope/init.lua")
end)
it("should find some match", function()
assert.are.same(n:find("telini"), "telescope/init.lua")
end)
end)
end)
end)
end
end)

43
scratch/file_finder.lua
View File

@@ -1,4 +1,3 @@
package.loaded['telescope.pickers'] = nil
local telescope = require('telescope')
-- Goals:
@@ -40,38 +39,34 @@ fzf_job.stdin = ls_files_job.stdout
--]]
local string_distance = require('telescope.algos.string_distance')
local file_finder = telescope.finders.new {
fn_command = function(self, prompt)
-- todo figure out how to cache this later
if false then
if self[prompt] == nil then
self[prompt] = nil
end
static = true,
return self[prompt]
else
return 'git ls-files'
end
-- self, prompt
fn_command = function()
return 'git ls-files'
end,
}
local file_sorter = telescope.sorters.new {
scoring_function = function(self, prompt, line)
if prompt == '' then return 0 end
if not line then return -1 end
local file_sorter = telescope.sorters.get_ngram_sorter()
return tonumber(vim.fn.systemlist(string.format(
"echo '%s' | ~/tmp/fuzzy_test/target/debug/fuzzy_test '%s'",
line,
prompt
))[1])
end
}
-- local string_distance = require('telescope.algos.string_distance')
-- new {
-- scoring_function = function(self, prompt, line)
-- if prompt == '' then return 0 end
-- if not line then return -1 end
-- return tonumber(vim.fn.systemlist(string.format(
-- "echo '%s' | ~/tmp/fuzzy_test/target/debug/fuzzy_test '%s'",
-- line,
-- prompt
-- ))[1])
-- end
-- }
local file_previewer = telescope.previewers.vim_buffer
local file_previewer = telescope.previewers.vim_buffer_or_bat
local file_picker = telescope.pickers.new {
previewer = file_previewer

3
scratch/picker_locations.lua
View File

@@ -1,4 +1,7 @@
-- Hot reload stuff
package.loaded['telescope'] = nil
package.loaded['telescope.init'] = nil
package.loaded['telescope.picker'] = nil
package.loaded['telescope.finder'] = nil