diff --git a/lua/telescope/sorters.lua b/lua/telescope/sorters.lua index 167a67b..8e266b3 100644 --- a/lua/telescope/sorters.lua +++ b/lua/telescope/sorters.lua @@ -382,15 +382,15 @@ sorters.get_generic_fuzzy_sorter = function(opts) -- TODO: Copied from ashkan. local denominator = ( - (10 * match_count / #prompt_ngrams) - -- biases for shorter strings - -- TODO(ashkan): this can bias towards repeated finds of the same - -- subpattern with overlapping_ngrams - + 3 * match_count * ngram_len / #line - + consecutive_matches - + N / (contains_string or (2 * #line)) -- + 30/(c1 or 2*N) + (10 * match_count / #prompt_ngrams) + -- biases for shorter strings + -- TODO(ashkan): this can bias towards repeated finds of the same + -- subpattern with overlapping_ngrams + + 3 * match_count * ngram_len / #line + + consecutive_matches + + N / (contains_string or (2 * #line)) -- + 30/(c1 or 2*N) - ) + ) if denominator == 0 or denominator ~= denominator then return -1 diff --git a/lua/tests/automated/entry_display_spec.lua b/lua/tests/automated/entry_display_spec.lua index b57e3a3..a09ccae 100644 --- a/lua/tests/automated/entry_display_spec.lua +++ b/lua/tests/automated/entry_display_spec.lua @@ -2,23 +2,21 @@ local entry_display = require "telescope.pickers.entry_display" describe("truncate", function() for _, ambiwidth in ipairs { "single", "double" } do - for _, case in - ipairs { - { args = { "abcde", 6 }, expected = { single = "abcde", double = "abcde" } }, - { args = { "abcde", 5 }, expected = { single = "abcde", double = "abcde" } }, - { args = { "abcde", 4 }, expected = { single = "abc…", double = "ab…" } }, - { args = { "アイウエオ", 11 }, expected = { single = "アイウエオ", double = "アイウエオ" } }, - { args = { "アイウエオ", 10 }, expected = { single = "アイウエオ", double = "アイウエオ" } }, - { args = { "アイウエオ", 9 }, expected = { single = "アイウエ…", double = "アイウ…" } }, - { args = { "アイウエオ", 8 }, expected = { single = "アイウ…", double = "アイウ…" } }, - { args = { "├─┤", 7 }, expected = { single = "├─┤", double = "├─┤" } }, - { args = { "├─┤", 6 }, expected = { single = "├─┤", double = "├─┤" } }, - { args = { "├─┤", 5 }, expected = { single = "├─┤", double = "├…" } }, - { args = { "├─┤", 4 }, expected = { single = "├─┤", double = "├…" } }, - { args = { "├─┤", 3 }, expected = { single = "├─┤", double = "…" } }, - { args = { "├─┤", 2 }, expected = { single = "├…", double = "…" } }, - } - do + for _, case in ipairs { + { args = { "abcde", 6 }, expected = { single = "abcde", double = "abcde" } }, + { args = { "abcde", 5 }, expected = { single = "abcde", double = "abcde" } }, + { args = { "abcde", 4 }, expected = { single = "abc…", double = "ab…" } }, + { args = { "アイウエオ", 11 }, expected = { single = "アイウエオ", double = "アイウエオ" } }, + { args = { "アイウエオ", 10 }, expected = { single = "アイウエオ", double = "アイウエオ" } }, + { args = { "アイウエオ", 9 }, expected = { single = "アイウエ…", double = "アイウ…" } }, + { args = { "アイウエオ", 8 }, expected = { single = "アイウ…", double = "アイウ…" } }, + { args = { "├─┤", 7 }, expected = { single = "├─┤", double = "├─┤" } }, + { args = { "├─┤", 6 }, expected = { single = "├─┤", double = "├─┤" } }, + { args = { "├─┤", 5 }, expected = { single = "├─┤", double = "├…" } }, + { args = { "├─┤", 4 }, expected = { single = "├─┤", double = "├…" } }, + { args = { "├─┤", 3 }, expected = { single = "├─┤", double = "…" } }, + { args = { "├─┤", 2 }, expected = { single = "├…", double = "…" } }, + } do local msg = ("can truncate: ambiwidth = %s, [%s, %d] -> %s"):format( ambiwidth, case.args[1], diff --git a/lua/tests/automated/pickers/find_files_spec.lua b/lua/tests/automated/pickers/find_files_spec.lua index f5ca05d..e9094cb 100644 --- a/lua/tests/automated/pickers/find_files_spec.lua +++ b/lua/tests/automated/pickers/find_files_spec.lua @@ -15,12 +15,10 @@ describe("builtin.find_files", function() tester.run_file "find_files__with_ctrl_n" end) - for _, configuration in - ipairs { - { sorting_strategy = "descending" }, - { sorting_strategy = "ascending" }, - } - do + for _, configuration in ipairs { + { sorting_strategy = "descending" }, + { sorting_strategy = "ascending" }, + } do it("should not display devicons when disabled: " .. disp(configuration), function() tester.run_string(string.format( [[ diff --git a/scripts/gendocs.lua b/scripts/gendocs.lua index 95f6ea6..7016147 100644 --- a/scripts/gendocs.lua +++ b/scripts/gendocs.lua @@ -1,8 +1,10 @@ -- Setup telescope with defaults -if RELOAD then RELOAD('telescope') end -require('telescope').setup() +if RELOAD then + RELOAD "telescope" +end +require("telescope").setup() -local docgen = require('docgen') +local docgen = require "docgen" local docs = {} @@ -32,7 +34,7 @@ docs.test = function() docgen.write(input_file, output_file_handle) end - output_file_handle:write(" vim:tw=78:ts=8:ft=help:norl:\n") + output_file_handle:write " vim:tw=78:ts=8:ft=help:norl:\n" output_file_handle:close() vim.cmd [[checktime]] end