From dd402b7db36eca85606b85bdf06382d68f8fe397 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 12 Mar 2020 11:29:54 -0400 Subject: [PATCH] Remove references to enh-ruby-mode --- core/autoload/help.el | 1 - docs/faq.org | 2 +- modules/completion/company/README.org | 2 +- modules/config/default/config.el | 2 +- modules/editor/evil/config.el | 2 +- modules/editor/fold/config.el | 4 ---- modules/lang/ruby/README.org | 1 - modules/lang/ruby/autoload.el | 8 ++++---- modules/tools/debugger/autoload/evil.el | 2 +- modules/tools/debugger/config.el | 4 ++-- modules/tools/editorconfig/config.el | 1 - modules/tools/lsp/README.org | 2 +- 12 files changed, 12 insertions(+), 19 deletions(-) diff --git a/core/autoload/help.el b/core/autoload/help.el index 3bf6a5c47..88ca5fb55 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -55,7 +55,6 @@ (python-mode :lang python) (restclient-mode :lang rest) (ruby-mode :lang ruby) - (enh-ruby-mode :lang ruby) (rust-mode :lang rust) (scala-mode :lang scala) (sh-mode :lang sh) diff --git a/docs/faq.org b/docs/faq.org index aef4fa560..731984508 100644 --- a/docs/faq.org +++ b/docs/faq.org @@ -539,7 +539,7 @@ modify the syntax-table in all buffers of some mode, e.g.: ;; For python (add-hook! 'python-mode-hook (modify-syntax-entry ?_ "w")) ;; For ruby -(add-hook! 'enh-ruby-mode-hook (modify-syntax-entry ?_ "w")) +(add-hook! 'ruby-mode-hook (modify-syntax-entry ?_ "w")) ;; For Javascript (add-hook! 'js2-mode-hook (modify-syntax-entry ?_ "w")) #+END_SRC diff --git a/modules/completion/company/README.org b/modules/completion/company/README.org index 1ca8d72d8..c14390cb8 100644 --- a/modules/completion/company/README.org +++ b/modules/completion/company/README.org @@ -116,7 +116,7 @@ There is no guarantee your language mode will have completion support. Some, like ~lua-mode~, don't have completion support in Emacs at all. Others may requires additional setup to get code completion working. For instance, -~go-mode~ requires ~guru~ to be installed on your system, and ~enh-ruby-mode~ +~go-mode~ requires ~guru~ to be installed on your system, and ~ruby-mode~ requires that you have a Robe server running (~M-x robe-start~). Check the relevant module's documentation for this kind of information. diff --git a/modules/config/default/config.el b/modules/config/default/config.el index 65f1e4ba5..e063a7874 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -103,7 +103,7 @@ (sp-local-pair "(" ")" :unless '(:rem sp-point-before-same-p))) ;; Major-mode specific fixes - (sp-local-pair '(ruby-mode enh-ruby-mode) "{" "}" + (sp-local-pair 'ruby-mode "{" "}" :pre-handlers '(:rem sp-ruby-pre-handler) :post-handlers '(:rem sp-ruby-post-handler)) diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el index bd15ec39c..98c39ebf0 100644 --- a/modules/editor/evil/config.el +++ b/modules/editor/evil/config.el @@ -232,7 +232,7 @@ directives. By default, this only recognizes C directives.") :commands embrace-add-pair embrace-add-pair-regexp :hook (LaTeX-mode . embrace-LaTeX-mode-hook) :hook (org-mode . embrace-org-mode-hook) - :hook ((ruby-mode enh-ruby-mode) . embrace-ruby-mode-hook) + :hook (ruby-mode . embrace-ruby-mode-hook) :hook (emacs-lisp-mode . embrace-emacs-lisp-mode-hook) :hook ((lisp-mode emacs-lisp-mode clojure-mode racket-mode hy-mode) . +evil-embrace-lisp-mode-hook-h) diff --git a/modules/editor/fold/config.el b/modules/editor/fold/config.el index f72f2fe53..8e5a445ed 100644 --- a/modules/editor/fold/config.el +++ b/modules/editor/fold/config.el @@ -48,10 +48,6 @@ "end\\|[]}]" "#\\|=begin" ruby-forward-sexp) - (enh-ruby-mode "class\\|d\\(?:ef\\|o\\)\\|module\\|[[{]" - "end\\|[]}]" - "#\\|=begin" - enh-ruby-forward-sexp nil) (matlab-mode "if\\|switch\\|case\\|otherwise\\|while\\|for\\|try\\|catch" "end" nil (lambda (_arg) (matlab-forward-sexp))) diff --git a/modules/lang/ruby/README.org b/modules/lang/ruby/README.org index 85eb28a3c..96c026ae2 100644 --- a/modules/lang/ruby/README.org +++ b/modules/lang/ruby/README.org @@ -33,7 +33,6 @@ This module add Ruby and optional Ruby on Rails support to Emacs. + =+rails= Enables rails navigational commands, plus server+console integration. ** Packages -+ [[https://github.com/zenspider/enhanced-ruby-mode][enh-ruby-mode]] + [[https://github.com/nonsequitur/inf-ruby][inf-ruby]] + [[https://github.com/company-mode/company-inf-ruby][company-inf-ruby]] + [[https://github.com/rubocop-hq/rubocop-emacs][rubocop]] diff --git a/modules/lang/ruby/autoload.el b/modules/lang/ruby/autoload.el index 8f9519283..70f3e68ff 100644 --- a/modules/lang/ruby/autoload.el +++ b/modules/lang/ruby/autoload.el @@ -1,11 +1,11 @@ ;;; lang/ruby/autoload.el -*- lexical-binding: t; -*- ;;;###autoload -(defun +ruby|cleanup-robe-servers () - "Clean up dangling inf robe processes if there are no more `enh-ruby-mode' -buffers open." +(defun +ruby-cleanup-robe-servers-h () ; TODO Use me + "Clean up dangling inf robe processes if there are no more `ruby-mode' buffers +open." ;; FIXME This should wait X seconds before cleaning up - (unless (or (not robe-mode) (doom-buffers-in-mode 'enh-ruby-mode)) + (unless (or (not robe-mode) (doom-buffers-in-mode 'ruby-mode)) (let (inf-buffer kill-buffer-query-functions) (while (setq inf-buffer (robe-inf-buffer)) (let ((process (get-buffer-process inf-buffer)) diff --git a/modules/tools/debugger/autoload/evil.el b/modules/tools/debugger/autoload/evil.el index b43af436d..90d87553a 100644 --- a/modules/tools/debugger/autoload/evil.el +++ b/modules/tools/debugger/autoload/evil.el @@ -10,7 +10,7 @@ (pcase major-mode ((or 'c-mode 'c++-mode) (realgud:gdb (if path (concat "gdb " path)))) - ((or 'ruby-mode 'enh-ruby-mode) + ('ruby-mode ;; FIXME (doom:repl nil (format "run '%s'" (file-name-nondirectory (or path buffer-file-name))))) ('sh-mode diff --git a/modules/tools/debugger/config.el b/modules/tools/debugger/config.el index 419b172a5..4ceb75c96 100644 --- a/modules/tools/debugger/config.el +++ b/modules/tools/debugger/config.el @@ -7,7 +7,7 @@ (realgud:kshdb :modes (sh-mode)) (realgud:pdb :modes (python-mode)) (realgud:perldb :modes (perl-mode perl6-mode)) - (realgud:rdebug :modes (ruby-mode enh-ruby-mode)) + (realgud:rdebug :modes (ruby-mode)) (realgud:remake) (realgud:trepan :modes (perl-mode perl6-mode)) (realgud:trepan2 :modes (python-mode)) @@ -40,7 +40,7 @@ ((:lang . java) lsp-java dap-java) ((:lang . php) php-mode dap-php) ((:lang . python) python dap-python) - ((:lang . ruby) enh-ruby-mode dap-ruby) + ((:lang . ruby) ruby-mode dap-ruby) ((:lang . rust) rust-mode dap-lldb))) (when (doom-module-p (caar module) (cdar module) '+lsp) (with-eval-after-load (nth 1 module) diff --git a/modules/tools/editorconfig/config.el b/modules/tools/editorconfig/config.el index abcac7512..722690233 100644 --- a/modules/tools/editorconfig/config.el +++ b/modules/tools/editorconfig/config.el @@ -6,7 +6,6 @@ ;; appending an extension to `buffer-file-name' when we talk to editorconfig. (defvar +editorconfig-mode-alist '((emacs-lisp-mode . "el") - (enh-ruby-mode . "rb") (js2-mode . "js") (perl-mode . "pl") (php-mode . "php") diff --git a/modules/tools/lsp/README.org b/modules/tools/lsp/README.org index 9cb4274c5..7ee5342fc 100644 --- a/modules/tools/lsp/README.org +++ b/modules/tools/lsp/README.org @@ -44,7 +44,7 @@ As of this writing, this is the state of LSP support in Doom Emacs: | [[../../lang/ocaml/README.org][:lang ocaml]] | tuareg-mode | ocaml-language-server | | [[../../lang/php/README.org][:lang php]] | php-mode | php-language-server | | [[../../lang/python/README.org][:lang python]] | python-mode | lsp-python-ms | -| [[../../lang/ruby/README.org][:lang ruby]] | ruby-mode, enh-ruby-mode | solargraph | +| [[../../lang/ruby/README.org][:lang ruby]] | ruby-mode | solargraph | | [[../../lang/rust/README.org][:lang rust]] | rust-mode | rls | | [[../../lang/scala/README.org][:lang scala]] | scala-mode | metals | | [[../../lang/sh/README.org][:lang sh]] | sh-mode | bash-language-server |