Merge pull request #2409 from 9999years/fix-back-compat-take-2

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

script/config/template.lua

@@ -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' << {

script/library.lua

@@ -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)