chris/nvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chris:treesitterUpdate
Branches Tags
chris:main chris:treesitterUpdate chris:fix-detached
...
compare: chris:1f58b9f1368c65c23054c6c631ea60eed1c08265
Branches Tags
chris:main chris:treesitterUpdate chris:fix-detached

2 Commits
treesitter ... 1f58b9f136

Author SHA1 Message Date
Chris
1f58b9f136 More snippets 2025-12-17 16:52:51 +00:00
Chris
4d3aada204 Remove textobjects 2025-12-10 14:26:27 +00:00
3 changed files with 153 additions and 210 deletions
Expand all files Collapse all files

86
lua/plugins/treesitter-textobjects.lua
View File

@@ -1,86 +0,0 @@
return {
'nvim-treesitter/nvim-treesitter-textobjects',
dependencies = {
'nvim-treesitter/nvim-treesitter',
},
lazy = false,
enabled = true,
config = function()
require('nvim-treesitter.configs').setup {
incremental_selection = {
enable = true,
keymaps = {
-- mappings for incremental selection (visual mappings)
init_selection = 'gnn', -- maps in normal mode to init the node/scope selection
node_incremental = 'grn', -- increment to the upper named parent
scope_incremental = 'grc', -- increment to the upper scope (as defined in locals.scm)
node_decremental = 'grm', -- decrement to the previous node
},
},
textobjects = {
-- syntax-aware textobjects
enable = true,
keymaps = {
['iL'] = {
-- you can define your own textobjects directly here
go = '(function_definition) @function',
},
-- or you use the queries from supported languages with textobjects.scm
['af'] = '@function.outer',
['if'] = '@function.inner',
['aC'] = '@class.outer',
['iC'] = '@class.inner',
['ay'] = '@conditional.outer',
['iy'] = '@conditional.inner',
['aj'] = '@loop.outer',
['ij'] = '@loop.inner',
['is'] = '@statement.inner',
['as'] = '@statement.outer',
['ac'] = '@comment.outer',
['ic'] = '@comment.inner',
['ap'] = '@comment.parameter',
['ip'] = '@comment.parameter',
},
move = {
enable = true,
set_jumps = true, -- whether to set jumps in the jumplist
goto_next_start = {
[']m'] = '@function.outer',
[']]'] = '@class.outer',
},
goto_next_end = {
[']M'] = '@function.outer',
[']['] = '@class.outer',
},
goto_previous_start = {
['[m'] = '@function.outer',
['[['] = '@class.outer',
},
goto_previous_end = {
['[M'] = '@function.outer',
['[]'] = '@class.outer',
},
},
select = {
enable = true,
keymaps = {
-- You can use the capture groups defined in textobjects.scm
['af'] = '@function.outer',
['if'] = '@function.inner',
['ac'] = '@class.outer',
['ic'] = '@class.inner',
-- Or you can define your own textobjects like this
['iF'] = {
python = '(function_definition) @function',
cpp = '(function_definition) @function',
c = '(function_definition) @function',
java = '(method_declaration) @function',
go = '(method_declaration) @function',
},
},
},
},
}
end,
}

261
lua/snippets/php.lua
View File

