From 794648f24e1dd12906857a5466f4c302503268b0 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Fri, 23 Jun 2023 17:16:42 +0900 Subject: [PATCH 1/2] add: nvim: snippet for satysfi math --- bin/install.sh | 4 + dotfiles/neovim/after/ftplugin/satysfi.lua | 6 + dotfiles/neovim/init.lua | 14 +- dotfiles/neovim/luasnippets/all.lua | 43 +++ dotfiles/neovim/luasnippets/satysfi/math.lua | 343 +++++++++++++++++++ 5 files changed, 408 insertions(+), 2 deletions(-) create mode 100644 dotfiles/neovim/luasnippets/all.lua create mode 100644 dotfiles/neovim/luasnippets/satysfi/math.lua diff --git a/bin/install.sh b/bin/install.sh index 3b2c009..4b29cfb 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -33,4 +33,8 @@ mkdir -p ~/.config/nvim/after/queries/satysfi curl -o ~/.config/nvim/after/queries/satysfi/highlights.scm https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/highlights.scm curl -o ~/.config/nvim/after/queries/satysfi/indents.scm https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/indents.scm curl -o ~/.config/nvim/after/queries/satysfi/matchup.scm https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/matchup.scm +mkdir -p ~/.config/nvim/luasnippets +ln -sf $(pwd)/dotfiles/neovim/luasnippets/all.lua ~/.config/nvim/luasnippets/all.lua +mkdir -p ~/.config/nvim/luasnippets/satysfi +ln -sf $(pwd)/dotfiles/neovim/luasnippets/satysfi/math.lua ~/.config/nvim/luasnippets/satysfi/math.lua diff --git a/dotfiles/neovim/after/ftplugin/satysfi.lua b/dotfiles/neovim/after/ftplugin/satysfi.lua index 0a35a06..60188c5 100644 --- a/dotfiles/neovim/after/ftplugin/satysfi.lua +++ b/dotfiles/neovim/after/ftplugin/satysfi.lua @@ -5,3 +5,9 @@ vim.o.tabstop = 2 vim.o.shiftwidth = 2 + +-- require'luasnip.loaders.from_lua'.load { +-- paths = "./luasnippets" +-- } + +-- print("LuaSnip for satysfi loaded!") diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index 261fe74..e6131bd 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -90,6 +90,7 @@ require('lazy').setup({ 'hrsh7th/cmp-cmdline', -- command line 'hrsh7th/cmp-omni', -- source for omnifunc 'hrsh7th/cmp-nvim-lua', -- nvim lua + 'hrsh7th/cmp-nvim-lsp-signature-help', }, }, { @@ -489,7 +490,11 @@ end -- nvim-cmp setup local cmp = require 'cmp' local luasnip = require 'luasnip' -luasnip.config.setup {} +luasnip.config.setup { + enable_autosnippets = true, + store_selection_key = "", +} +require 'luasnip.loaders.from_lua'.load({paths = './luasnippets'}) cmp.setup { snippet = { @@ -524,9 +529,13 @@ cmp.setup { end end, { 'i', 's' }), }), + sorting = { + priority_weight = 10, + }, sources = { + { name = 'luasnip', max_item_count = 10 }, { name = 'nvim_lsp' }, - { name = 'luasnip' }, + { name = 'nvim_lsp_signature_help' }, { name = 'buffer' }, { name = 'latex_symbols', @@ -536,6 +545,7 @@ cmp.setup { }, { name = 'path' }, { name = 'nvim_lua' }, + { name = 'luasnip' }, }, } -- cmdline completions diff --git a/dotfiles/neovim/luasnippets/all.lua b/dotfiles/neovim/luasnippets/all.lua new file mode 100644 index 0000000..5b23eca --- /dev/null +++ b/dotfiles/neovim/luasnippets/all.lua @@ -0,0 +1,43 @@ +local ls = require("luasnip") +local s = ls.snippet +local sn = ls.snippet_node +local isn = ls.indent_snippet_node +local t = ls.text_node +local i = ls.insert_node +local f = ls.function_node +local c = ls.choice_node +local d = ls.dynamic_node +local r = ls.restore_node +local events = require("luasnip.util.events") +local ai = require("luasnip.nodes.absolute_indexer") +local extras = require("luasnip.extras") +local l = extras.lambda +local rep = extras.rep +local p = extras.partial +local m = extras.match +local n = extras.nonempty +local dl = extras.dynamic_lambda +local fmt = require("luasnip.extras.fmt").fmt +local fmta = require("luasnip.extras.fmt").fmta +local conds = require("luasnip.extras.expand_conditions") +local postfix = require("luasnip.extras.postfix").postfix +local types = require("luasnip.util.types") +local parse = require("luasnip.util.parser").parse_snippet +local ms = ls.multi_snippet +local k = require("luasnip.nodes.key_indexer").new_key + +-- print("LuaSnip for all") +-- return { +-- s("trig", t("loaded!!")) +-- } + +-- return { +-- s( +-- {trig = "@a"}, +-- {t("\\alpha")} +-- ), +-- s( +-- {trig = ";a"}, +-- {t("\\alpha")} +-- ), +-- } diff --git a/dotfiles/neovim/luasnippets/satysfi/math.lua b/dotfiles/neovim/luasnippets/satysfi/math.lua new file mode 100644 index 0000000..3cb5a05 --- /dev/null +++ b/dotfiles/neovim/luasnippets/satysfi/math.lua @@ -0,0 +1,343 @@ +local ls = require("luasnip") +local s = ls.snippet +local sn = ls.snippet_node +local isn = ls.indent_snippet_node +local t = ls.text_node +local i = ls.insert_node +local f = ls.function_node +local c = ls.choice_node +local d = ls.dynamic_node +local r = ls.restore_node +local events = require("luasnip.util.events") +local ai = require("luasnip.nodes.absolute_indexer") +local extras = require("luasnip.extras") +local l = extras.lambda +local rep = extras.rep +local p = extras.partial +local m = extras.match +local n = extras.nonempty +local dl = extras.dynamic_lambda +local fmt = require("luasnip.extras.fmt").fmt +local fmta = require("luasnip.extras.fmt").fmta +local conds = require("luasnip.extras.expand_conditions") +local postfix = require("luasnip.extras.postfix").postfix +local types = require("luasnip.util.types") +local parse = require("luasnip.util.parser").parse_snippet +local ms = ls.multi_snippet +local k = require("luasnip.nodes.key_indexer").new_key +local conds_expand = require("luasnip.extras.conditions.expand") + +local util = require'nvim-treesitter.ts_utils' +function isinmath(_, _, _) + print("isinmath invoked") + local node = util.get_node_at_cursor() + if not node then + return false + end + while (node:type() and node:type() ~= 'block_text' and node:type() ~= 'inline_text' and node:type()) do + if string.match(node:type(), 'math') then + return true + end + node = node:parent() + if not node then + return false + end + end + return false +end + +function tisinmath(_, _, _) + print("isinmath invoked") + local node = util.get_node_at_cursor() + if not node then + return false + end + while (node:type() and node:type() ~= 'block_text' and node:type() ~= 'inline_text' and node:type()) do + if string.match(node:type(), 'math') then + return tostring(node:type()) + end + node = node:parent() + if not node then + return tostring(node:type()) + end + end + return tostring(node:type()) +end + +local is_even_line = function() + local line_number = vim.fn['line']('.') + if ((line_number % 2) == 0) then -- an even-numbered line + return true + else -- an odd-numbered line + return false + end +end + +return { + s("trig", t("loaded!!")), + s("testmath", f(tisinmath)), + s( + {trig = "@a", regTrig = true, show_condition = isinmath}, + {t("\\alpha")} + ), + s( + {trig = ";a", show_condition = isinmath}, + {t("\\alpha")} + ), + -- s( + -- {trig = "^@a", show_condition = isinmath}, + -- {t("\\alpha")} + -- ), + -- s( + -- {trig = "@@@@a", show_condition = isinmath}, + -- {t("\\alpha")} + -- ), + -- s( + -- {trig = "parti", show_condition = isinmath}, + -- {t("\\alpha")} + -- ), + -- s( + -- {trig = "@aaaaaaaa", show_condition = isinmath}, + -- {t("\\alpha")} + -- ), + s( + {trig = ";A", show_condition = isinmath}, + t("\\Alpha") + ), + s( + {trig = ";b", show_condition = isinmath}, + t("\\beta") + ), + s( + {trig = ";B", show_condition = isinmath}, + t("\\Beta") + ), + s( + {trig = ";d", show_condition = isinmath}, + t("\\delta") + ), + s( + {trig = ";D", show_condition = isinmath}, + t("\\Delta") + ), + s( + {trig = ";g", show_condition = isinmath}, + t("\\gamma") + ), + s( + {trig = ";G", show_condition = isinmath}, + t("\\Gamma") + ), + s( + {trig = ";e", show_condition = isinmath}, + t("\\epsilon") + ), + s( + {trig = ";ve", show_condition = isinmath}, + t("\\varepsilon") + ), + s( + {trig = ";E", show_condition = isinmath}, + t("\\Epsilon") + ), + s( + {trig = ";z", show_condition = isinmath}, + t("\\zeta") + ), + s( + {trig = ";Z", show_condition = isinmath}, + t("\\Zeta") + ), + s( + {trig = ";h", show_condition = isinmath}, + t("\\eta") + ), + s( + {trig = ";H", show_condition = isinmath}, + t("\\Eta") + ), + s( + {trig = ";q", show_condition = isinmath}, + t("\\theta") + ), + s( + {trig = ";vq", show_condition = isinmath}, + t("\\vartheta") + ), + s( + {trig = ";Q", show_condition = isinmath}, + t("\\Theta") + ), + s( + {trig = ";i", show_condition = isinmath}, + t("\\iota") + ), + s( + {trig = ";I", show_condition = isinmath}, + t("\\Iota") + ), + s( + {trig = ";k", show_condition = isinmath}, + t("\\kappa") + ), + s( + {trig = ";K", show_condition = isinmath}, + t("\\Kappa") + ), + s( + {trig = ";l", show_condition = isinmath}, + t("\\lambda") + ), + s( + {trig = ";L", show_condition = isinmath}, + t("\\Lambda") + ), + s( + {trig = ";m", show_condition = isinmath}, + t("\\mu") + ), + s( + {trig = ";M", show_condition = isinmath}, + t("\\Mu") + ), + s( + {trig = ";n", show_condition = isinmath}, + t("\\nu") + ), + s( + {trig = ";N", show_condition = isinmath}, + t("\\Nu") + ), + s( + {trig = ";x", show_condition = isinmath}, + t("\\xi") + ), + s( + {trig = ";X", show_condition = isinmath}, + t("\\Xi") + ), + s( + {trig = ";p", show_condition = isinmath}, + t("\\pi") + ), + s( + {trig = ";P", show_condition = isinmath}, + t("\\Pi") + ), + s( + {trig = ";vp", show_condition = isinmath}, + t("\\varpi") + ), + s( + {trig = ";r", show_condition = isinmath}, + t("\\rho") + ), + s( + {trig = ";R", show_condition = isinmath}, + t("\\Rho") + ), + s( + {trig = ";vr", show_condition = isinmath}, + t("\\varrho") + ), + s( + {trig = ";s", show_condition = isinmath}, + t("\\sigma") + ), + s( + {trig = ";S", show_condition = isinmath}, + t("\\Sigma") + ), + s( + {trig = ";vs", show_condition = isinmath}, + t("\\varsigma") + ), + s( + {trig = ";t", show_condition = isinmath}, + t("\\tau") + ), + s( + {trig = ";T", show_condition = isinmath}, + t("\\Tau") + ), + s( + {trig = ";u", show_condition = isinmath}, + t("\\upsilon") + ), + s( + {trig = ";U", show_condition = isinmath}, + t("\\Upsilon") + ), + s( + {trig = ";f", show_condition = isinmath}, + t("\\phi") + ), + s( + {trig = ";F", show_condition = isinmath}, + t("\\Phi") + ), + s( + {trig = ";vf", show_condition = isinmath}, + t("\\varphi") + ), + s( + {trig = ";c", show_condition = isinmath}, + t("\\chi") + ), + s( + {trig = ";C", show_condition = isinmath}, + t("\\Chi") + ), + s( + {trig = ";y", show_condition = isinmath}, + t("\\psi") + ), + s( + {trig = ";Y", show_condition = isinmath}, + t("\\Psi") + ), + s( + {trig = ";o", show_condition = isinmath}, + t("\\omega") + ), + s( + {trig = ";O", show_condition = isinmath}, + t("\\Omega") + ), + s( + {trig = ";vo", show_condition = isinmath}, + t("\\varomega") + ), + s( + {trig = ";6", show_condition = isinmath}, + t("\\partial") + ), + s( + {trig = ";%", show_condition = isinmath}, + {t("\\frac{"), i(1), t("}{"), i(2), t("}")} + ), + s( + {trig = ";/", show_condition = isinmath}, + {t("\\frac{"), i(1), t("}{"), i(2), t("}")} + ), + s( + {trig = ";2", show_condition = isinmath}, + {t("\\sqrt{"), i(1), t("}")} + ), + s( + {trig = ";,", show_condition = isinmath}, + t("\\nonumber") + ), + s( + {trig = ";.", show_condition = isinmath}, + t("\\cdot") + ), + s( + {trig = ";8", show_condition = isinmath}, + t("\\infty") + ), + s( + {trig = ";^", show_condition = isinmath}, + {t("\\Hat{"), i(1), t("}")} + ), +} From 71365f318d5893c5ee687c035aa9bd047814e757 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Fri, 23 Jun 2023 17:19:12 +0900 Subject: [PATCH 2/2] add: nvim: snippet doc --- dotfiles/neovim/luasnippets/satysfi/math.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dotfiles/neovim/luasnippets/satysfi/math.lua b/dotfiles/neovim/luasnippets/satysfi/math.lua index 3cb5a05..770ff01 100644 --- a/dotfiles/neovim/luasnippets/satysfi/math.lua +++ b/dotfiles/neovim/luasnippets/satysfi/math.lua @@ -1,3 +1,13 @@ +-- [[ +-- snippet for greek alphabet and common math-commands +-- +-- all snippets have prefix `;` +-- note: +-- `@` doesn't work well with satysfi-language-server +-- +-- all snippets work only in math (not in inline_text) +-- ]] + local ls = require("luasnip") local s = ls.snippet local sn = ls.snippet_node