From b89f0ad41121c238afce930c72ebc04de23f2125 Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Wed, 11 Oct 2023 17:36:20 +0200 Subject: [PATCH] console.lua: remove repetition from build_completers() --- player/lua/console.lua | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/player/lua/console.lua b/player/lua/console.lua index 4089cfa218..31dcbdda62 100644 --- a/player/lua/console.lua +++ b/player/lua/console.lua @@ -649,20 +649,25 @@ function build_completers() end end - return { + local completers = { { pattern = '^%s*()[%w_-]+()$', list = cmd_list, append = ' ' }, - { pattern = '^%s*set%s+()[%w_/-]+()$', list = prop_list, append = ' ' }, - { pattern = '^%s*set%s+"()[%w_/-]+()$', list = prop_list, append = '" ' }, - { pattern = '^%s*add%s+()[%w_/-]+()$', list = prop_list, append = ' ' }, - { pattern = '^%s*add%s+"()[%w_/-]+()$', list = prop_list, append = '" ' }, - { pattern = '^%s*cycle%s+()[%w_/-]+()$', list = prop_list, append = ' ' }, - { pattern = '^%s*cycle%s+"()[%w_/-]+()$', list = prop_list, append = '" ' }, - { pattern = '^%s*cycle%-values%s+()[%w_/-]+()$', list = prop_list, append = ' ' }, - { pattern = '^%s*cycle%-values%s+"()[%w_/-]+()$', list = prop_list, append = '" ' }, - { pattern = '^%s*multiply%s+()[%w_/-]+()$', list = prop_list, append = ' ' }, - { pattern = '^%s*multiply%s+"()[%w_/-]+()$', list = prop_list, append = '" ' }, { pattern = '${()[%w_/-]+()$', list = prop_list, append = '}' }, } + + for _, command in pairs({'set', 'add', 'cycle', 'cycle[-_]values', 'multiply'}) do + completers[#completers + 1] = { + pattern = '^%s*' .. command .. '%s+()[%w_/-]+()$', + list = prop_list, + append = ' ', + } + completers[#completers + 1] = { + pattern = '^%s*' .. command .. '%s+"()[%w_/-]+()$', + list = prop_list, + append = '" ', + } + end + + return completers end -- Use 'list' to find possible tab-completions for 'part.'