Remove flycheck and flymake for eglot.
This commit is contained in:
parent
d683d3cbf7
commit
330063d212
@ -14,141 +14,11 @@
|
|||||||
(html-mode . eglot-ensure))
|
(html-mode . eglot-ensure))
|
||||||
:config
|
:config
|
||||||
(add-to-list 'eglot-server-programs '(php-mode . ("intelephense" "--stdio")))
|
(add-to-list 'eglot-server-programs '(php-mode . ("intelephense" "--stdio")))
|
||||||
|
;; (add-to-list 'eglot-server-programs '(css-mode . ("vscode-css-language-server" "--stdio")))
|
||||||
|
;; (add-to-list 'eglot-server-programs '(html-mode . ("vscode-html-language-server" "--stdio")))
|
||||||
|
|
||||||
|
(add-hook 'eglot--managed-mode-hook (lambda () (flymake-mode -1)))
|
||||||
;; Integrate flycheck and eglot (code from doomemacs)
|
)
|
||||||
(cl-defstruct (flycheck-error
|
|
||||||
(:constructor flycheck-error-new)
|
|
||||||
(:constructor flycheck-error-new-at
|
|
||||||
(line column
|
|
||||||
&optional level message
|
|
||||||
&key checker id group beg-pos end-pos end-line end-column
|
|
||||||
(filename (buffer-file-name))
|
|
||||||
(buffer (current-buffer)))))
|
|
||||||
"Structure representing an error reported by a syntax checker.
|
|
||||||
Slots:
|
|
||||||
`buffer'
|
|
||||||
The buffer that the error was reported for, as buffer object.
|
|
||||||
`checker'
|
|
||||||
The syntax checker which reported this error, as symbol.
|
|
||||||
`filename'
|
|
||||||
The file name the error refers to, as string.
|
|
||||||
`line'
|
|
||||||
The line number the error refers to, as number.
|
|
||||||
`column' (optional)
|
|
||||||
The column number the error refers to, as number.
|
|
||||||
For compatibility with external tools and unlike Emacs
|
|
||||||
itself (e.g. in Compile Mode) Flycheck uses _1-based_
|
|
||||||
columns: The first character on a line is column 1.
|
|
||||||
Occasionally some tools try to proactively adapt to Emacs
|
|
||||||
and emit 0-based columns automatically. In these cases, the
|
|
||||||
columns must be adjusted for Flycheck, see
|
|
||||||
`flycheck-increment-error-columns'.
|
|
||||||
`beg-pos' (optional)
|
|
||||||
The begining position of the error, if provided by the checker.
|
|
||||||
`end-pos' (optional)
|
|
||||||
The end position of the error, if provided by the checker.
|
|
||||||
`end-line' (optional)
|
|
||||||
The end line of the error, if provided by the checker.
|
|
||||||
`end-column' (optional)
|
|
||||||
The end column of the error, if provided by the checker.
|
|
||||||
`message' (optional)
|
|
||||||
The error message as a string, if any.
|
|
||||||
`level'
|
|
||||||
The error level, as either `info', `warning' or `error'.
|
|
||||||
`id' (optional)
|
|
||||||
An ID identifying the kind of error.
|
|
||||||
`group` (optional)
|
|
||||||
A symbol identifying the group the error belongs to.
|
|
||||||
Some tools will emit multiple errors that relate to the same
|
|
||||||
issue (e.g., lifetime errors in Rust). All related errors
|
|
||||||
collected by a checker should have the same `group` value,
|
|
||||||
in order to be able to present them to the user.
|
|
||||||
See `flycheck-related-errors`."
|
|
||||||
buffer checker filename line column message level id group beg-pos end-pos end-line end-column)
|
|
||||||
|
|
||||||
(defun flycheck-error-thing-region (thing err)
|
|
||||||
"Get the region of THING at the column of ERR.
|
|
||||||
ERR is a Flycheck error whose region to get. THING is a
|
|
||||||
understood by `thing-at-point'.
|
|
||||||
If the error has beg-pos and end-pos in it, use them. Otherwise,
|
|
||||||
return a cons cell `(BEG . END)' where BEG is the beginning of
|
|
||||||
the THING at the error column, and END the end of the symbol. If
|
|
||||||
ERR has no error column, or if there is no THING at this column,
|
|
||||||
return nil."
|
|
||||||
(-when-let (column (car (flycheck-error-column-region err)))
|
|
||||||
(flycheck-error-with-buffer err
|
|
||||||
(save-excursion
|
|
||||||
(save-restriction
|
|
||||||
(widen)
|
|
||||||
(goto-char column)
|
|
||||||
(or
|
|
||||||
(and (flycheck-error-end-pos err)
|
|
||||||
(flycheck-error-beg-pos err)
|
|
||||||
(cons (flycheck-error-beg-pos err)
|
|
||||||
(flycheck-error-end-pos err)))
|
|
||||||
(bounds-of-thing-at-point thing)))))))
|
|
||||||
|
|
||||||
(defvar-local flycheck-eglot-current-errors nil)
|
|
||||||
|
|
||||||
(defun flycheck-position-to-line-column (point)
|
|
||||||
"Return a (LINE . COLUMN) cons corresponding to POINT."
|
|
||||||
(let ((inhibit-field-text-motion t))
|
|
||||||
(save-excursion
|
|
||||||
(goto-char point)
|
|
||||||
(cons (line-number-at-pos) (1+ (- (point) (line-beginning-position)))))))
|
|
||||||
|
|
||||||
(defun flycheck-eglot-report-fn (diags &rest _)
|
|
||||||
"Convert flymake eglot errors to flycheck errors.
|
|
||||||
DIAGS are the diags that flymake provided."
|
|
||||||
(setq flycheck-eglot-current-errors
|
|
||||||
(mapcar (lambda (diag)
|
|
||||||
(save-excursion
|
|
||||||
(goto-char (flymake--diag-beg diag))
|
|
||||||
(flycheck-error-new-at (line-number-at-pos) ;; will be ignored
|
|
||||||
(1+ (current-column)) ;; will be ignored
|
|
||||||
(pcase (flymake--diag-type diag)
|
|
||||||
('eglot-error 'error)
|
|
||||||
('eglot-warning 'warning)
|
|
||||||
('eglot-note 'info)
|
|
||||||
(_ (error "Unknown diag type, %S" diag)))
|
|
||||||
(flymake--diag-text diag)
|
|
||||||
:checker 'eglot
|
|
||||||
:end-line (car (flycheck-position-to-line-column (flymake--diag-end diag)))
|
|
||||||
:end-column (cdr (flycheck-position-to-line-column (flymake--diag-end diag)))
|
|
||||||
:beg-pos (copy-marker (flymake--diag-beg diag) t)
|
|
||||||
:end-pos (copy-marker (flymake--diag-end diag)))))
|
|
||||||
diags))
|
|
||||||
(flycheck-buffer))
|
|
||||||
|
|
||||||
(defun flycheck-eglot--start (checker callback)
|
|
||||||
"Clean up errors when done.
|
|
||||||
CHECKER is the checker, which is unused because we know that it
|
|
||||||
is eglot. CALLBACK is the function that we need to call when we
|
|
||||||
are done, on all the errors."
|
|
||||||
(funcall callback 'finished flycheck-eglot-current-errors))
|
|
||||||
|
|
||||||
(defun flycheck-eglot--available-p ()
|
|
||||||
(bound-and-true-p eglot--managed-mode))
|
|
||||||
|
|
||||||
(flycheck-define-generic-checker 'eglot
|
|
||||||
"Report `eglot' diagnostics using `flycheck'."
|
|
||||||
:start #'flycheck-eglot--start
|
|
||||||
:predicate #'flycheck-eglot--available-p
|
|
||||||
:modes '(prog-mode text-mode))
|
|
||||||
|
|
||||||
(push 'eglot flycheck-checkers)
|
|
||||||
|
|
||||||
(defun +doom/eglot-prefer-flycheck-h ()
|
|
||||||
(when eglot--managed-mode
|
|
||||||
(when-let ((current-checker (flycheck-get-checker-for-buffer)))
|
|
||||||
(flycheck-add-next-checker 'eglot current-checker))
|
|
||||||
(flycheck-add-mode 'eglot major-mode)
|
|
||||||
(flycheck-mode 1)
|
|
||||||
(flymake-mode -1)
|
|
||||||
(setq eglot--current-flymake-report-fn 'flycheck-eglot-report-fn)))
|
|
||||||
|
|
||||||
(add-hook 'eglot--managed-mode-hook #'+doom/eglot-prefer-flycheck-h))
|
|
||||||
|
|
||||||
;; Emmet (mientras veo como hacer funcionar emmet-ls)
|
;; Emmet (mientras veo como hacer funcionar emmet-ls)
|
||||||
(use-package emmet-mode
|
(use-package emmet-mode
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user