diff --git a/modules/siren-enh-ruby.el b/modules/siren-enh-ruby.el deleted file mode 100644 index 12fed13..0000000 --- a/modules/siren-enh-ruby.el +++ /dev/null @@ -1,82 +0,0 @@ -;; -;; ruby -;; - -(require 'siren-programming) -(require 'siren-company) - -(siren-require-packages '(enh-ruby-mode ruby-tools inf-ruby yari)) - -;; Rake files are ruby, too, as are gemspecs, rackup files, and gemfiles. -(add-to-list 'auto-mode-alist '("\\.rb\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.rake\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Rakefile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.gemspec\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.ru\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Gemfile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Guardfile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Capfile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.cap\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.thor\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.rabl\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Thorfile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Vagrantfile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.jbuilder\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Podfile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.podspec\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Puppetfile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Berksfile\\'" . enh-ruby-mode)) -(add-to-list 'auto-mode-alist '("Appraisals\\'" . enh-ruby-mode)) - -;; We never want to edit Rubinius bytecode -(add-to-list 'completion-ignored-extensions ".rbc") - -(define-key 'help-command (kbd "R") 'yari) - -;; Set up hs-mode (HideShow) for Ruby -(add-to-list 'hs-special-modes-alist - `(ruby-mode - ,(rx (or "def" "class" "module" "do")) ;; Block start - ,(rx (or "end")) ;; Block end - ,(rx (or "#" "=begin")) ;; Comment start - ruby-forward-sexp nil)) - -;; Make company-mode play nice -(push 'enh-ruby-mode company-dabbrev-code-modes) - -(eval-after-load 'enh-ruby-mode - '(progn - (defun siren-enh-ruby-mode-defaults () - ;; I don't like some of the syntax highlighting styling enh-ruby does - (custom-set-faces - '(enh-ruby-op-face ((t nil))) - '(enh-ruby-regexp-delimiter-face ((t (:inherit font-lock-string-face)))) - '(enh-ruby-regexp-face ((t (:inherit font-lock-string-face)))) - '(enh-ruby-string-delimiter-face ((t (:inherit font-lock-string-face))))) - - (siren-prog-mode-defaults) - (ruby-tools-mode +1) - (setq tab-width 2) - (hs-minor-mode 1) - (company-mode +1) - (subword-mode +1) - (setq highlight-indentation-offset 2) - (highlight-indentation-mode) - (highlight-indentation-current-column-mode) - (setq enh-ruby-check-syntax nil) - (setq enh-ruby-deep-indent-paren nil) - (setq enh-ruby-bounce-deep-indent nil) - (setq c-tab-always-indent nil) - (let ((map enh-ruby-mode-map)) - (define-key map (kbd "C-c /") 'comment-or-uncomment-region-or-line) - (define-key map (kbd "C-c C-/") 'comment-or-uncomment-region-or-line) - (define-key map (kbd "C-c C-h") 'toggle-hiding) - (define-key map (kbd "C-c C-l") 'goto-line))) - - (setq siren-enh-ruby-mode-hook 'siren-enh-ruby-mode-defaults) - - (add-hook 'enh-ruby-mode-hook (lambda () - (run-hooks 'siren-enh-ruby-mode-hook))))) - - -(provide 'siren-enh-ruby)