Skip to content

Fix backwards compatability with Lua.workspace.checkThirdParty (take 2!) #2409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sumneko merged 2 commits into from
Nov 9, 2023
Merged

Fix backwards compatability with Lua.workspace.checkThirdParty (take 2!) #2409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f6f395
Revert "Fix backwards compatability with `Lua.workspace.checkThirdPar…
9999years Nov 9, 2023
81607f4
Fix backwards compatability with `Lua.workspace.checkThirdParty`
9999years Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions script/config/template.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,12 @@ local template = {
['Lua.workspace.maxPreload'] = Type.Integer >> 5000,
['Lua.workspace.preloadFileSize'] = Type.Integer >> 500,
['Lua.workspace.library'] = Type.Array(Type.String),
['Lua.workspace.checkThirdParty'] = Type.String >> 'Ask' << {
['Lua.workspace.checkThirdParty'] = Type.Or(Type.String >> 'Ask' << {
'Ask',
'Apply',
'ApplyInMemory',
'Disable',
},
}, Type.Boolean),
['Lua.workspace.userThirdParty'] = Type.Array(Type.String),
['Lua.completion.enable'] = Type.Boolean >> true,
['Lua.completion.callSnippet'] = Type.String >> 'Disable' << {
Expand Down
8 changes: 2 additions & 6 deletions script/library.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,13 +610,9 @@ local function check3rd(uri)
end
local checkThirdParty = config.get(uri, 'Lua.workspace.checkThirdParty')
-- Backwards compatability: `checkThirdParty` used to be a boolean.
-- Note: `checkThirdParty` is defined as a string, so if a boolean is
-- supplied, it's converted to a string by the `config.config` module.
-- Hence we check for the strings `'true'` and `'false`' here, rather than
-- the boolean literals.
if checkThirdParty == 'Disable' or checkThirdParty == 'false' then
if not checkThirdParty or checkThirdParty == 'Disable' then
return
elseif checkThirdParty == 'true' then
elseif checkThirdParty == true then
checkThirdParty = 'Ask'
end
local scp = scope.getScope(uri)
Expand Down