Skip to content

Commit 74425be

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 74425be

File tree

9 files changed

+128
-16
lines changed

9 files changed

+128
-16
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_worker.lua

Lines changed: 99 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,86 @@ 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+
grey = '\27[90m',
30+
reset = '\27[0m'
31+
}
32+
else
33+
colors = {
34+
red = '',
35+
green = '',
36+
yellow = '',
37+
blue = '',
38+
magenta = '',
39+
grey = '',
40+
reset = ''
41+
}
42+
end
43+
44+
local severity_colors = {
45+
[1] = colors.red,
46+
[2] = colors.yellow,
47+
[3] = colors.blue,
48+
[4] = colors.green,
49+
}
50+
51+
local severity_str = {
52+
[1] = 'error',
53+
[2] = 'warning',
54+
[3] = 'info',
55+
[4] = 'hint'
56+
}
57+
58+
local function report_pretty(results)
59+
for f, diags in pairs(results) do
60+
local path = furi.relpath(furi.decode(f))
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+
print(
73+
('%s%s:%s:%s%s [%s%s%s] %s %s(%s)%s'):format(
74+
colors.blue,
75+
path,
76+
rstart.line,
77+
rstart.character,
78+
colors.reset,
79+
severity_colors[d.severity],
80+
severity_str[d.severity],
81+
colors.reset,
82+
d.message,
83+
colors.magenta,
84+
d.code,
85+
colors.reset
86+
)
87+
)
88+
if #lines > 0 then
89+
io.write(' ', lines[rstart.line + 1], '\n')
90+
io.write(' ', colors.grey, (' '):rep(rstart.character), '^')
91+
if rstart.line == rend.line then
92+
io.write(('^'):rep(rend.character - rstart.character - 1))
93+
end
94+
io.write(colors.reset, '\n')
95+
end
96+
end
97+
end
98+
end
99+
20100
function export.runCLI()
21101
lang(LOCALE)
22102

@@ -89,14 +169,14 @@ function export.runCLI()
89169

90170
-- Downgrade file opened status to Opened for everything to avoid reporting during compilation on files that do not belong to this thread
91171
local diagStatus = config.get(rootUri, 'Lua.diagnostics.neededFileStatus')
92-
for diag, status in pairs(diagStatus) do
172+
for d, status in pairs(diagStatus) do
93173
if status == 'Any' or status == 'Any!' then
94-
diagStatus[diag] = 'Opened!'
174+
diagStatus[d] = 'Opened!'
95175
end
96176
end
97-
for diag, status in pairs(protoDiag.getDefaultStatus()) do
177+
for d, status in pairs(protoDiag.getDefaultStatus()) do
98178
if status == 'Any' or status == 'Any!' then
99-
diagStatus[diag] = 'Opened!'
179+
diagStatus[d] = 'Opened!'
100180
end
101181
end
102182
config.set(rootUri, 'Lua.diagnostics.neededFileStatus', diagStatus)
@@ -134,7 +214,8 @@ function export.runCLI()
134214
end
135215
end
136216
if not QUIET then
137-
io.write('\x0D')
217+
-- Write out empty space to ensure that the progress bar is cleared.
218+
io.write('\x0D', (' '):rep(80), '\x0D')
138219
end
139220
end)
140221

@@ -146,18 +227,25 @@ function export.runCLI()
146227
end
147228
end
148229

149-
local outpath = CHECK_OUT_PATH
150-
if outpath == nil then
151-
outpath = LOGPATH .. '/check.json'
230+
local outpath = nil
231+
232+
if CHECK_FORMAT == nil or CHECK_FORMAT == 'pretty' then
233+
report_pretty(results)
234+
end
235+
236+
if CHECK_FORMAT == 'json' or CHECK_OUT_PATH then
237+
outpath = CHECK_OUT_PATH or LOGPATH .. '/check.json'
238+
-- Always write result, even if it's empty to make sure no one accidentally looks at an old output after a successful run.
239+
util.saveFile(outpath, jsonb.beautify(results))
152240
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))
155241

156242
if not QUIET then
157243
if count == 0 then
158244
print(lang.script('CLI_CHECK_SUCCESS'))
245+
elseif outpath then
246+
print(lang.script('CLI_CHECK_RESULTS_OUTPATH', count, outpath))
159247
else
160-
print(lang.script('CLI_CHECK_RESULTS', count, outpath))
248+
print(lang.script('CLI_CHECK_RESULTS_PRETTY', count))
161249
end
162250
end
163251
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: 3 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

0 commit comments

Comments
 (0)