From 50d8e3f455f353ef7386a3116b2064536183829c Mon Sep 17 00:00:00 2001
From: Riyyi <riyyi3@gmail.com>
Date: Fri, 8 Dec 2023 23:30:45 +0100
Subject: [PATCH] Emacs: Fix YASnippet expansion in insert mode

---
 .config/emacs/site-lisp/dot-development.el | 2 +-
 .config/emacs/site-lisp/dot-evil.el        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.config/emacs/site-lisp/dot-development.el b/.config/emacs/site-lisp/dot-development.el
index 365143b..40af9fb 100644
--- a/.config/emacs/site-lisp/dot-development.el
+++ b/.config/emacs/site-lisp/dot-development.el
@@ -463,7 +463,7 @@
 ;;; YASnippet
 
 (elpaca-setup yasnippet
-  (:autoload yas-insert-snippet)
+  (:autoload yas-expand yas-insert-snippet)
   (setq yas-snippet-dirs (list (expand-file-name "snippets" dot-emacs-dir)))
   (setq yas-prompt-functions '(yas-completing-prompt))
   (:when-loaded
diff --git a/.config/emacs/site-lisp/dot-evil.el b/.config/emacs/site-lisp/dot-evil.el
index 29a4568..e114f83 100644
--- a/.config/emacs/site-lisp/dot-evil.el
+++ b/.config/emacs/site-lisp/dot-evil.el
@@ -59,7 +59,9 @@ Vim equivalence: <C-D>"
       "Shift line right, retains cursor position.
 Vim equivalence: <Tab>"
       (interactive)
-      (insert "\t"))
+      (when (not (yas-expand))
+        (insert "\t")))
+
 
     (defun dot/evil-visual-shift-left ()
       "Shift visual selection left, retains the selection.