nvim-plugins/LuaSnip
1
0
Fork 0
mirror of https://github.com/L3MON4D3/LuaSnip synced 2024-09-16 21:54:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Format with stylua

Browse source
This commit is contained in:
L3MON4D3 2023-12-01 20:54:31 +00:00 committed by github-actions[bot]
parent 259a3f5b66
commit 86acb67b6f
4 changed files with 111 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lua/luasnip/util/jsregexp.lua
View file

@ -16,7 +16,8 @@ local jsregexp_core_path = Path.join(repo_dir, "deps", "luasnip-jsregexp.so")
--
-- This means we don't hinder a regularly installed 0.0.6-jsregexp-library,
-- since its `require("jsregexp.core")` will be unaffected.
package.preload["jsregexp.core"] = package.loadlib(jsregexp_core_path, "luaopen_jsregexp_core")
package.preload["jsregexp.core"] =
package.loadlib(jsregexp_core_path, "luaopen_jsregexp_core")
-- jsregexp: first try loading the version installed by luasnip, then global ones.
local jsregexp_ok, jsregexp = pcall(require, "luasnip-jsregexp")

15
lua/luasnip/util/parser/ast_utils.lua
View file

@ -323,17 +323,26 @@ function M.apply_transform(transform)
-- begin_ind and end_ind are inclusive.
transformed = transformed
.. lines:sub(prev_match_end + 1, match.begin_ind - 1)
.. apply_transform_format(transform.format, match.groups)
.. apply_transform_format(
transform.format,
match.groups
)
-- end-inclusive
prev_match_end = match.end_ind
end
transformed = transformed .. lines:sub(prev_match_end + 1, #lines)
transformed = transformed
.. lines:sub(prev_match_end + 1, #lines)
return vim.split(transformed, "\n")
end
else
log.error("Failed parsing regex `%s` with options `%s`: %s", transform.pattern, transform.option, err)
log.error(
"Failed parsing regex `%s` with options `%s`: %s",
transform.pattern,
transform.option,
err
)
-- fall through to returning identity.
end
end

11
tests/helpers.lua
View file

@ -6,9 +6,10 @@ local assert = require("luassert")
local M = {}
function M.jsregexp_it(it, name, fn)
for _, version in ipairs({"005", "006", "luasnip"}) do
for _, version in ipairs({ "005", "006", "luasnip" }) do
it(name .. " (jsregexp-" .. version .. ")", function()
exec_lua([[
exec_lua(
[[
local version, jsregexp_005_path, jsregexp_path = ...
if version ~= "luasnip" then
if version == "005" then
@ -47,7 +48,11 @@ function M.jsregexp_it(it, name, fn)
return old_require(modulename)
end
end
]], version, os.getenv("JSREGEXP005_ABS_PATH"), os.getenv("JSREGEXP_ABS_PATH"))
]],
version,
os.getenv("JSREGEXP005_ABS_PATH"),
os.getenv("JSREGEXP_ABS_PATH")
)
fn()
end)

157
tests/integration/parser_spec.lua
View file

@ -295,19 +295,23 @@ describe("Parser", function()
error("unexpected key " .. modifier .. " in expected_map")
end
ls_helpers.jsregexp_it(it, "applies " .. modifier .. " correctly", function()
ls_helpers.session_setup_luasnip()
local snip = ('"${1:%s} ${1/(.*)/${1:/%s}/}"'):format(
text,
modifier
)
ls_helpers.jsregexp_it(
it,
"applies " .. modifier .. " correctly",
function()
ls_helpers.session_setup_luasnip()
local snip = ('"${1:%s} ${1/(.*)/${1:/%s}/}"'):format(
text,
modifier
)
-- should be sufficient to test this.
ls_helpers.lsp_static_test(
snip,
{ "test text Text " .. modified_expected }
)
end)
-- should be sufficient to test this.
ls_helpers.lsp_static_test(
snip,
{ "test text Text " .. modified_expected }
)
end
)
end
end
@ -465,28 +469,32 @@ describe("Parser", function()
})
end)
ls_helpers.jsregexp_it(it, "handle multiple captures in transform.", function()
ls_helpers.session_setup_luasnip()
local snip = '"${1:bbb} a ${1/(.)b(.)/${1:/upcase} $2/g} a"'
ls_helpers.jsregexp_it(
it,
"handle multiple captures in transform.",
function()
ls_helpers.session_setup_luasnip()
local snip = '"${1:bbb} a ${1/(.)b(.)/${1:/upcase} $2/g} a"'
ls_helpers.lsp_static_test(snip, { "bbb a B b a" })
ls_helpers.lsp_static_test(snip, { "bbb a B b a" })
exec_lua("ls.lsp_expand(" .. snip .. ")")
screen:expect({
grid = [[
exec_lua("ls.lsp_expand(" .. snip .. ")")
screen:expect({
grid = [[
^b{3:bb} a B b a |
{0:~ }|
{2:-- SELECT --} |]],
})
feed("bbbbbb")
exec_lua("ls.jump(1)")
screen:expect({
grid = [[
})
feed("bbbbbb")
exec_lua("ls.jump(1)")
screen:expect({
grid = [[
bbbbbb a B bB b a^ |
{0:~ }|
{2:-- INSERT --} |]],
})
end)
})
end
)
it("can parse lazy variables.", function()
ls_helpers.session_setup_luasnip()
@ -693,39 +701,48 @@ describe("Parser", function()
})
end)
ls_helpers.jsregexp_it(it, "Applies transform to empty variable.", function()
ls_helpers.session_setup_luasnip()
local snip = "${TM_SELECTED_TEXT/(.*)/ asd /}"
ls_helpers.jsregexp_it(
it,
"Applies transform to empty variable.",
function()
ls_helpers.session_setup_luasnip()
local snip = "${TM_SELECTED_TEXT/(.*)/ asd /}"
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
screen:expect({
grid = [[
screen:expect({
grid = [[
asd ^ |
{0:~ }|
{2:-- INSERT --} |]],
})
end)
})
end
)
ls_helpers.jsregexp_it(it, "correctly transforms multiline-values.", function()
ls_helpers.session_setup_luasnip()
local snip = "${TM_SELECTED_TEXT/([^]*)/a ${1} a/}"
ls_helpers.jsregexp_it(
it,
"correctly transforms multiline-values.",
function()
ls_helpers.session_setup_luasnip()
local snip = "${TM_SELECTED_TEXT/([^]*)/a ${1} a/}"
-- expand snippet with selected multiline-text.
feed("iasdf<Cr>asdf<Esc>Vk<Tab>")
-- wait a bit..
exec('call wait(200, "0")')
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
-- expand snippet with selected multiline-text.
feed("iasdf<Cr>asdf<Esc>Vk<Tab>")
-- wait a bit..
exec('call wait(200, "0")')
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
screen:expect({
grid = [[
screen:expect({
grid = [[
a asdf |
asdf a^ |
{2:-- INSERT --} |]],
})
end)
})
end
)
ls_helpers.jsregexp_it(it,
ls_helpers.jsregexp_it(
it,
"correctly transforms if the match does not include the first character.",
function()
ls_helpers.session_setup_luasnip()
@ -859,40 +876,44 @@ describe("Parser", function()
})
end)
ls_helpers.jsregexp_it(it, "Correctly parses unescaped characters.", function()
ls_helpers.session_setup_luasnip()
ls_helpers.jsregexp_it(
it,
"Correctly parses unescaped characters.",
function()
ls_helpers.session_setup_luasnip()
local snip = "${} asdf"
local snip = "${} asdf"
-- indent, insert text, SELECT.
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
screen:expect({
grid = [[
-- indent, insert text, SELECT.
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
screen:expect({
grid = [[
${} asdf^ |
{0:~ }|
{2:-- INSERT --} |]],
})
})
feed("<Esc>cc")
snip = "${1: asdf ${\\}}"
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
screen:expect({
grid = [[
feed("<Esc>cc")
snip = "${1: asdf ${\\}}"
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
screen:expect({
grid = [[
^ {3:asdf ${}} |
{0:~ }|
{2:-- SELECT --} |]],
})
})
feed("<Esc>cc")
snip = "${TM_LINE_NUMBER/(.*)/ ${} aaaa/}"
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
screen:expect({
grid = [[
feed("<Esc>cc")
snip = "${TM_LINE_NUMBER/(.*)/ ${} aaaa/}"
exec_lua("ls.lsp_expand([[" .. snip .. "]])")
screen:expect({
grid = [[
${} aaaa^ |
{0:~ }|
{2:-- INSERT --} |]],
})
end)
})
end
)
it("correctly parses escaped characters.", function()
ls_helpers.session_setup_luasnip()