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

Fix embrace/evil-surround rules for angular brackets

Browse source 
This fixes surround keys for <>'s in languages that support
type<syntax>, like rust, c++, c#, etc.
This commit is contained in:
Henrik Lissner 2020-01-06 22:44:31 -05:00
parent b7c5152f3a
commit c6ebf4b4be
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/editor/evil/config.el
View file

@ -241,7 +241,7 @@ directives. By default, this only recognizes C directives.")
:hook ((lisp-mode emacs-lisp-mode clojure-mode racket-mode) :hook ((lisp-mode emacs-lisp-mode clojure-mode racket-mode)
. +evil-embrace-lisp-mode-hook-h) . +evil-embrace-lisp-mode-hook-h)
:hook ((org-mode LaTeX-mode) . +evil-embrace-latex-mode-hook-h) :hook ((org-mode LaTeX-mode) . +evil-embrace-latex-mode-hook-h)
:hook ((c++-mode rust-mode rustic-mode csharp-mode java-mode swift-mode typescript-mode) :hook ((c++-mode rustic-mode csharp-mode java-mode swift-mode typescript-mode)
. +evil-embrace-angle-bracket-modes-hook-h) . +evil-embrace-angle-bracket-modes-hook-h)
:init :init
(after! evil-surround (after! evil-surround
@ -253,6 +253,8 @@ directives. By default, this only recognizes C directives.")
(embrace-add-pair-regexp ?l "\\[a-z]+{" "}" #'+evil--embrace-latex)) (embrace-add-pair-regexp ?l "\\[a-z]+{" "}" #'+evil--embrace-latex))
(defun +evil-embrace-lisp-mode-hook-h () (defun +evil-embrace-lisp-mode-hook-h ()
;; Avoid `embrace-add-pair-regexp' because it would overwrite the default
;; `f' rule, which we want for other modes
(push (cons ?f (make-embrace-pair-struct (push (cons ?f (make-embrace-pair-struct
:key ?f :key ?f
:read-function #'+evil--embrace-elisp-fn :read-function #'+evil--embrace-elisp-fn
@ -261,14 +263,11 @@ directives. By default, this only recognizes C directives.")
embrace--pairs-list)) embrace--pairs-list))
(defun +evil-embrace-angle-bracket-modes-hook-h () (defun +evil-embrace-angle-bracket-modes-hook-h ()
(set (make-local-variable 'evil-embrace-evil-surround-keys) (let ((var (make-local-variable 'evil-embrace-evil-surround-keys)))
(delq ?< evil-embrace-evil-surround-keys)) (set var (delq ?< evil-embrace-evil-surround-keys))
(push (cons ?< (make-embrace-pair-struct (set var (delq ?> evil-embrace-evil-surround-keys)))
:key ?< (embrace-add-pair-regexp ?< "\\_<[a-z0-9-_]+<" ">" #'+evil--embrace-angle-brackets)
:read-function #'+evil--embrace-angle-brackets (embrace-add-pair ?> "<" ">"))
:left-regexp "\\[a-z]+<"
:right-regexp ">"))
embrace--pairs-list))
;; Add escaped-sequence support to embrace ;; Add escaped-sequence support to embrace
(setf (alist-get ?\\ (default-value 'embrace--pairs-list)) (setf (alist-get ?\\ (default-value 'embrace--pairs-list))