enh-ruby-mode -> ruby-mode

This commit is contained in:
Henrik Lissner 2015-07-30 02:35:03 +02:00
parent e88293f2c5
commit 31a841afa7

View file

@ -3,60 +3,58 @@
;; Silence the byte-compiler ;; Silence the byte-compiler
(eval-when-compile (require 'defuns-quickrun)) (eval-when-compile (require 'defuns-quickrun))
(use-package enh-ruby-mode (use-package ruby-mode
:mode (("\\.rb$" . enh-ruby-mode) :mode (("\\.rb$" . ruby-mode)
("\\.ru$" . enh-ruby-mode) ("\\.ru$" . ruby-mode)
("\\.rake$" . enh-ruby-mode) ("\\.rake$" . ruby-mode)
("\\.gemspec$" . enh-ruby-mode) ("\\.gemspec$" . ruby-mode)
("\\.?pryrc$" . enh-ruby-mode) ("\\.?pryrc$" . ruby-mode)
("/Gemfile$" . enh-ruby-mode) ("/Gemfile$" . ruby-mode)
("/Capfile$" . enh-ruby-mode) ("/Capfile$" . ruby-mode)
("/Vagrantfile$" . enh-ruby-mode) ("/Vagrantfile$" . ruby-mode)
("/Rakefile$" . enh-ruby-mode)) ("/Rakefile$" . ruby-mode))
:interpreter "ruby" :interpreter "ruby"
:init :init
(add-hook! enh-ruby-mode 'narf|enable-tab-width-2) (add-hook! ruby-mode 'narf|enable-tab-width-2)
(build-for! enh-ruby-mode "rake %s" "Rakefile") (build-for! ruby-mode "rake %s" "Rakefile")
:config :config
;;; Formatting ;;; Formatting
(setq ruby-indent-level 2 (setq ruby-indent-level 2
ruby-deep-indent-paren t ruby-deep-indent-paren t)
enh-ruby-check-syntax nil)
(associate! text-mode :match "/\\.rspec$") (associate! text-mode :match "/\\.rspec$")
;; Don't interfere with my custom RET behavior ;; Don't interfere with my custom RET behavior
(define-key enh-ruby-mode-map [?\n] nil) (define-key ruby-mode-map [?\n] nil)
(use-package ruby-refactor (use-package ruby-refactor
:init (add-hook! enh-ruby-mode 'emr-initialize) :init (add-hook! ruby-mode 'emr-initialize)
:config :config
(after! emr (after! emr
(emr-declare-command 'ruby-toggle-block (emr-declare-command 'ruby-toggle-block
:title "toggle block" :title "toggle block"
:modes 'enh-ruby-mode :modes 'ruby-mode
:predicate (lambda () (not (use-region-p)))) :predicate (lambda () (not (use-region-p))))
(emr-declare-command 'ruby-refactor-extract-to-method (emr-declare-command 'ruby-refactor-extract-to-method
:title "extract method" :title "extract method"
:modes 'enh-ruby-mode :modes 'ruby-mode
:predicate (lambda () (use-region-p))) :predicate (lambda () (use-region-p)))
(emr-declare-command 'ruby-refactor-extract-local-variable (emr-declare-command 'ruby-refactor-extract-local-variable
:title "extract local variable" :title "extract local variable"
:modes 'enh-ruby-mode :modes 'ruby-mode
:predicate (lambda () (use-region-p))) :predicate (lambda () (use-region-p)))
(emr-declare-command 'ruby-refactor-extract-constant (emr-declare-command 'ruby-refactor-extract-constant
:title "extract constant" :title "extract constant"
:modes 'enh-ruby-mode :modes 'ruby-mode
:predicate (lambda () (use-region-p))) :predicate (lambda () (use-region-p)))
(emr-declare-command 'ruby-refactor-add-parameter (emr-declare-command 'ruby-refactor-add-parameter
:title "add parameter" :title "add parameter"
:modes 'enh-ruby-mode) :modes 'ruby-mode)
(emr-declare-command 'ruby-refactor-extract-to-let (emr-declare-command 'ruby-refactor-extract-to-let
:title "extract to let" :title "extract to let"
:modes 'enh-ruby-mode :modes 'ruby-mode
:predicate (lambda () (use-region-p))))) :predicate (lambda () (use-region-p)))))
;; Rakefiles ;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Rakefiles ;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-minor-mode rake-mode (define-minor-mode rake-mode
"Buffer local minor mode for rake files" "Buffer local minor mode for rake files"
@ -100,20 +98,20 @@
(use-package inf-ruby (use-package inf-ruby
:commands (inf-ruby inf-ruby-console-auto) :commands (inf-ruby inf-ruby-console-auto)
:config :config
(evil-set-initial-state 'inf-enh-ruby-mode 'insert) (evil-set-initial-state 'inf-ruby-mode 'insert)
(after! company (after! company
(require 'company-inf-ruby) (require 'company-inf-ruby)
(add-company-backend! inf-enh-ruby-mode (inf-ruby)))) (add-company-backend! inf-ruby-mode (inf-ruby))))
(use-package robe (use-package robe
:functions (robe-mode robe-start ruby-load-file) :functions (robe-mode robe-start ruby-load-file)
:config :config
(add-hook! after-save 'narf|ruby-load-file) (add-hook! after-save 'narf|ruby-load-file)
(add-hook! enh-ruby-mode 'narf|enable-robe-maybe) (add-hook! ruby-mode 'narf|enable-robe-maybe)
(after! company (after! company
(require 'company-robe) (require 'company-robe)
(add-company-backend! enh-ruby-mode (robe))))) (add-company-backend! ruby-mode (robe)))))
(provide 'module-ruby) (provide 'module-ruby)
;;; module-ruby.el ends here ;;; module-ruby.el ends here