From 759b4f7c178dead0abf9835af2acd90d148a7e30 Mon Sep 17 00:00:00 2001
From: arne314 <73391160+arne314@users.noreply.github.com>
Date: Sat, 23 Nov 2024 19:58:11 +0100
Subject: [PATCH] fix: snippet spacing

---
 lua/typstar/autosnippets.lua      | 10 +++++-----
 lua/typstar/snippets/document.lua |  2 +-
 lua/typstar/snippets/math.lua     | 22 ++++++++++++----------
 lua/typstar/snippets/visual.lua   |  7 +++++--
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/lua/typstar/autosnippets.lua b/lua/typstar/autosnippets.lua
index 94f7de7..d5d4942 100644
--- a/lua/typstar/autosnippets.lua
+++ b/lua/typstar/autosnippets.lua
@@ -1,12 +1,12 @@
 local M = {}
 local cfg = require('typstar.config').config.snippets
 local luasnip = require('luasnip')
-local fmta = require("luasnip.extras.fmt").fmta
+local fmta = require('luasnip.extras.fmt').fmta
 
-M.in_math = function() return vim.api.nvim_eval("typst#in_math()") == 1 end
-M.in_markup = function() return vim.api.nvim_eval("typst#in_markup()") == 1 end
-M.in_code = function() return vim.api.nvim_eval("typst#in_code()") == 1 end
-M.in_comment = function() return vim.api.nvim_eval("typst#in_comment()") == 1 end
+M.in_math = function() return vim.api.nvim_eval('typst#in_math()') == 1 end
+M.in_markup = function() return vim.api.nvim_eval('typst#in_markup()') == 1 end
+M.in_code = function() return vim.api.nvim_eval('typst#in_code()') == 1 end
+M.in_comment = function() return vim.api.nvim_eval('typst#in_comment()') == 1 end
 M.not_in_math = function() return not M.in_math() end
 M.not_in_markup = function() return not M.in_markup() end
 M.not_in_code = function() return not M.in_code() end
diff --git a/lua/typstar/snippets/document.lua b/lua/typstar/snippets/document.lua
index 2a93e57..ccad1ed 100644
--- a/lua/typstar/snippets/document.lua
+++ b/lua/typstar/snippets/document.lua
@@ -29,6 +29,6 @@ end
 
 return {
     start('dm', '$\n\t<>\n$', { i(1) }, markup),
-    snip('ll', ' $<>$ ', { i(1, '1+1') }, markup),
+    snip('ll', ' $<>$', { i(1, '1+1') }, markup),
     unpack(document_snippets),
 }
