emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix over-reindentation when o/O continues comments

Browse source 
This would run indent-according-to-mode after creating a new line, which
would often throw new comment lines out of whack. Now it preserves the
indentation of the originating line.

Also fixes continuation whitespace issues with evil-open-above on
C-style block comments.
This commit is contained in:
Henrik Lissner 2018-08-25 17:58:07 +02:00
parent 631c4004ba
commit b14bf99d4b
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 54 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

59
modules/feature/evil/config.el
View file

@ -127,36 +127,61 @@ line with a linewise comment.")
(advice-add #'helm-ag--find-file-action :around #'+evil*set-jump) (advice-add #'helm-ag--find-file-action :around #'+evil*set-jump)
;; Make o/O continue comments ;; Make o/O continue comments
(defun +evil*insert-newline-above-and-respect-comments (orig-fn) (defun +evil*insert-newline-above-and-respect-comments (orig-fn count)
(cl-letf* ((old-insert-newline-above (symbol-function 'evil-insert-newline-above))
((symbol-function 'evil-insert-newline-above)
(lambda ()
(if (or (not +evil-want-o/O-to-continue-comments) (if (or (not +evil-want-o/O-to-continue-comments)
(evil-insert-state-p)) (evil-insert-state-p))
(funcall orig-fn) (funcall old-insert-newline-above)
(let ((pos (save-excursion (beginning-of-line-text) (point))))
(evil-narrow-to-field (evil-narrow-to-field
(if (nth 4 (syntax-ppss (line-end-position))) (if (save-excursion (nth 4 (syntax-ppss pos)))
(evil-save-goal-column (evil-save-goal-column
(comment-beginning) (setq evil-auto-indent nil)
;; Use a dummy char to force correct indentation (goto-char pos)
(insert "_") (let ((ws (abs (skip-chars-backward " \t"))))
(save-excursion (call-interactively #'comment-indent-new-line)) ;; FIXME oh god why
(delete-char -1)) (save-excursion
(if comment-line-break-function
(funcall comment-line-break-function)
(comment-indent-new-line))
(when (and (derived-mode-p 'c-mode 'c++-mode 'objc-mode 'java-mode 'js2-mode)
(eq (char-after) ?/))
(insert "*"))
(insert
(make-string (max 0 (+ ws (skip-chars-backward " \t")))
32)))
(insert (make-string (max 1 ws) 32))))
(evil-move-beginning-of-line) (evil-move-beginning-of-line)
(insert (if use-hard-newlines hard-newline "\n")) (insert (if use-hard-newlines hard-newline "\n"))
(forward-line -1) (forward-line -1)
(back-to-indentation))))) (back-to-indentation))))))))
(advice-add #'evil-insert-newline-above :around #'+evil*insert-newline-above-and-respect-comments) (let ((evil-auto-indent evil-auto-indent))
(funcall orig-fn count))))
(advice-add #'evil-open-above :around #'+evil*insert-newline-above-and-respect-comments)
(defun +evil*insert-newline-below-and-respect-comments (orig-fn) (defun +evil*insert-newline-below-and-respect-comments (orig-fn count)
(cl-letf* ((old-insert-newline-below (symbol-function 'evil-insert-newline-below))
((symbol-function 'evil-insert-newline-below)
(lambda ()
(if (or (not +evil-want-o/O-to-continue-comments) (if (or (not +evil-want-o/O-to-continue-comments)
(evil-insert-state-p)) (evil-insert-state-p))
(funcall orig-fn) (funcall old-insert-newline-below)
(let ((comment-p (nth 4 (syntax-ppss (line-end-position))))) (let ((pos (save-excursion (beginning-of-line-text) (point))))
(evil-narrow-to-field (evil-narrow-to-field
(evil-move-end-of-line) (evil-move-end-of-line)
(if comment-p (cond ((sp-point-in-comment pos)
(comment-indent-new-line) (setq evil-auto-indent nil)
(if comment-line-break-function
(funcall comment-line-break-function)
(comment-indent-new-line)))
(t
(insert (if use-hard-newlines hard-newline "\n")) (insert (if use-hard-newlines hard-newline "\n"))
(back-to-indentation)))))) (back-to-indentation)))))))))
(advice-add #'evil-insert-newline-below :around #'+evil*insert-newline-below-and-respect-comments) (let ((evil-auto-indent evil-auto-indent))
(funcall orig-fn count))))
(advice-add #'evil-open-below :around #'+evil*insert-newline-below-and-respect-comments)
;; --- custom interactive codes ----------- ;; --- custom interactive codes -----------
;; These arg types will highlight matches in the current buffer ;; These arg types will highlight matches in the current buffer