@@ -16,6 +16,7 @@ local fmta = extend_decorator.apply(fmt, { delimiters = '#~' })
local utils = require 'snippets.snip_utils' local utils = require 'snippets.snip_utils'
local tr = utils.tr local tr = utils.tr
local etr = utils.etr local etr = utils.etr
local Etr = utils.Etr
local atr = utils.atr local atr = utils.atr
local ctr = utils.ctr local ctr = utils.ctr
local bs = utils.bs local bs = utils.bs
@@ -69,10 +70,10 @@ return {
--------------- ---------------
-- DEBUGGING -- -- DEBUGGING --
--------------- ---------------
s(etr('du ', 'Dump a variable to the dump server'), fmta('dump(#~);', { i(0) })), s(etr('du ', 'Dump a variable to the dump server', { priority = 1001 }), fmta('dump(#~);', { i(0) })),
bs(atr('du ', 'Dump a variable to the dump server'), fmta('dump(#~)', { i(0) })), bs(etr('du ', 'Dump a variable to the dump server'), fmta('dump(#~)', { i(0) })),
s(etr('r ', 'ray'), fmta('ray(#~);', { i(0) })), s(etr('r ', 'ray', { priority = 1001 }), fmta('ray(#~);', { i(0) })),
bs(atr('r ', 'ray'), fmta('ray(#~)', { i(0) })), bs(etr('r ', 'ray'), fmta('ray(#~)', { i(0) })),
s(etr('dt ', 'Dump PHPStan type definition'), fmta('\\PhpStan\\dumpType(#~);', { i(0) })), s(etr('dt ', 'Dump PHPStan type definition'), fmta('\\PhpStan\\dumpType(#~);', { i(0) })),
s( s(
etr('ql ', 'Log all queries'), etr('ql ', 'Log all queries'),
@@ -107,6 +108,7 @@ return {
}), }),
s(etr('@v', '@var docblock'), fmta('/** @var #~ $#~ */', { i(1), i(0) })), s(etr('@v', '@var docblock'), fmta('/** @var #~ $#~ */', { i(1), i(0) })),
s(ctr('@v', '@var docblock'), fmta('@var #~ $#~', { i(1), i(0) })), s(ctr('@v', '@var docblock'), fmta('@var #~ $#~', { i(1), i(0) })),
s(Etr('@pi', '@phpstan-ignore'), fmta('// @phpstan-ignore #~ (#~)', { i(1), i(0) })),
s(ctr('* @pr', 'Class property docblock'), fmta('* @property #~ $#~', { i(1), i(0) })), s(ctr('* @pr', 'Class property docblock'), fmta('* @property #~ $#~', { i(1), i(0) })),
s(ctr('* @pb', 'Class boolean property docblock'), fmta('* @property bool $#~', { i(0) })), s(ctr('* @pb', 'Class boolean property docblock'), fmta('* @property bool $#~', { i(0) })),
s(ctr('* @pi', 'Class int property docblock'), fmta('* @property int $#~', { i(0) })), s(ctr('* @pi', 'Class int property docblock'), fmta('* @property int $#~', { i(0) })),
@@ -212,36 +214,36 @@ return {
), ),
}), }),
}), }),
s( -- s(
etr('con', 'Constructor function block'), -- etr('con', 'Constructor function block'),
c(1, { -- c(1, {
sn( -- sn(
nil, -- nil,
fmta( -- fmta(
[[ -- [[
public function __construct(#~) -- public function __construct(#~)
{ -- {
#~ -- #~
} -- }
]], -- ]],
{ i(1), i(2) } -- { i(1), i(2) }
) -- )
), -- ),
sn( -- sn(
nil, -- nil,
fmta( -- fmta(
[[ -- [[
public function __construct( -- public function __construct(
#~ -- #~
) { -- ) {
#~ -- #~
} -- }
]], -- ]],
{ i(1), i(2) } -- { i(1), i(2) }
) -- )
), -- ),
}) -- })
), -- ),
bs(atr('function', 'Shorthand function block'), fmta('fun', {})), bs(atr('function', 'Shorthand function block'), fmta('fun', {})),
bs(atr('s%$', 'string type parameter'), fmta('string $#~', { i(0, 'var') })), bs(atr('s%$', 'string type parameter'), fmta('string $#~', { i(0, 'var') })),
bs(atr('i%$', 'int type parameter'), fmta('int $#~', { i(0, 'var') })), bs(atr('i%$', 'int type parameter'), fmta('int $#~', { i(0, 'var') })),
@@ -358,9 +360,20 @@ return {
etr('test', 'Create a test function'), etr('test', 'Create a test function'),
fmta( fmta(
[[ [[
test(#~ function () { test('#~', function () {
#~ #~
}) });
]],
{ i(1), i(0) }
)
),
s(
etr('it ', 'Create a test function'),
fmta(
[[
it('#~', function () {
#~
});
]], ]],
{ i(1), i(0) } { i(1), i(0) }
) )
@@ -509,92 +522,92 @@ return {
), ),
}) })
), ),
s( -- s(
atr('->wr', 'Eloquent where method'), -- atr('->wr', 'Eloquent where method'),
c(0, { -- c(0, {
sn(nil, fmta("->where('#~', #~)", { i(1), i(0) })), -- sn(nil, fmta("->where('#~', #~)", { i(1), i(0) })),
sn(nil, fmta('->where(fn ($query) => #~)', { i(0) })), -- sn(nil, fmta('->where(fn ($query) => #~)', { i(0) })),
sn( -- sn(
nil, -- nil,
fmta( -- fmta(
[[ -- [[
->where(function ($query) { -- ->where(function ($query) {
#~ -- #~
}) -- })
]], -- ]],
{ i(0) } -- { i(0) }
) -- )
), -- ),
sn( -- sn(
nil, -- nil,
fmta( -- fmta(
[[ -- [[
->where(function ($query) use (#~) { -- ->where(function ($query) use (#~) {
#~ -- #~
}) -- })
]], -- ]],
{ i(1), i(0) } -- { i(1), i(0) }
) -- )
), -- ),
}) -- })
), -- ),
s(atr('->wi', 'Eloquent where in method'), fmta("->whereIn('#~', #~)", { i(1), i(0) })), -- s(atr('->wi', 'Eloquent where in method'), fmta("->whereIn('#~', #~)", { i(1), i(0) })),
s(atr('->wn', 'Eloquent where not in method'), fmta("->whereNotIn('#~', #~)", { i(1), i(0) })), -- s(atr('->wn', 'Eloquent where not in method'), fmta("->whereNotIn('#~', #~)", { i(1), i(0) })),
s( -- s(
atr('->wh', 'Eloquent where has method'), -- atr('->wha', 'Eloquent where has method'),
c(0, { -- c(0, {
sn(nil, fmta("->whereHas('#~')", { i(1) })), -- sn(nil, fmta("->whereHas('#~')", { i(1) })),
sn(nil, fmta("->whereHas('#~', fn ($query) => #~)", { i(1), i(0) })), -- sn(nil, fmta("->whereHas('#~', fn ($query) => #~)", { i(1), i(0) })),
sn( -- sn(
nil, -- nil,
fmta( -- fmta(
[[ -- [[
->whereHas('#~', function ($query) { -- ->whereHas('#~', function ($query) {
#~ -- #~
}) -- })
]], -- ]],
{ i(1), i(0) } -- { i(1), i(0) }
) -- )
), -- ),
sn( -- sn(
nil, -- nil,
fmta( -- fmta(
[[ -- [[
->whereHas('#~', function ($query) use (#~) { -- ->whereHas('#~', function ($query) use (#~) {
#~ -- #~
}) -- })
]], -- ]],
{ i(1), i(2), i(0) } -- { i(1), i(2), i(0) }
) -- )
), -- ),
}) -- })
), -- ),
s( -- s(
atr('->we', 'Eloquent where exists method'), -- atr('->we', 'Eloquent where exists method'),
c(0, { -- c(0, {
sn(nil, fmta('->whereExists(fn ($query) => #~)', { i(0) })), -- sn(nil, fmta('->whereExists(fn ($query) => #~)', { i(0) })),
sn( -- sn(
nil, -- nil,
fmta( -- fmta(
[[ -- [[
->whereExists(function ($query) { -- ->whereExists(function ($query) {
#~ -- #~
}) -- })
]], -- ]],
{ i(0) } -- { i(0) }
) -- )
), -- ),
sn( -- sn(
nil, -- nil,
fmta( -- fmta(
[[ -- [[
->whereExists(function ($query) use (#~) { -- ->whereExists(function ($query) use (#~) {
#~ -- #~
}) -- })
]], -- ]],
{ i(1), i(0) } -- { i(1), i(0) }
) -- )
), -- ),
}) -- })
), -- ),
} }