diff --git a/lua/typstar/snippets/math.lua b/lua/typstar/snippets/math.lua
index 6204bab..050f7e2 100644
--- a/lua/typstar/snippets/math.lua
+++ b/lua/typstar/snippets/math.lua
@@ -10,6 +10,7 @@ return {
     snip('fa', 'forall ', {}, math),
     snip('ex', 'exists ', {}, math),
     snip('ni', 'in.not ', {}, math),
+    snip('Sq', 'square', {}, math),
 
     -- logical chunks
     snip('fen', 'forall epsilon>>0 ', {}, math),
@@ -22,10 +23,10 @@ return {
     snip('no', 'not ', {}, math),
 
     -- relations
-    snip('el', '=', {}, math),
-    snip('df', ':=', {}, math),
-    snip('lt', '<<', {}, math),
-    snip('gt', '>>', {}, math),
+    snip('el', '= ', {}, math),
+    snip('df', ':= ', {}, math),
+    snip('lt', '<< ', {}, math),
+    snip('gt', '>> ', {}, math),
     snip('le', '<<= ', {}, math),
     snip('ne', '!= ', {}, math),
     snip('ge', '>>= ', {}, math),
@@ -35,6 +36,7 @@ return {
     snip('(.*)ak', '<>-', { cap(1) }, math),
     snip('oak', 'plus.circle ', {}, math, 1100),
     snip('bak', 'plus.square ', {}, math, 1100),
+    snip('mak', 'plus.minus ', {}, math, 1100),
     snip('xx', 'times ', {}, math),
     snip('oxx', 'times.circle ', {}, math),
     snip('bxx', 'times.square ', {}, math),
@@ -42,15 +44,15 @@ return {
     -- sets
     snip('set', '{<>}', { i(1) }, math),
     snip('es', 'emptyset ', {}, math),
-    snip('ses', '{emptyset}', {}, math),
+    snip('ses', '{emptyset} ', {}, math),
     snip('sp', 'supset ', {}, math),
     snip('sb', 'subset ', {}, math),
     snip('sep', 'supset.eq ', {}, math),
     snip('seb', 'subset.eq ', {}, math),
     snip('nn', 'sect ', {}, math),
     snip('uu', 'union ', {}, math),
-    snip('bnn', 'sect.big', {}, math, 1100),
-    snip('buu', 'untion.big', {}, math, 1100),
+    snip('bnn', 'sect.big ', {}, math, 1100),
+    snip('buu', 'untion.big ', {}, math, 1100),
     snip('swo', 'without ', {}, math),
 
     -- misc
@@ -58,7 +60,7 @@ return {
     snip('mt', '|->> ', {}, math),
     snip('Oo', 'compose ', {}, math),
     snip('iso', 'tilde.equiv ', {}, math),
-    snip('rrn', 'RR^n', {}, math),
+    snip('rrn', 'RR^n ', {}, math),
     snip('cc', 'cases(\n\t<>\n)\\', { i(1, '1') }, math),
     snip('(.*)iv', '<>^(-1)', { cap(1) }, math),
     snip('(.*)sr', '<>^(2)', { cap(1) }, math),
@@ -69,6 +71,6 @@ return {
     snip('oit', 'integral_(Omega}', {}, math),
     snip('dit', 'integral_{<>}', { i(1, 'Omega') }, math),
     snip('sm', 'sum_(<>)^(<>)', { i(1, 'i=0'), i(2, 'oo') }, math),
-    snip('lm', 'lim <> ', { i(1, 'n') }, math),
-    snip('lim', 'lim_(<> ->> <>) <> ', { i(1, 'n'), i(2, 'oo'), i(3) }, math),
+    snip('lm', 'lim <>', { i(1, 'a_n') }, math),
+    snip('lim', 'lim_(<> ->> <>) <>', { i(1, 'n'), i(2, 'oo'), i(3, 'a_n') }, math),
 }
diff --git a/lua/typstar/snippets/visual.lua b/lua/typstar/snippets/visual.lua
index ec6a748..6bf869d 100644
--- a/lua/typstar/snippets/visual.lua
+++ b/lua/typstar/snippets/visual.lua
@@ -60,8 +60,11 @@ local wrap_brackets = function(args, snippet, val)
 end
 
 for _, val in pairs(operations) do
-    table.insert(snippets, snip(val[1], val[2] .. '<>' .. val[3], { d(1, get_visual), extra_node }, math))
-    table.insert(snippets, snip('%s' .. val[1], val[2] .. '<>' .. val[3], { i(1, '1'), extra_node }, math))
+    table.insert(snippets, snip(val[1], val[2] .. '<>' .. val[3], { d(1, get_visual) }, math))
+    table.insert(snippets, snip('[%s$]' .. val[1], val[2] .. '<>' .. val[3], { i(1, '1') }, math))
+    table.insert(snippets,
+        snip('([%w]+)'
+            .. val[1], val[2] .. '<>' .. val[3], { cap(1) }, math, 900))
     table.insert(snippets,
         snip('(.*[%)|%]|%}])' .. val[1], '<>', { f(wrap_brackets, {}, { user_args = { val } }), nil }, math, 1100))
 end