Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add 'full' for line_width in diagnostics options #2452

Merged
merged 4 commits into from
Sep 3, 2023
Merged

add 'full' for line_width in diagnostics options #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f290a25
add 'full' for line_width in diagnostics options
blue-pitaya Apr 6, 2023
4f3fb0e
lowercase documentation entry and change error notify method
blue-pitaya Jun 22, 2023
90c070e
Merge branch 'nvim-telescope:master' into full-diagnostic-message
blue-pitaya Aug 30, 2023
580ec0d
moved line_width options checking
blue-pitaya Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lua/telescope/builtin/__diagnostics.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@ diagnostics.get = function(opts)
return
end

if type(opts.line_width) == "string" and opts.line_width ~= "full" then
utils.notify("builtin.diagnostics", {
msg = string.format("'%s' is not a valid value for line_width", opts.line_width),
level = "ERROR",
})
return
end

opts.path_display = vim.F.if_nil(opts.path_display, "hidden")
pickers
.new(opts, {
Expand Down
2 changes: 1 addition & 1 deletion lua/telescope/builtin/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ builtin.lsp_dynamic_workspace_symbols = require_on_exported_call("telescope.buil
---@field root_dir string|boolean: if set to string, get diagnostics only for buffers under this dir otherwise cwd
---@field no_unlisted boolean: if true, get diagnostics only for listed buffers
---@field no_sign boolean: hide DiagnosticSigns from Results (default: false)
---@field line_width number: set length of diagnostic entry text in Results
---@field line_width string|number: set length of diagnostic entry text in Results. Use 'full' for full untruncated text
---@field namespace number: limit your diagnostics to a specific namespace
---@field disable_coordinates boolean: don't show the line & row numbers (default: false)
---@field sort_by string: sort order of the diagnostics results; see above notes (default: "buffer")
Expand Down
6 changes: 5 additions & 1 deletion lua/telescope/make_entry.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,9 +1164,13 @@ function make_entry.gen_from_diagnostics(opts)
{ remaining = true },
}
local line_width = vim.F.if_nil(opts.line_width, 0.5)
local line_width_opts = { width = line_width }
if type(line_width) == "string" and line_width == "full" then
line_width_opts = {}
end
local hidden = utils.is_path_hidden(opts)
if not hidden then
table.insert(display_items, 2, { width = line_width })
table.insert(display_items, 2, line_width_opts)
end
local displayer = entry_display.create {
separator = "▏",
Expand Down