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.

Sign up for GitHub

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

Jump to bottom

Fix smartparens workaround in auto-completion #4050

Closed
wants to merge 1 commit into from
Closed

Fix smartparens workaround in auto-completion #4050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 18 additions & 15 deletions layers/auto-completion/packages.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
hippie-exp
yasnippet
auto-yasnippet
smartparens
))

;; company-quickhelp from MELPA is not compatible with 24.3 anymore
Expand Down Expand Up @@ -261,21 +262,7 @@
(spacemacs/add-to-hooks 'spacemacs/force-yasnippet-off '(term-mode-hook
shell-mode-hook
eshell-mode-hook)))
:config
(progn
;; We need to know whether the smartparens was enabled, see
;; `yas-before-expand-snippet-hook' below.
(defvar smartparens-enabled-initially t
"Stored whether smartparens is originally enabled or not.")

(add-hook 'yas-before-expand-snippet-hook (lambda ()
;; If enabled, smartparens will mess snippets expanded by `hippie-expand`
(setq smartparens-enabled-initially smartparens-mode)
(smartparens-mode -1)))
(add-hook 'yas-after-exit-snippet-hook (lambda ()
(when smartparens-enabled-initially
(smartparens-mode 1))))
(spacemacs|diminish yas-minor-mode " ⓨ" " y"))))
:config (spacemacs|diminish yas-minor-mode " ⓨ" " y")))

(defun auto-completion/init-auto-yasnippet ()
(use-package auto-yasnippet
Expand All @@ -295,3 +282,19 @@
"iSc" 'aya-create
"iSe" 'spacemacs/auto-yasnippet-expand
"iSw" 'aya-persist-snippet))))

(defun auto-completion/post-init-smartparens ()
(with-eval-after-load 'smartparens
;; We need to know whether the smartparens was enabled, see
;; `yas-before-expand-snippet-hook' below.
(defvar smartparens-enabled-initially t
"Stored whether smartparens is originally enabled or not.")
(add-hook 'yas-before-expand-snippet-hook
(lambda ()
;; If enabled, smartparens will mess snippets expanded by `hippie-expand`
(setq smartparens-enabled-initially smartparens-mode)
(smartparens-mode -1)))
(add-hook 'yas-after-exit-snippet-hook
(lambda ()
(when smartparens-enabled-initially
(smartparens-mode 1))))))