diff options
Diffstat (limited to 'script')
| -rw-r--r-- | script/config/config.lua | 2 | ||||
| -rw-r--r-- | script/core/completion.lua | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/script/config/config.lua b/script/config/config.lua index bfcfa572..91f0a00b 100644 --- a/script/config/config.lua +++ b/script/config/config.lua @@ -181,7 +181,7 @@ local Template = { ['Lua.completion.keywordSnippet'] = Type.String >> 'Replace', ['Lua.completion.displayContext'] = Type.Integer >> 6, ['Lua.completion.workspaceWord'] = Type.Boolean >> true, - ['Lua.completion.word'] = Type.Boolean >> true, + ['Lua.completion.showWord'] = Type.String >> 'Enable', ['Lua.completion.autoRequire'] = Type.Boolean >> true, ['Lua.completion.showParams'] = Type.Boolean >> true, ['Lua.signatureHelp.enable'] = Type.Boolean >> true, diff --git a/script/core/completion.lua b/script/core/completion.lua index 6914e9cf..0d837b08 100644 --- a/script/core/completion.lua +++ b/script/core/completion.lua @@ -624,11 +624,14 @@ local function checkTableField(ast, word, start, results) end local function checkCommon(myUri, word, text, offset, results) - if not config.get 'Lua.completion.word' then + local showWord = config.get 'Lua.completion.showWord' + if showWord == 'Disable' then return end - results.enableCommon = true + if showWord == 'Fallback' and #results ~= 0 then + return + end local used = {} for _, result in ipairs(results) do used[result.label:match '^[^(]*'] = true |