ruby: use post-init func for smartparens config

syl20bnr · Dec 11, 2015 · f20dfec · f20dfec
1 parent 995a5a0
commit f20dfec
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/layers/+lang/ruby/packages.el b/layers/+lang/ruby/packages.el
@@ -24,6 +24,7 @@
         ruby-test-mode
         ruby-tools
         rvm
+        smartparens
         ))
 (if ruby-enable-enh-ruby-mode
     (add-to-list 'ruby-packages 'enh-ruby-mode)
@@ -80,15 +81,7 @@
     :config
     (progn
       (setq enh-ruby-deep-indent-paren nil
-            enh-ruby-hanging-paren-deep-indent-level 2)
-      (with-eval-after-load 'smartparens
-        (sp-with-modes 'enh-ruby-mode
-          (sp-local-pair
-           "{" "}"
-           :pre-handlers '(sp-ruby-pre-handler)
-           :post-handlers '(sp-ruby-post-handler
-                            (spacemacs/smartparens-pair-newline-and-indent "RET"))
-           :suffix ""))))))
+            enh-ruby-hanging-paren-deep-indent-level 2))))
 
 (defun ruby/post-init-evil-matchit ()
   (dolist (hook '(ruby-mode-hook enh-ruby-mode-hook))
@@ -201,13 +194,7 @@
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'ruby-mode
         "'" 'ruby-toggle-string-quotes
-        "{" 'ruby-toggle-block)
-      (with-eval-after-load 'smartparens
-        (sp-with-modes 'ruby-mode
-          (sp-local-pair "{" "}"
-                         :pre-handlers '(sp-ruby-pre-handler)
-                         :post-handlers '(sp-ruby-post-handler (spacemacs/smartparens-pair-newline-and-indent "RET"))
-                         :suffix ""))))))
+        "{" 'ruby-toggle-block))))
 
 (defun ruby/init-ruby-tools ()
   (use-package ruby-tools
@@ -255,3 +242,14 @@
       (setq rspec-use-rvm t)
       (spacemacs/add-to-hooks 'rvm-activate-corresponding-ruby
                               '(ruby-mode-hook enh-ruby-mode-hook)))))
+
+(defun ruby/post-init-smartparens ()
+  (spacemacs|use-package-add-hook smartparens
+    :post-config
+    (sp-with-modes (if ruby-enable-enh-ruby-mode 'enh-ruby-mode 'ruby-mode)
+      (sp-local-pair
+       "{" "}"
+       :pre-handlers '(sp-ruby-pre-handler)
+       :post-handlers '(sp-ruby-post-handler
+                        (spacemacs/smartparens-pair-newline-and-indent "RET"))
+       :suffix ""))))