16
lua/snippets/snip_utils.lua
View File

@@ -11,6 +11,7 @@ local d = ls.dynamic_node
local fmt = require('luasnip.extras.fmt').fmt local fmt = require('luasnip.extras.fmt').fmt
local rep = require('luasnip.extras').rep local rep = require('luasnip.extras').rep
local line_begin = require('luasnip.extras.conditions').line_begin local line_begin = require('luasnip.extras.conditions').line_begin
local line_end = require('luasnip.extras.conditions').line_end
local extend_decorator = require 'luasnip.util.extend_decorator' local extend_decorator = require 'luasnip.util.extend_decorator'
local fmta = extend_decorator.apply(fmt, { delimiters = '#~' }) local fmta = extend_decorator.apply(fmt, { delimiters = '#~' })
@@ -109,6 +110,21 @@ utils.atr = function(trigger, description, options)
) )
end end
--- Create a trigger for a snippet to expand at the end of a line
---@param trigger string
---@param description? string
---@param options? table
---@return table
utils.Etr = function(trigger, description, options)
return utils.tr(
trigger,
description,
vim.tbl_extend('force', {
condition = line_end
}, options or {})
)
end
--- Create a snippet that will expand anywhere but in the middle of a word --- Create a snippet that will expand anywhere but in the middle of a word
---@param trigger any ---@param trigger any
---@param nodes any ---@param nodes any