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

lang/ruby: update rspec-mode integration

Browse source 
Prompted by upstream updates.
This commit is contained in:
Henrik Lissner 2018-08-03 18:07:31 +02:00
parent 0b130d7b9a
commit 0c36b4450e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/lang/ruby/config.el
View file

@ -69,9 +69,6 @@
(def-package! rspec-mode
:mode ("/\\.rspec\\'" . text-mode)
:init
(associate! rspec-mode :match "/\\.rspec$")
(associate! rspec-mode :modes (enh-ruby-mode yaml-mode) :files ("spec/"))
(defvar evilmi-ruby-match-tags
'((("unless" "if") ("elsif" "else") "end")
("begin" ("rescue" "ensure") "end")
@ -80,14 +77,20 @@
;; Rake
(("task" "namespace") () "end")))
;; This package autoloads this advice, but does not autoload the advice
;; function, causing void-symbol errors when using the compilation buffer
;; (even for things unrelated to ruby/rspec). Even if the function were
;; autoloaded, it seems silly to add this advice before rspec-mode is loaded,
;; so remove it anyway!
(advice-remove 'compilation-buffer-name #'rspec-compilation-buffer-name-wrapper)
(unless (featurep! :feature evil)
(setq rspec-verifiable-mode-keymap (make-sparse-keymap) "TODO")
(setq rspec-mode-keymap (make-sparse-keymap) "TODO"))
(defun +ruby*init-appropriate-rspec-mode ()
"TODO"
(cond ((rspec-buffer-is-spec-p)
(rspec-mode +1))
((let ((proot (doom-project-root 'nocache)))
(or (file-directory-p (expand-file-name "spec" proot))
(file-exists-p (expand-file-name ".rspec" proot))))
(rspec-verifiable-mode +1))))
(advice-add #'rspec-enable-appropriate-mode :override #'+ruby*init-appropriate-rspec-mode)
:config
(remove-hook 'enh-ruby-mode-hook #'rspec-enable-appropriate-mode)
(map! :map (rspec-mode-map rspec-verifiable-mode-map)
:localleader
:prefix "t"