Revert "Remove useless yas-expand maybe hook"

This reverts commit d875ac7.
HyunggyuJang · Jul 29, 2024 · 781165c · 781165c
1 parent 3e1ecad
commit 781165c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
@@ -476,38 +476,38 @@ Made for `org-tab-first-hook' in evil-mode."
          (call-interactively #'tab-to-tab-stop)
          t)))
 
-;; ###autoload
-;; (defun +org-yas-expand-maybe-h ()
-;;   "Expand a yasnippet snippet, if trigger exists at point or region is active.
-;; Made for `org-tab-first-hook'."
-;;   (when (and (modulep! :editor snippets)
-;;              (bound-and-true-p yas-minor-mode))
-;;     (and (let ((major-mode (cond ((org-in-src-block-p t)
-;;                                   (org-src-get-lang-mode (org-eldoc-get-src-lang)))
-;;                                  ((get-char-property (point) 'aas)
-;;                                   '+latex-utility)
-;;                                  (major-mode)))
-;;                (org-src-tab-acts-natively nil) ; causes breakages
-;;                ;; Smart indentation doesn't work with yasnippet, and painfully slow
-;;                ;; in the few cases where it does.
-;;                (yas-indent-line 'fixed))
-;;            (cond ((and (or (not (bound-and-true-p evil-local-mode))
-;;                            (evil-insert-state-p)
-;;                            (evil-emacs-state-p))
-;;                        (or (and (bound-and-true-p yas--tables)
-;;                                 (gethash major-mode yas--tables))
-;;                            (progn (yas-reload-all) t))
-;;                        (yas--templates-for-key-at-point))
-;;                   (yas-expand)
-;;                   t)
-;;                  ((use-region-p)
-;;                   (yas-insert-snippet)
-;;                   t)))
-;;          ;; HACK Yasnippet breaks org-superstar-mode because yasnippets is
-;;          ;;      overzealous about cleaning up overlays.
-;;          (when (bound-and-true-p org-superstar-mode)
-;;            (org-superstar-restart))
-;;          )))
+;;;###autoload
+(defun +org-yas-expand-maybe-h ()
+  "Expand a yasnippet snippet, if trigger exists at point or region is active.
+Made for `org-tab-first-hook'."
+  (when (and (modulep! :editor snippets)
+             (bound-and-true-p yas-minor-mode))
+    (and (let ((major-mode (cond ((org-in-src-block-p t)
+                                  (org-src-get-lang-mode (org-eldoc-get-src-lang)))
+                                 ((get-char-property (point) 'aas)
+                                  '+latex-utility)
+                                 (major-mode)))
+               (org-src-tab-acts-natively nil) ; causes breakages
+               ;; Smart indentation doesn't work with yasnippet, and painfully slow
+               ;; in the few cases where it does.
+               (yas-indent-line 'fixed))
+           (cond ((and (or (not (bound-and-true-p evil-local-mode))
+                           (evil-insert-state-p)
+                           (evil-emacs-state-p))
+                       (or (and (bound-and-true-p yas--tables)
+                                (gethash major-mode yas--tables))
+                           (progn (yas-reload-all) t))
+                       (yas--templates-for-key-at-point))
+                  (yas-expand)
+                  t)
+                 ((use-region-p)
+                  (yas-insert-snippet)
+                  t)))
+         ;; HACK Yasnippet breaks org-superstar-mode because yasnippets is
+         ;;      overzealous about cleaning up overlays.
+         ;; (when (bound-and-true-p org-superstar-mode)
+         ;;   (org-superstar-restart))
+         )))
 
 ;;;###autoload
 (defun +org-cycle-only-current-subtree-h (&optional arg)

diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
@@ -854,7 +854,7 @@ between the two."
         org-insert-heading-respect-content t)
 
   (add-hook! 'org-tab-first-hook
-             ;; #'+org-yas-expand-maybe-h
+             #'+org-yas-expand-maybe-h
              #'+org-indent-maybe-h)
 
   (add-hook 'doom-delete-backward-functions