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

Trying enh-ruby-mode again

Browse source
This commit is contained in:
Henrik Lissner 2015-08-21 14:44:55 -04:00
parent f5f389778b
commit 758b576fc2
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/core-auto-insert.el
View file

@ -27,11 +27,11 @@
(add-template! "/\\.rspec$" "@@.rspec" 'rspec-mode) (add-template! "/\\.rspec$" "@@.rspec" 'rspec-mode)
(add-template! "/spec_helper\\.rb$" "@@helper" 'rspec-mode t) (add-template! "/spec_helper\\.rb$" "@@helper" 'rspec-mode t)
(add-template! "_spec\\.rb$" "@@" 'rspec-mode t) (add-template! "_spec\\.rb$" "@@" 'rspec-mode t)
(add-template! "/Rakefile$" "@@Rakefile" 'ruby-mode t) (add-template! "/Rakefile$" "@@Rakefile" 'enh-ruby-mode t)
(add-template! "/Gemfile$" "@@Gemfile" 'ruby-mode t) (add-template! "/Gemfile$" "@@Gemfile" 'enh-ruby-mode t)
(add-template! "\\.gemspec$" "@@.gemspec" 'ruby-mode t) (add-template! "\\.gemspec$" "@@.gemspec" 'enh-ruby-mode t)
(add-template! "/lib/.+\\.rb$" "@@module" 'ruby-mode t) (add-template! "/lib/.+\\.rb$" "@@module" 'enh-ruby-mode t)
(add-template! "\\.rb$" "@@" 'ruby-mode) (add-template! "\\.rb$" "@@" 'enh-ruby-mode)
;; Python ;; Python
;; (add-template! "tests?/test_.+\\.py$" "@@" 'nose-mode) ;; (add-template! "tests?/test_.+\\.py$" "@@" 'nose-mode)

32
modules/module-ruby.el
View file

@ -3,20 +3,20 @@
;; Silence the byte-compiler ;; Silence the byte-compiler
(eval-when-compile (require 'defuns-quickrun)) (eval-when-compile (require 'defuns-quickrun))
(use-package ruby-mode (use-package enh-ruby-mode
:mode ("\\.r[bu]$" "\\.rake$" "\\.gemspec$" "\\.?pryrc$" :mode ("\\.r[bu]$" "\\.rake$" "\\.gemspec$" "\\.?pryrc$"
"/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$") "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$")
:interpreter "ruby" :interpreter "ruby"
:init :init
(add-hook! ruby-mode 'narf|enable-tab-width-2) (add-hook! enh-ruby-mode 'narf|enable-tab-width-2)
(build-for! ruby-mode "rake %s" "Rakefile") (build-for! enh-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)
;; Don't interfere with my custom RET behavior ;; Don't interfere with my custom RET behavior
(define-key ruby-mode-map [?\n] nil) (define-key enh-ruby-mode-map [?\n] nil)
;; Rakefiles ;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Rakefiles ;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-minor-mode rake-mode (define-minor-mode rake-mode
@ -57,48 +57,48 @@
(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-ruby-mode 'insert) (evil-set-initial-state 'inf-enh-ruby-mode 'insert)
(after! company (after! company
(require 'company-inf-ruby) (require 'company-inf-ruby)
(add-company-backend! inf-ruby-mode (inf-ruby)))) (add-company-backend! inf-enh-ruby-mode (inf-ruby))))
(use-package robe (use-package robe
:commands (robe-mode robe-start ruby-load-file) :commands (robe-mode robe-start ruby-load-file)
:init :init
(add-hook! after-save 'narf|ruby-load-file) (add-hook! after-save 'narf|ruby-load-file)
(add-hook! ruby-mode 'narf|enable-robe-maybe) (add-hook! enh-ruby-mode 'narf|enable-robe-maybe)
:config :config
(after! company (after! company
(require 'company-robe) (require 'company-robe)
(add-company-backend! ruby-mode (robe)))) (add-company-backend! enh-ruby-mode (robe))))
(use-package ruby-refactor (use-package ruby-refactor
:after emr :after emr
:init (add-hook! ruby-mode 'emr-initialize) :init (add-hook! enh-ruby-mode 'emr-initialize)
:config :config
(emr-declare-command 'ruby-toggle-block (emr-declare-command 'ruby-toggle-block
:title "toggle block" :title "toggle block"
:modes 'ruby-mode :modes 'enh-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 'ruby-mode :modes 'enh-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 'ruby-mode :modes 'enh-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 'ruby-mode :modes 'enh-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 'ruby-mode :modes 'enh-ruby-mode
:predicate (lambda () (not (use-region-p)))) :predicate (lambda () (not (use-region-p))))
(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 'ruby-mode :modes 'enh-ruby-mode
:predicate (lambda () (use-region-p)))) :predicate (lambda () (use-region-p))))
(provide 'module-ruby) (provide 'module-ruby)