Skip to content

Split long lines in diagnostics #348

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

Merged
merged 2 commits into from
Dec 9, 2019
Merged

Split long lines in diagnostics #348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
565f9e0
Split long lines in diagnostics
chessman Dec 6, 2019
0792b4c
Fix blank lines in diagnostics multiline messages
chessman Dec 6, 2019
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
24 changes: 21 additions & 3 deletions lsp-ui-sideline.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ when user changes current point."
:type 'integer
:group 'lsp-ui-sideline)

(defcustom lsp-ui-sideline-diagnostic-max-line-length 100
"Maximum line length of diagnostics in sideline."
:type 'integer
:group 'lsp-ui-sideline)

(defcustom lsp-ui-sideline-actions-kind-regex "quickfix.*\\|refactor.*"
"Regex for the code actions kinds to show in the sideline."
:type 'string
Expand Down Expand Up @@ -181,7 +186,7 @@ BOL & EOL are beginning and ending of the user point line.
if UP is non-nil, it loops on the previous lines.
if OFFSET is non-nil, it starts search OFFSET lines from user point line."
(let ((win-width (lsp-ui-sideline--window-width))
(index (if (null offset) 1 (1+ offset)))
(index (if (null offset) 1 offset))
pos)
(while (and (null pos) (<= (abs index) 30))
(setq index (if up (1- index) (1+ index)))
Expand Down Expand Up @@ -318,14 +323,27 @@ CURRENT is non-nil when the point is on the symbol."
(when (overlay-get ov 'current)
(lsp-ui-sideline--toggle-current ov nil))))))

(defun lsp-ui-sideline--split-long-lines (lines)
"Fill LINES so that they are not longer than `lsp-ui-sideline-diagnostic-max-line-length' characters."
(mapcan (lambda (line)
(if (< (length line) lsp-ui-sideline-diagnostic-max-line-length)
(list line)
(with-temp-buffer
(let ((fill-column lsp-ui-sideline-diagnostic-max-line-length))
(insert line)
(fill-region (point-min) (point-max))
(split-string (buffer-string) "\n")))))
lines))

(defun lsp-ui-sideline--diagnostics (bol eol)
"Show diagnostics on the current line."
(when (bound-and-true-p flycheck-mode)
(dolist (e (flycheck-overlay-errors-in bol (1+ eol)))
(let* ((lines (--> (flycheck-error-format-message-and-id e)
(split-string it "\n")))
(split-string it "\n")
(lsp-ui-sideline--split-long-lines it)))
(display-lines (butlast lines (- (length lines) lsp-ui-sideline-diagnostic-max-lines)))
(offset 0))
(offset 1))
(dolist (line display-lines)
(let* ((message (string-trim (replace-regexp-in-string "[\t ]+" " " line)))
(len (length message))
Expand Down