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

Massive refactor. Refactor all the things

Browse source
This commit is contained in:
Henrik Lissner 2016-04-23 22:08:46 -04:00
parent 03514fc09d
commit f234be68a4
56 changed files with 792 additions and 831 deletions
Download patch file Download diff file Expand all files Collapse all files

90
modules/module-ruby.el
View file

@ -5,57 +5,45 @@
"/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$")
:interpreter "ruby"
:init
(add-hook 'ruby-mode-hook 'flycheck-mode)
(define-docset! ruby-mode "rb,ruby,rubygem")
(define-builder! ruby-mode "rake %s" "Rakefile")
(define-env-command! ruby-mode "ruby --version | cut -d' ' -f2")
(define-company-backend! ruby-mode (dabbrev-code))
(def-builder! ruby-mode "rake %s" "Rakefile")
(def-company-backend! ruby-mode (dabbrev-code))
(def-docset! ruby-mode "rb,ruby,rubygem")
(def-env-command! ruby-mode "ruby --version | cut -d' ' -f2")
(def-repl! ruby-mode inf-ruby)
(def-electric! ruby-mode :words ("else" "end" "elseif"))
(add-hook! 'ruby-mode-hook '(flycheck-mode yard-mode))
:config
(setq ruby-deep-indent-paren t) ; Formatting
(add-hook! ruby-mode
(electric-indent-local-mode +1)
(setq narf-electric-indent-words '("else" "end" "elseif")))
;; Don't interfere with my custom RET behavior
(define-key ruby-mode-map [?\n] nil)
(define-key ruby-mode-map [?\n] nil))
;; Highlight doc comments
(use-package yard-mode :init (add-hook 'ruby-mode-hook 'yard-mode))
(use-package ruby-refactor
:after ruby-mode
:init (add-hook 'ruby-mode-hook 'emr-initialize)
:config
(mapc (lambda (x)
(let ((command-name (car x))
(title (cadr x))
(region-p (caddr x))
predicate)
(setq predicate (cond ((eq region-p 'both) nil)
(t (if region-p
(lambda () (use-region-p))
(lambda () (not (use-region-p)))))))
(emr-declare-command (intern (format "ruby-%s" (symbol-name command-name)))
:title title :modes 'ruby-mode :predicate predicate)))
'((toggle-block "toggle block" nil)
(refactor-extract-to-method "extract method" t)
(refactor-extract-local-variable "extract local variable" t)
(refactor-extract-constant "extract constant" t)
(refactor-add-parameter "add parameter" nil)
(refactor-extract-to-let "extract to let" t)
(refactor-convert-post-conditional "convert post conditional" t))))
;; FIXME: Doesn't work
;; (use-package robe
;; :commands (robe-mode robe-start ruby-load-file company-robe)
;; :init
;; (add-hook! ruby-mode
;; (narf|ruby-load-file)
;; (add-hook 'after-save-hook 'narf|ruby-load-file nil t))
;; (define-company-backend! ruby-mode (robe))
;; :config
;; (require 'company-robe))
(use-package ruby-refactor
:init (add-hook 'ruby-mode-hook 'emr-initialize)
:config
(require 'emr)
(mapc (lambda (x)
(let ((command-name (car x))
(title (cadr x))
(region-p (caddr x))
predicate)
(setq predicate (cond ((eq region-p 'both) nil)
(t (if region-p
(lambda () (use-region-p))
(lambda () (not (use-region-p)))))))
(emr-declare-command (intern (format "ruby-%s" (symbol-name command-name)))
:title title :modes 'ruby-mode :predicate predicate)))
'((toggle-block "toggle block" nil)
(refactor-extract-to-method "extract method" t)
(refactor-extract-local-variable "extract local variable" t)
(refactor-extract-constant "extract constant" t)
(refactor-add-parameter "add parameter" nil)
(refactor-extract-to-let "extract to let" t)
(refactor-convert-post-conditional "convert post conditional" t)))))
;; Highlight doc comments
(use-package yard-mode :commands yard-mode)
(use-package rspec-mode
:mode ("/\\.rspec$" . text-mode)
@ -80,19 +68,13 @@
(use-package inf-ruby
:commands (inf-ruby inf-ruby-console-auto)
:init
(define-repl! ruby-mode inf-ruby)
(evil-set-initial-state 'inf-ruby-mode 'emacs)
:config
(require 'company-inf-ruby)
(define-company-backend! inf-ruby-mode (inf-ruby)))
:init (def-company-backend! inf-ruby-mode (inf-ruby)))
(use-package company-inf-ruby :after inf-ruby)
;;
(define-project-type! rake "rake"
(def-project-type! rake "rake"
:files ("Rakefile"))
(define-project-type! vagrant "vagrant"
:files ("Vagrantfile"))
(provide 'module-ruby)
;;; module-ruby.el ends here