Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix smartparens configuration in html layer #3139

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions layers/+lang/html/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,28 @@
: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
(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
Expand All @@ -166,21 +184,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
Expand Down