Skip to content

Commit dec44dd

Browse files
committed
feat: add --check_format=json|pretty
Adds a new CLI option --check_format which accepts the values: 'json' (current behaviour), and a new 'pretty' value which prints a colorized human readable report to stdout, similar to common compilers and linters. Results are printed with color unless NO_COLOR is defined in the users environment, as per https://no-color.org. If --check_out_path is provided, then the results are always saved to file regardless of the --check_format value.
1 parent 5275a75 commit dec44dd

File tree

10 files changed

+151
-30
lines changed

10 files changed

+151
-30
lines changed

changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
cfgs[2] = {} -- only warns missing `b`
3131
```
3232
This enables the previous missing field check behavior before [#2970](https://github.com/LuaLS/lua-language-server/issues/2970)
33+
* `NEW` Added `--check_format=json|pretty` for use with `--check` to output diagnostics in a human readable format.
3334

3435
## 3.13.5
3536
`2024-12-20`

locale/en-us/script.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,10 @@ CLI_CHECK_SUCCESS =
648648
'Diagnosis completed, no problems found'
649649
CLI_CHECK_PROGRESS =
650650
'Found {} problems in {} files'
651-
CLI_CHECK_RESULTS =
651+
CLI_CHECK_RESULTS_OUTPATH =
652652
'Diagnosis complete, {} problems found, see {}'
653+
CLI_CHECK_RESULTS_PRETTY =
654+
'Diagnosis complete, {} problems found'
653655
CLI_CHECK_MULTIPLE_WORKERS =
654656
'Starting {} worker tasks, progress output will be disabled. This may take a few minutes.'
655657
CLI_DOC_INITING =

locale/ja-jp/script.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,10 @@ CLI_CHECK_SUCCESS =
649649
'診断が完了しました。問題は見つかりませんでした'
650650
CLI_CHECK_PROGRESS =
651651
'{} ファイルに渡り、{} 個の問題が発見されました'
652-
CLI_CHECK_RESULTS =
652+
CLI_CHECK_RESULTS_OUTPATH =
653653
'診断が完了しました。{} 個の問題が発見されました。詳しくは {} をご確認ください'
654+
CLI_CHECK_RESULTS_PRETTY =
655+
'診断が完了しました。{} 個の問題が発見されました'
654656
CLI_CHECK_MULTIPLE_WORKERS =
655657
'{} 個のワーカータスクを開始しているため、進行状況の出力が無効になります。完了まで数分かかることがあります。'
656658
CLI_DOC_INITING =

locale/pt-br/script.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,10 @@ CLI_CHECK_SUCCESS =
648648
'Diagnóstico completo, nenhum problema encontrado'
649649
CLI_CHECK_PROGRESS = -- TODO: need translate!
650650
'Found {} problems in {} files'
651-
CLI_CHECK_RESULTS =
651+
CLI_CHECK_RESULTS_OUTPATH =
652652
'Diagnóstico completo, {} problemas encontrados, veja {}'
653+
CLI_CHECK_RESULTS_PRETTY =
654+
'Diagnóstico completo, {} problemas encontrados'
653655
CLI_CHECK_MULTIPLE_WORKERS = -- TODO: need translate!
654656
'Starting {} worker tasks, progress output will be disabled. This may take a few minutes.'
655657
CLI_DOC_INITING = -- TODO: need translate!

locale/zh-cn/script.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,10 @@ CLI_CHECK_SUCCESS =
648648
'诊断完成,没有发现问题'
649649
CLI_CHECK_PROGRESS =
650650
'检测到问题 {} 在文件 {} 中'
651-
CLI_CHECK_RESULTS =
651+
CLI_CHECK_RESULTS_OUTPATH =
652652
'诊断完成,共有 {} 个问题,请查看 {}'
653+
CLI_CHECK_RESULTS_PRETTY =
654+
'诊断完成,共有 {} 个问题'
653655
CLI_CHECK_MULTIPLE_WORKERS =
654656
'开启 {} 个工作任务,进度输出将会被禁用。这可能会花费几分钟。'
655657
CLI_DOC_INITING =

locale/zh-tw/script.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,10 @@ CLI_CHECK_SUCCESS =
648648
'診斷完成,沒有發現問題'
649649
CLI_CHECK_PROGRESS = -- TODO: need translate!
650650
'Found {} problems in {} files'
651-
CLI_CHECK_RESULTS =
651+
CLI_CHECK_RESULTS_OUTPATH =
652652
'診斷完成,共有 {} 個問題,請查看 {}'
653+
CLI_CHECK_RESULTS_PRETTY =
654+
'診斷完成,共有 {} 個問題'
653655
CLI_CHECK_MULTIPLE_WORKERS = -- TODO: need translate!
654656
'Starting {} worker tasks, progress output will be disabled. This may take a few minutes.'
655657
CLI_DOC_INITING = -- TODO: need translate!

script/cli/check.lua

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function export.runCLI()
4949
args[#args + 1] = '--thread_id'
5050
args[#args + 1] = tostring(threadId)
5151
if numThreads > 1 then
52-
args[#args + 1] = '--quiet'
52+
args[#args + 1] = '--quietworker'
5353
args[#args + 1] = '--check_out_path'
5454
args[#args + 1] = logFileForThread(threadId)
5555
end
@@ -76,11 +76,6 @@ function export.runCLI()
7676
checkPassed = process:wait() == 0 and checkPassed
7777
end
7878

79-
local outpath = CHECK_OUT_PATH
80-
if outpath == nil then
81-
outpath = LOGPATH .. '/check.json'
82-
end
83-
8479
if numThreads > 1 then
8580
local mergedResults = {}
8681
local count = 0
@@ -95,11 +90,15 @@ function export.runCLI()
9590
end
9691
end
9792
end
93+
94+
local outpath = CHECK_OUT_PATH or LOGPATH .. '/check.json'
9895
util.saveFile(outpath, jsonb.beautify(mergedResults))
99-
if count == 0 then
100-
print(lang.script('CLI_CHECK_SUCCESS'))
101-
else
102-
print(lang.script('CLI_CHECK_RESULTS', count, outpath))
96+
if not QUIET then
97+
if count == 0 then
98+
print(lang.script('CLI_CHECK_SUCCESS'))
99+
else
100+
print(lang.script('CLI_CHECK_RESULTS_OUTPATH', count, outpath))
101+
end
103102
end
104103
end
105104
return checkPassed and 0 or 1

script/cli/check_worker.lua

Lines changed: 112 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,95 @@ require 'vm'
1717

1818
local export = {}
1919

20+
local colors
21+
22+
if not os.getenv('NO_COLOR') then
23+
colors = {
24+
red = '\27[31m',
25+
green = '\27[32m',
26+
yellow = '\27[33m',
27+
blue = '\27[34m',
28+
magenta = '\27[35m',
29+
white = '\27[37m',
30+
grey = '\27[90m',
31+
reset = '\27[0m'
32+
}
33+
else
34+
colors = {
35+
red = '',
36+
green = '',
37+
yellow = '',
38+
blue = '',
39+
magenta = '',
40+
white = '',
41+
grey = '',
42+
reset = ''
43+
}
44+
end
45+
46+
--- @type table<DiagnosticSeverity, string>
47+
local severity_colors = {
48+
Error = colors.red,
49+
Warning = colors.yellow,
50+
Information = colors.white,
51+
Hint = colors.white,
52+
}
53+
54+
local severity_str = {} --- @type table<integer,DiagnosticSeverity>
55+
for k, v in pairs(define.DiagnosticSeverity) do
56+
severity_str[v] = k
57+
end
58+
59+
local function report_pretty(uri, diags)
60+
local path = furi.relpath(furi.decode(uri))
61+
62+
local lines = {} --- @type string[]
63+
pcall(function()
64+
for line in io.lines(path) do
65+
table.insert(lines, line)
66+
end
67+
end)
68+
69+
for _, d in ipairs(diags) do
70+
local rstart = d.range.start
71+
local rend = d.range['end']
72+
local severity = severity_str[d.severity]
73+
print(
74+
('%s%s:%s:%s%s [%s%s%s] %s %s(%s)%s'):format(
75+
colors.blue,
76+
path,
77+
rstart.line + 1, -- Use 1-based indexing
78+
rstart.character + 1, -- Use 1-based indexing
79+
colors.reset,
80+
severity_colors[severity],
81+
severity,
82+
colors.reset,
83+
d.message,
84+
colors.magenta,
85+
d.code,
86+
colors.reset
87+
)
88+
)
89+
if #lines > 0 then
90+
io.write(' ', lines[rstart.line + 1], '\n')
91+
io.write(' ', colors.grey, (' '):rep(rstart.character), '^')
92+
if rstart.line == rend.line then
93+
io.write(('^'):rep(rend.character - rstart.character - 1))
94+
end
95+
io.write(colors.reset, '\n')
96+
end
97+
end
98+
end
99+
100+
local function clear_line()
101+
-- Write out empty space to ensure that the previous lien is cleared.
102+
io.write('\x0D', (' '):rep(80), '\x0D')
103+
end
104+
105+
local function quiet()
106+
return QUIET or QUIET_WORKER
107+
end
108+
20109
function export.runCLI()
21110
lang(LOCALE)
22111

@@ -65,9 +154,14 @@ function export.runCLI()
65154

66155
client:register('textDocument/publishDiagnostics', function (params)
67156
results[params.uri] = params.diagnostics
157+
-- Do not check QUIET_WORKER here, so results are printed as they are found.
158+
if not QUIET and (CHECK_FORMAT == nil or CHECK_FORMAT == 'pretty') then
159+
clear_line()
160+
report_pretty(params.uri, params.diagnostics)
161+
end
68162
end)
69163

70-
if not QUIET then
164+
if not quiet() then
71165
io.write(lang.script('CLI_CHECK_INITING'))
72166
end
73167

@@ -89,14 +183,14 @@ function export.runCLI()
89183

90184
-- Downgrade file opened status to Opened for everything to avoid reporting during compilation on files that do not belong to this thread
91185
local diagStatus = config.get(rootUri, 'Lua.diagnostics.neededFileStatus')
92-
for diag, status in pairs(diagStatus) do
186+
for d, status in pairs(diagStatus) do
93187
if status == 'Any' or status == 'Any!' then
94-
diagStatus[diag] = 'Opened!'
188+
diagStatus[d] = 'Opened!'
95189
end
96190
end
97-
for diag, status in pairs(protoDiag.getDefaultStatus()) do
191+
for d, status in pairs(protoDiag.getDefaultStatus()) do
98192
if status == 'Any' or status == 'Any!' then
99-
diagStatus[diag] = 'Opened!'
193+
diagStatus[d] = 'Opened!'
100194
end
101195
end
102196
config.set(rootUri, 'Lua.diagnostics.neededFileStatus', diagStatus)
@@ -109,7 +203,7 @@ function export.runCLI()
109203
files.open(uri)
110204
diag.doDiagnostic(uri, true)
111205
-- Print regularly but always print the last entry to ensure that logs written to files don't look incomplete.
112-
if (os.clock() - lastClock > 0.2 or i == #uris) and not QUIET then
206+
if not quiet() and (os.clock() - lastClock > 0.2 or i == #uris) then
113207
lastClock = os.clock()
114208
client:update()
115209
local output = '\x0D'
@@ -133,8 +227,8 @@ function export.runCLI()
133227
end
134228
end
135229
end
136-
if not QUIET then
137-
io.write('\x0D')
230+
if not quiet() then
231+
clear_line()
138232
end
139233
end)
140234

@@ -146,18 +240,21 @@ function export.runCLI()
146240
end
147241
end
148242

149-
local outpath = CHECK_OUT_PATH
150-
if outpath == nil then
151-
outpath = LOGPATH .. '/check.json'
243+
local outpath = nil
244+
245+
if CHECK_FORMAT == 'json' or CHECK_OUT_PATH then
246+
outpath = CHECK_OUT_PATH or LOGPATH .. '/check.json'
247+
-- Always write result, even if it's empty to make sure no one accidentally looks at an old output after a successful run.
248+
util.saveFile(outpath, jsonb.beautify(results))
152249
end
153-
-- Always write result, even if it's empty to make sure no one accidentally looks at an old output after a successful run.
154-
util.saveFile(outpath, jsonb.beautify(results))
155250

156-
if not QUIET then
251+
if not quiet() then
157252
if count == 0 then
158253
print(lang.script('CLI_CHECK_SUCCESS'))
254+
elseif outpath then
255+
print(lang.script('CLI_CHECK_RESULTS_OUTPATH', count, outpath))
159256
else
160-
print(lang.script('CLI_CHECK_RESULTS', count, outpath))
257+
print(lang.script('CLI_CHECK_RESULTS_PRETTY', count))
161258
end
162259
end
163260
return count == 0 and 0 or 1

script/file-uri.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,14 @@ function m.normalize(uri)
115115
return m.encode(m.decode(uri))
116116
end
117117

118+
---@param path string
119+
---@return string
120+
function m.relpath(path)
121+
local pwd = platform.os == 'windows' and os.getenv('CD') or os.getenv('PWD')
122+
if pwd and path:sub(1, #pwd) == pwd then
123+
path = path:sub(#pwd + 2)
124+
end
125+
return path
126+
end
127+
118128
return m

script/global.d.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ CHECKLEVEL = 'Warning'
6969
---@type string|nil
7070
CHECK_OUT_PATH = ''
7171

72+
---@type string | 'json' | 'pretty'
73+
CHECK_FORMAT = 'pretty'
74+
7275
---@type 'trace' | 'debug' | 'info' | 'warn' | 'error'
7376
LOGLEVEL = 'warn'
7477

@@ -106,3 +109,4 @@ THREAD_ID = 1
106109
CHECK_WORKER = ''
107110

108111
QUIET = false
112+
QUIET_WORKER = false

0 commit comments

Comments
 (0)