Skip to content

Commit 4943e05

Browse files
committed
Add many logs for modifying configs
#1859
1 parent 4b0d634 commit 4943e05

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

script/client.lua

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,24 +376,30 @@ local function tryModifySpecifiedConfig(uri, finalChanges)
376376
if #finalChanges == 0 then
377377
return false
378378
end
379+
log.info('tryModifySpecifiedConfig', uri, inspect(finalChanges))
379380
local workspace = require 'workspace'
380381
local scp = scope.getScope(uri)
381382
if scp:get('lastLocalType') ~= 'json' then
383+
log.info('lastLocalType ~= json')
382384
return false
383385
end
384386
local validChanges = getValidChanges(uri, finalChanges)
385387
if #validChanges == 0 then
388+
log.info('No valid changes')
386389
return false
387390
end
388391
local path = workspace.getAbsolutePath(uri, CONFIGPATH)
389392
if not path then
393+
log.info('Can not get absolute path')
390394
return false
391395
end
392396
local newJson = editConfigJson(uri, path, validChanges)
393397
if not newJson then
398+
log.info('Can not edit config json')
394399
return false
395400
end
396401
util.saveFile(path, newJson)
402+
log.info('Apply changes to config file', inspect(validChanges))
397403
removeAppliedChanges(finalChanges, validChanges)
398404
return true
399405
end
@@ -402,31 +408,38 @@ local function tryModifyRC(uri, finalChanges, create)
402408
if #finalChanges == 0 then
403409
return false
404410
end
411+
log.info('tryModifyRC', uri, inspect(finalChanges))
405412
local workspace = require 'workspace'
406413
local path = workspace.getAbsolutePath(uri, '.luarc.jsonc')
407414
if not path then
415+
log.info('Can not get absolute path of .luarc.jsonc')
408416
return false
409417
end
410418
path = fs.exists(fs.path(path)) and path or workspace.getAbsolutePath(uri, '.luarc.json')
411419
if not path then
420+
log.info('Can not get absolute path of .luarc.json')
412421
return false
413422
end
414423
local buf = util.loadFile(path)
415424
if not buf and not create then
425+
log.info('Can not load .luarc.json and not create')
416426
return false
417427
end
418428
local validChanges = getValidChanges(uri, finalChanges)
419429
if #validChanges == 0 then
430+
log.info('No valid changes')
420431
return false
421432
end
422433
if not buf then
423434
util.saveFile(path, '')
424435
end
425436
local newJson = editConfigJson(uri, path, validChanges)
426437
if not newJson then
438+
log.info('Can not edit config json')
427439
return false
428440
end
429441
util.saveFile(path, newJson)
442+
log.info('Apply changes to .luarc.json', inspect(validChanges))
430443
removeAppliedChanges(finalChanges, validChanges)
431444
return true
432445
end
@@ -435,6 +448,7 @@ local function tryModifyClient(uri, finalChanges)
435448
if #finalChanges == 0 then
436449
return false
437450
end
451+
log.info('tryModifyClient', uri, inspect(finalChanges))
438452
if not m.getOption 'changeConfiguration' then
439453
return false
440454
end
@@ -447,12 +461,14 @@ local function tryModifyClient(uri, finalChanges)
447461
end
448462
end
449463
if #scpChanges == 0 then
464+
log.info('No changes in client scope')
450465
return false
451466
end
452467
proto.notify('$/command', {
453468
command = 'lua.config',
454469
data = scpChanges,
455470
})
471+
log.info('Apply client changes', uri, inspect(scpChanges))
456472
removeAppliedChanges(finalChanges, scpChanges)
457473
return true
458474
end
@@ -462,7 +478,9 @@ local function tryModifyClientGlobal(finalChanges)
462478
if #finalChanges == 0 then
463479
return
464480
end
481+
log.info('tryModifyClientGlobal', inspect(finalChanges))
465482
if not m.getOption 'changeConfiguration' then
483+
log.info('Client dose not support modifying config')
466484
return
467485
end
468486
local changes = {}
@@ -471,10 +489,15 @@ local function tryModifyClientGlobal(finalChanges)
471489
changes[#changes+1] = change
472490
end
473491
end
492+
if #changes == 0 then
493+
log.info('No global changes')
494+
return
495+
end
474496
proto.notify('$/command', {
475497
command = 'lua.config',
476498
data = changes,
477499
})
500+
log.info('Apply client global changes', inspect(changes))
478501
removeAppliedChanges(finalChanges, changes)
479502
end
480503

@@ -522,6 +545,7 @@ function m.setConfig(changes, onlyMemory)
522545
if #finalChanges == 0 then
523546
return
524547
end
548+
log.info('Modify config', inspect(finalChanges))
525549
xpcall(function ()
526550
local ws = require 'workspace'
527551
tryModifyClientGlobal(finalChanges)
@@ -541,6 +565,7 @@ function m.setConfig(changes, onlyMemory)
541565
end
542566
if #finalChanges > 0 then
543567
m.showMessage('Warning', lang.script('CONFIG_MODIFY_FAIL', buildMaunuallyMessage(finalChanges)))
568+
log.warn('Config modify fail', inspect(finalChanges))
544569
end
545570
end
546571
end, log.error)

0 commit comments

Comments
 (0)