Fix smartparens configuration in html layer

syl20bnr · Sep 25, 2015 · 35012a6 · 35012a6
1 parent 6a520b6
commit 35012a6
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/layers/+lang/html/packages.el b/layers/+lang/html/packages.el
@@ -138,10 +138,29 @@
     :defer t))
 
 (defun html/post-init-smartparens ()
-  (spacemacs/add-to-hooks (if dotspacemacs-smartparens-strict-mode
-                              'smartparens-strict-mode
-                            'smartparens-mode)
-                          '(css-mode-hook scss-mode-hook sass-mode-hook less-css-mode-hook)))
+  (spacemacs/add-to-hooks
+   (if dotspacemacs-smartparens-strict-mode
+       'smartparens-strict-mode
+     'smartparens-mode)
+   '(css-mode-hook scss-mode-hook sass-mode-hook less-css-mode-hook))
+
+  ;; Only use smartparens in web-mode
+  (spacemacs|use-package-add-hook web-mode
+    :post-config
+    (progn
+      (message ">>> Yo!!")
+      (setq web-mode-enable-auto-pairing nil)
+      (sp-local-pair 'web-mode "<% " " %>")
+      (sp-local-pair 'web-mode "{ " " }")
+      (sp-local-pair 'web-mode "<%= "  " %>")
+      (sp-local-pair 'web-mode "<%# "  " %>")
+      (sp-local-pair 'web-mode "<%$ "  " %>")
+      (sp-local-pair 'web-mode "<%@ "  " %>")
+      (sp-local-pair 'web-mode "<%: "  " %>")
+      (sp-local-pair 'web-mode "{{ "  " }}")
+      (sp-local-pair 'web-mode "{% "  " %}")
+      (sp-local-pair 'web-mode "{%- "  " %}")
+      (sp-local-pair 'web-mode "{# "  " #}"))))
 
 (defun html/init-tagedit ()
   (use-package tagedit
@@ -166,21 +185,6 @@
     (push 'company-web-html company-backends-web-mode)
     :config
     (progn
-      ;; Only use smartparens in web-mode
-      (setq web-mode-enable-auto-pairing nil)
-
-      (sp-local-pair 'web-mode "<% " " %>")
-      (sp-local-pair 'web-mode "{ " " }")
-      (sp-local-pair 'web-mode "<%= "  " %>")
-      (sp-local-pair 'web-mode "<%# "  " %>")
-      (sp-local-pair 'web-mode "<%$ "  " %>")
-      (sp-local-pair 'web-mode "<%@ "  " %>")
-      (sp-local-pair 'web-mode "<%: "  " %>")
-      (sp-local-pair 'web-mode "{{ "  " }}")
-      (sp-local-pair 'web-mode "{% "  " %}")
-      (sp-local-pair 'web-mode "{%- "  " %}")
-      (sp-local-pair 'web-mode "{# "  " #}")
-
       (evil-leader/set-key-for-mode 'web-mode
         "meh" 'web-mode-dom-errors-show
         "mgb" 'web-mode-element-beginning