-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: structured parsers and diagnostics messages
Implements the requirements for #73 to show diagnsotic messages beside the lines that cause an error. A parser will need to be implemented for each runner. Structured parsing is also required for issue #70 so ultest can parse results of multiple files.
- Loading branch information
Showing
22 changed files
with
1,670 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| local M = {} | ||
|
|
||
| local api = vim.api | ||
| local diag = vim.diagnostic | ||
|
|
||
| local tracking_namespace = api.nvim_create_namespace("_ultest_diagnostic_tracking") | ||
| local diag_namespace = api.nvim_create_namespace("ultest_diagnostic") | ||
|
|
||
| ---@class NvimDiagnostic | ||
| ---@field lnum integer The starting line of the diagnostic | ||
| ---@field end_lnum integer The final line of the diagnostic | ||
| ---@field col integer The starting column of the diagnostic | ||
| ---@field end_col integer The final column of the diagnostic | ||
| ---@field severity string The severity of the diagnostic |vim.diagnostic.severity| | ||
| ---@field message string The diagnostic text | ||
| ---@field source string The source of the diagnostic | ||
|
|
||
| ---@class UltestTest | ||
| ---@field type "test" | "file" | "namespace" | ||
| ---@field id string | ||
| ---@field name string | ||
| ---@field file string | ||
| ---@field line integer | ||
| ---@field col integer | ||
| ---@field running integer | ||
| ---@field namespaces string[] | ||
| -- | ||
| ---@class UltestResult | ||
| ---@field id string | ||
| ---@field file string | ||
| ---@field code integer | ||
| ---@field output string | ||
| ---@field error_message string[] | nil | ||
| ---@field error_line integer | nil | ||
|
|
||
| local marks = {} | ||
| local error_code_lines = {} | ||
| local attached_buffers = {} | ||
|
|
||
| local function init_mark(bufnr, result) | ||
| marks[result.id] = | ||
| api.nvim_buf_set_extmark(bufnr, tracking_namespace, result.error_line - 1, 0, {end_line = result.error_line}) | ||
| error_code_lines[result.id] = api.nvim_buf_get_lines(bufnr, result.error_line - 1, result.error_line, false)[1] | ||
| end | ||
|
|
||
| local function create_diagnostics(bufnr, results) | ||
| local diagnostics = {} | ||
| for _, result in pairs(results) do | ||
| if not marks[result.id] then | ||
| init_mark(bufnr, result) | ||
| end | ||
| local mark = api.nvim_buf_get_extmark_by_id(bufnr, tracking_namespace, marks[result.id], {}) | ||
| local mark_code = api.nvim_buf_get_lines(bufnr, mark[1], mark[1] + 1, false)[1] | ||
| if mark_code == error_code_lines[result.id] then | ||
| diagnostics[#diagnostics + 1] = { | ||
| lnum = mark[1], | ||
| col = 0, | ||
| message = table.concat(result.error_message, "\n"), | ||
| source = "ultest" | ||
| } | ||
| end | ||
| end | ||
| return diagnostics | ||
| end | ||
|
|
||
| local function draw_buffer(file) | ||
| local bufnr = vim.fn.bufnr(file) | ||
| ---@type UltestResult[] | ||
| local results = api.nvim_buf_get_var(bufnr, "ultest_results") | ||
|
|
||
| local valid_results = | ||
| vim.tbl_filter( | ||
| function(result) | ||
| return result.error_line and result.error_message | ||
| end, | ||
| results | ||
| ) | ||
|
|
||
| local diagnostics = create_diagnostics(bufnr, valid_results) | ||
|
|
||
| diag.set(diag_namespace, bufnr, diagnostics) | ||
| end | ||
|
|
||
| local function clear_mark(test) | ||
| local bufnr = vim.fn.bufnr(test.file) | ||
| local mark_id = marks[test.id] | ||
| if not mark_id then | ||
| return | ||
| end | ||
| marks[test.id] = nil | ||
| api.nvim_buf_del_extmark(bufnr, tracking_namespace, mark_id) | ||
| end | ||
|
|
||
| local function attach_to_buf(file) | ||
| local bufnr = vim.fn.bufnr(file) | ||
| attached_buffers[file] = true | ||
|
|
||
| vim.api.nvim_buf_attach( | ||
| bufnr, | ||
| false, | ||
| { | ||
| on_lines = function() | ||
| draw_buffer(file) | ||
| end | ||
| } | ||
| ) | ||
| end | ||
|
|
||
| ---@param test UltestTest | ||
| function M.clear(test) | ||
| draw_buffer(test.file) | ||
| end | ||
|
|
||
| ---@param test UltestTest | ||
| ---@param result UltestResult | ||
| function M.exit(test, result) | ||
| if not attached_buffers[test.file] then | ||
| attach_to_buf(test.file) | ||
| end | ||
| clear_mark(test) | ||
|
|
||
| draw_buffer(test.file) | ||
| end | ||
|
|
||
| ---@param test UltestTest | ||
| function M.delete(test) | ||
| clear_mark(test) | ||
|
|
||
| draw_buffer(test.file) | ||
| end | ||
|
|
||
| return M |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.