add workaround for editting empty object

Author: sumneko

script/client.lua

@@ -231,8 +231,11 @@ end
 ---@param change config.change
 ---@return json.patch?
 local function makeConfigPatch(cfg, change)
+    local value     = cfg[change.key]
+    local parent    = cfg
+    local parentKey = ''
     if change.action == 'add' then
-        if type(cfg[change.key]) == 'table' and #cfg[change.key] > 0 then
+        if type(value) == 'table' and #cfg[change.key] > 0 then
             return {
                 op   = 'add',
                 path = '/' .. change.key .. '/-',
@@ -246,21 +249,31 @@ local function makeConfigPatch(cfg, change)
             })
         end
     elseif change.action == 'set' then
-        if cfg[change.key] ~= nil then
-            return {
-                op   = 'replace',
-                path = '/' .. change.key,
-                data = change.value,
-            }
+        if next(parent) then
+            if value ~= nil then
+                return {
+                    op   = 'replace',
+                    path = '/' .. change.key,
+                    data = change.value,
+                }
+            else
+                return {
+                    op   = 'add',
+                    path = '/' .. change.key,
+                    data = change.value,
+                }
+            end
         else
+            -- TODO: workaround, json-edit cannot edit an empty object
             return {
                 op   = 'add',
-                path = '/' .. change.key,
-                data = change.value,
+                path = parentKey,
+                data = { [change.key] = change.value },
             }
         end
     elseif change.action == 'prop' then
-        if type(cfg[change.key]) == 'table' and #cfg[change.key] == 0 then
+        if type(value) == 'table' and #value == 0 and next(value) then
+            -- TODO: workaround, json-edit cannot edit an empty object
             return {
                 op   = 'add',
                 path = '/' .. change.key .. '/' .. change.prop,

test/tclient/tests/modify-luarc.lua

@@ -21,9 +21,7 @@ lclient():start(function (languageClient)
 
     -------------------------------
 
-    util.saveFile(configPath, jsonb.beautify {
-        ['xxxx'] = 1, -- TODO: bug of json-edit, can not be an empty json
-    })
+    util.saveFile(configPath, jsonb.beautify(json.createEmptyObject()))
 
     provider.updateConfig()
 
@@ -36,15 +34,12 @@ lclient():start(function (languageClient)
     })
 
     assert(util.equal(jsonc.decode_jsonc(util.loadFile(configPath)), {
-        ['xxxx'] = 1,
         ['Lua.runtime.version'] = 'LuaJIT',
     }))
 
     -------------------------------
 
-    util.saveFile(configPath, jsonb.beautify {
-        ['xxxx'] = 1, -- TODO: bug of json-edit, can not be an empty json
-    })
+    util.saveFile(configPath, jsonb.beautify(json.createEmptyObject()))
 
     provider.updateConfig()
 
@@ -57,7 +52,6 @@ lclient():start(function (languageClient)
     })
 
     assert(util.equal(jsonc.decode_jsonc(util.loadFile(configPath)), {
-        ['xxxx'] = 1,
         ['Lua.diagnostics.disable'] = {
             'undefined-global',
         }
@@ -112,9 +106,7 @@ lclient():start(function (languageClient)
 
     -------------------------------
 
-    util.saveFile(configPath, jsonb.beautify {
-        ['xxxx'] = 1, -- TODO: bug of json-edit, can not be an empty json
-    })
+    util.saveFile(configPath, jsonb.beautify(json.createEmptyObject()))
 
     provider.updateConfig()
 
@@ -128,7 +120,6 @@ lclient():start(function (languageClient)
     })
 
     assert(util.equal(jsonc.decode_jsonc(util.loadFile(configPath)), {
-        ['xxxx'] = 1,
         ['Lua.runtime.special'] = {
             ['include'] = 'require',
         }
@@ -151,12 +142,11 @@ lclient():start(function (languageClient)
         }
     })
 
-    -- TODO: bug of json-edit, can not be an empty json
-    -- assert(util.equal(jsonc.decode_jsonc(util.loadFile(configPath)), {
-    --     ['Lua.runtime.special'] = {
-    --         ['include'] = 'require',
-    --     }
-    -- }))
+    assert(util.equal(jsonc.decode_jsonc(util.loadFile(configPath)), {
+        ['Lua.runtime.special'] = {
+            ['include'] = 'require',
+        }
+    }))
 
     -------------------------------