Revert "No longer store autocomplete options in config"

This reverts commit 0f1b84040d.

The new mechanism to save config.plugins upon user's configuration
reload let us stay compatible with existing plugins.
This commit is contained in:
Francesco Abbate 2021-12-31 00:22:49 +01:00
parent 03350cc14b
commit 445c79bb52
1 changed files with 6 additions and 6 deletions

View File

@ -10,7 +10,7 @@ local RootView = require "core.rootview"
local DocView = require "core.docview" local DocView = require "core.docview"
local Doc = require "core.doc" local Doc = require "core.doc"
local autocomplete_options = { config.plugins.autocomplete = {
-- Amount of characters that need to be written for autocomplete -- Amount of characters that need to be written for autocomplete
min_len = 3, min_len = 3,
-- The max amount of visible items -- The max amount of visible items
@ -192,7 +192,7 @@ local function update_suggestions()
-- fuzzy match, remove duplicates and store -- fuzzy match, remove duplicates and store
items = common.fuzzy_match(items, partial) items = common.fuzzy_match(items, partial)
local j = 1 local j = 1
for i = 1, autocomplete_options.max_suggestions do for i = 1, config.plugins.autocomplete.max_suggestions do
suggestions[i] = items[j] suggestions[i] = items[j]
while items[j] and items[i].text == items[j].text do while items[j] and items[i].text == items[j].text do
items[i].info = items[i].info or items[j].info items[i].info = items[i].info or items[j].info
@ -235,7 +235,7 @@ local function get_suggestions_rect(av)
max_width = math.max(max_width, w) max_width = math.max(max_width, w)
end end
local ah = autocomplete_options.max_height local ah = config.plugins.autocomplete.max_height
local max_items = #suggestions local max_items = #suggestions
if max_items > ah then if max_items > ah then
@ -294,7 +294,7 @@ local function draw_suggestions_box(av)
return return
end end
local ah = autocomplete_options.max_height local ah = config.plugins.autocomplete.max_height
-- draw background rect -- draw background rect
local rx, ry, rw, rh = get_suggestions_rect(av) local rx, ry, rw, rh = get_suggestions_rect(av)
@ -355,7 +355,7 @@ local function show_autocomplete()
-- update partial symbol and suggestions -- update partial symbol and suggestions
partial = get_partial_symbol() partial = get_partial_symbol()
if #partial >= autocomplete_options.min_len or triggered_manually then if #partial >= config.plugins.autocomplete.min_len or triggered_manually then
update_suggestions() update_suggestions()
if not triggered_manually then if not triggered_manually then
@ -469,7 +469,7 @@ function autocomplete.complete(completions, on_close)
end end
function autocomplete.can_complete() function autocomplete.can_complete()
if #partial >= autocomplete_options.min_len then if #partial >= config.plugins.autocomplete.min_len then
return true return true
end end
return false return false