Treesitter update

lua/autocmd.lua

@@ -30,7 +30,7 @@ vim.api.nvim_create_autocmd('SwapExists', {
     desc = 'Always choose to delete the swap file, files are saved automatically',
     group = vim.api.nvim_create_augroup('NoSwaps', { clear = true }),
     callback = function(args)
-        vim.cmd("let v:swapchoice = 'd'")
+        vim.cmd "let v:swapchoice = 'd'"
     end,
 })
 
@@ -116,4 +116,33 @@ vim.api.nvim_create_autocmd('BufWritePost', {
     end,
 })
 
+vim.api.nvim_create_autocmd('FileType', {
+    pattern = {
+        'bash',
+        'c',
+        'diff',
+        'html',
+        'lua',
+        'luadoc',
+        'markdown',
+        'markdown_inline',
+        'query',
+        'vim',
+        'vimdoc',
+        'php',
+        'javascript',
+        'typescript',
+        'json',
+    },
+    callback = function()
+        -- syntax highlighting, provided by Neovim
+        vim.treesitter.start()
+        -- folds, provided by Neovim
+        vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+        vim.wo.foldmethod = 'expr'
+        -- indentation, provided by nvim-treesitter
+        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+    end,
+})
+
 require('helpers').edit_cf('a', '/lua/autocmd.lua')

lua/keymap.lua

@@ -30,13 +30,13 @@ vim.keymap.set('n', '<Leader>c', function()
     vim.treesitter.inspect_tree()
 end, { desc = 'Treesitter' })
 
-vim.keymap.set('n', '<C-S-D>', function()
+-- vim.keymap.set('n', '<C-S-D>', function()
-    local node = vim.treesitter.get_node {}
+--     local node = vim.treesitter.get_node {}
-    local range = { vim.treesitter.get_node_range(node) }
+--     local range = { vim.treesitter.get_node_range(node) }
-    vim.api.nvim_win_set_cursor(0, { range[3] + 1, range[4] - 1 })
+--     vim.api.nvim_win_set_cursor(0, { range[3] + 1, range[4] - 1 })
-    vim.fn.setpos("'x", { 0, range[1] + 1, range[2] + 1, 0 })
+--     vim.fn.setpos("'x", { 0, range[1] + 1, range[2] + 1, 0 })
-    vim.cmd.normal 'v`x'
+--     vim.cmd.normal 'v`x'
-end, { desc = 'Select surrounding treesitter node' })
+-- end, { desc = 'Select surrounding treesitter node' })
 
 vim.keymap.set('v', '<C-S-D>', function()
     local start = vim.api.nvim_win_get_cursor(0)
@@ -258,7 +258,6 @@ vim.keymap.set('n', '<Leader>]', '<CMD>cnext<CR>', { desc = 'Next item in quickf
 vim.keymap.set('n', '<Leader>[', '<CMD>cprevious<CR>', { desc = 'Previous item in quickfix list' })
 vim.keymap.set('n', 'gd', '<CMD>Telescope lsp_definitions<CR>', { desc = 'Go to definition' })
 
-
 local function open_test()
     require('neotest').summary.open()
     require('neotest').output_panel.open()

lua/plugins/treesitter-textobjects.lua

@@ -0,0 +1,153 @@
+-- Highlight, edit, and navigate code
+return {
+    -- 'nvim-treesitter/nvim-treesitter-textobjects',
+    -- lazy = true,
+    -- branch = 'main',
+    -- dependencies = {
+    --     'nvim-treesitter/nvim-treesitter',
+    -- },
+    -- config = function()
+    --     -- configuration
+    --     require('nvim-treesitter-textobjects').setup {
+    --         select = {
+    --             lookahead = true,
+    --             selection_modes = {
+    --                 ['@parameter.outer'] = 'v', -- charwise
+    --                 ['@function.outer'] = 'V', -- linewise
+    --                 ['@class.outer'] = 'V', -- blockwise
+    --             },
+    --             include_surrounding_whitespace = false,
+    --         },
+    --         move = {
+    --             set_jumps = true,
+    --         },
+    --     }
+
+    --     for keys, query in
+    --         {
+    --             -- 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',
+    --             ['an'] = '@local.scope',
+    --         }
+    --     do
+    --         vim.keymap.set({ 'n', 'x', 'o' }, keys, function()
+    --             require('nvim-treesitter-textobjects.select').select_textobject(query, 'textobjects')
+    --         end)
+    --     end
+
+    --     for keys, query in
+    --         {
+    --             -- or you use the queries from supported languages with textobjects.scm
+    --             [']'] = '@function.outer',
+    --             ['o'] = { '@loop.inner', '@loop.outer' },
+    --             ['n'] = '@local.scope',
+    --             ['y'] = '@conditional.outer',
+    --             ['e'] = '@statement.outer',
+    --             ['/'] = '@comment.outer',
+    --         }
+    --     do
+    --         vim.keymap.set({ 'n', 'x', 'o' }, ']' .. keys, function()
+    --             require('nvim-treesitter-textobjects.move').goto_next_start(query, 'textobjects')
+    --         end)
+    --         vim.keymap.set({ 'n', 'x', 'o' }, '[' .. keys, function()
+    --             require('nvim-treesitter-textobjects.move').goto_previous_start(query, 'textobjects')
+    --         end)
+    --     end
+    --     -- require('nvim-treesitter.configs').setup {
+    --     --     incremental_selection = {
+    --     --         enable = true,
+    --     --         keymaps = {
+    --     --             -- mappings for incremental selection (visual mappings)
+    --     --             init_selection = '<C-S-D>', -- maps in normal mode to init the node/scope selection
+    --     --             node_incremental = '<C-S-D>', -- increment to the upper named parent
+    --     --             scope_incremental = '<C-S-U>', -- increment to the upper scope (as defined in locals.scm)
+    --     --             node_decremental = '<C-S-S>', -- 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,
+    -- opts = {},
+    -- -- There are additional nvim-treesitter modules that you can use to interact
+    -- -- with nvim-treesitter. You should go explore a few and see what interests you:
+    -- --
+    -- --    - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
+    -- --    - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
+    -- --    - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
+}

lua/plugins/treesitter.lua

@@ -2,10 +2,11 @@
 return {
     'nvim-treesitter/nvim-treesitter',
     build = ':TSUpdate',
-    main = 'nvim-treesitter.configs', -- Sets main module to use for opts
+    branch = 'main',
     -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
-    opts = {
+    config = function()
-        ensure_installed = {
+        require('nvim-treesitter').setup {}
+        require('nvim-treesitter').install {
             'bash',
             'c',
             'diff',
@@ -17,18 +18,13 @@ return {
             'query',
             'vim',
             'vimdoc',
-        },
+            'php',
-        -- Autoinstall languages that are not installed
+            'javascript',
-        auto_install = true,
+            'typescript',
-        highlight = {
+            'json',
-            enable = true,
+        }
-            -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
+    end,
-            --  If you are experiencing weird indenting issues, add the language to
+    opts = {},
-            --  the list of additional_vim_regex_highlighting and disabled languages for indent.
-            additional_vim_regex_highlighting = { 'ruby' },
-        },
-        indent = { enable = true, disable = { 'ruby' } },
-    },
     -- There are additional nvim-treesitter modules that you can use to interact
     -- with nvim-treesitter. You should go explore a few and see what interests you:
     --

lua/projects.lua

@@ -92,39 +92,39 @@ end
 
 local function laravel_bookmarks_with_dir(dir)
     create_bookmark_maps {
-        ['e'] = dir .. '.env',
+        ['e'] = dir .. '/.env',
-        ['l'] = dir .. 'storage/logs/laravel.log',
+        ['l'] = dir .. '/storage/logs/laravel.log',
-        ['w'] = dir .. 'routes/web.php',
+        ['w'] = dir .. '/routes/web.php',
-        ['a'] = dir .. 'routes/api.php',
+        ['a'] = dir .. '/routes/api.php',
-        ['m'] = dir .. 'database/migrations',
+        ['m'] = dir .. '/database/migrations',
 
-        ['dc'] = dir .. 'app/Core/',
+        ['dc'] = dir .. '/app/Core/',
-        ['dd'] = dir .. 'app/Data/',
+        ['dd'] = dir .. '/app/Data/',
-        ['dE'] = dir .. 'app/Enums/',
+        ['dE'] = dir .. '/app/Enums/',
-        ['de'] = dir .. 'app/Events/',
+        ['de'] = dir .. '/app/Events/',
-        ['dh'] = dir .. 'app/Http/',
+        ['dh'] = dir .. '/app/Http/',
-        ['dj'] = dir .. 'app/Jobs/',
+        ['dj'] = dir .. '/app/Jobs/',
-        ['dl'] = dir .. 'app/Listeners/',
+        ['dl'] = dir .. '/app/Listeners/',
-        ['dM'] = dir .. 'app/Mail/',
+        ['dM'] = dir .. '/app/Mail/',
-        ['dm'] = dir .. 'app/Models/',
+        ['dm'] = dir .. '/app/Models/',
-        ['dn'] = dir .. 'app/Notifications/',
+        ['dn'] = dir .. '/app/Notifications/',
-        ['do'] = dir .. 'app/Observers/',
+        ['do'] = dir .. '/app/Observers/',
-        ['dp'] = dir .. 'app/Providers/',
+        ['dp'] = dir .. '/app/Providers/',
 
-        ['pa'] = dir .. 'app/Providers/AppServiceProvider.php',
+        ['pa'] = dir .. '/app/Providers/AppServiceProvider.php',
-        ['pe'] = dir .. 'app/Providers/EventServiceProvider.php',
+        ['pe'] = dir .. '/app/Providers/EventServiceProvider.php',
 
-        ['cA'] = dir .. 'config/app.php',
+        ['cA'] = dir .. '/config/app.php',
-        ['ca'] = dir .. 'config/auth.php',
+        ['ca'] = dir .. '/config/auth.php',
-        ['cb'] = dir .. 'config/broadcasting.php',
+        ['cb'] = dir .. '/config/broadcasting.php',
-        ['cd'] = dir .. 'config/database.php',
+        ['cd'] = dir .. '/config/database.php',
-        ['cf'] = dir .. 'config/filesystems.php',
+        ['cf'] = dir .. '/config/filesystems.php',
-        ['ch'] = dir .. 'config/filesystems.php',
+        ['ch'] = dir .. '/config/filesystems.php',
-        ['cl'] = dir .. 'config/logging.php',
+        ['cl'] = dir .. '/config/logging.php',
-        ['cm'] = dir .. 'config/mail.php',
+        ['cm'] = dir .. '/config/mail.php',
-        ['cq'] = dir .. 'config/queue.php',
+        ['cq'] = dir .. '/config/queue.php',
-        ['cS'] = dir .. 'config/services.php',
+        ['cS'] = dir .. '/config/services.php',
-        ['cs'] = dir .. 'config/session.php',
+        ['cs'] = dir .. '/config/session.php',
     }
 end
 
@@ -216,8 +216,8 @@ local PROJECTS = {
         end, { desc = 'Open database manager' })
         map('s ', '!cd server && ', { desc = 'Run command in server directory' }, 'c')
         map('c ', '!cd client && ', { desc = 'Run command in client directory' }, 'c')
-        laravel_keymaps 'server/'
+        laravel_keymaps 'server'
-        laravel_makes 'server/'
+        laravel_makes 'server'
         map('yrn ', '!cd client && yarn ', { desc = 'Run yarn script' }, 'c')
         map('<Leader>pt', ':!cd server && php artisan typescript:transform --format<CR>', { desc = 'Compile typescript' })
         require('conform').formatters.pint = {

lua/snippets/javascript.lua

@@ -1,128 +1,45 @@
 local ls = require 'luasnip'
 local s = ls.snippet
-local sn = ls.snippet_node
-local fn = ls.function_node
-local ms = ls.multi_snippet
 local t = ls.text_node
-local c = ls.choice_node
 local i = ls.insert_node
 local f = ls.function_node
-local d = ls.dynamic_node
-local fmt = require('luasnip.extras.fmt').fmt
-local rep = require('luasnip.extras').rep
-local extend_decorator = require 'luasnip.util.extend_decorator'
-local fmta = extend_decorator.apply(fmt, { delimiters = '#~' })
-
-local utils = require 'snippets.snip_utils'
-local tr = utils.tr
-local etr = utils.etr
-local atr = utils.atr
-local ctr = utils.ctr
-local bs = utils.bs
 
 return {
-    s(etr('du ', 'Dump a variable to the console'), fmta('console.log(#~);', { i(0) })),
+    s('du', { t 'console.log(', i(0), t ');' }),
-    s(
-        etr('vue', 'Vue Single File Component skeleton'),
-        fmta(
-            [[
-                <template>
-                </template>
-                <script setup>
-                #~
-                </script>
-                <style scoped>
-                </style>
-            ]],
-            { i(0) }
-        )
-    ),
 
-    bs(atr('t ', 'this'), fmta('this.#~', { i(0) })),
+    s('vue', {
-
+        t { '<template>', '' },
-    s(etr('return ', 'Add semicolon after return'), fmta('return #~;', { i(0) })),
+        t { '', '</template>', '', '', '<script setup>', '' },
-    s(etr('rt ', 'return alias'), fmta('return #~;', { i(0) })),
+        i(0),
-
+        t { '', '</script>', '', '', '<style scoped>', '', '.o-share-page {', '}', '', '</style>' },
-    s(etr('const', 'const declaration'), {
-        c(1, {
-            sn(nil, fmta('const #~ = #~;', { i(1, 'variableName'), i(2, 'value') })),
-            sn(
-                nil,
-                fmta(
-                    [[
-                        const #~ = (#~) => {
-                            #~
-                        }
-                    ]],
-                    { i(1), i(2), i(3) }
-                )
-            ),
-        }),
     }),
 
-    s(
+    s('fun', {
-        etr('fn ', 'function block'),
+        t 'function ',
-        fmta(
+        i(1),
-            [[
+        t '(',
-                function #~(#~) {
+        i(2),
-                    #~
+        t ') {',
-                }
+        t { '', '    ' },
-            ]],
+        i(0),
-            { i(1), i(2), i(0) }
+        t { '', '}' },
-        )
-    ),
-
-    bs(atr('fn ', 'function block'), {
-        c(1, {
-            sn(
-                nil,
-                fmta(
-                    [[
-                        (#~) => {
-                            #~
-                        }
-                    ]],
-                    { i(1), i(2) }
-                )
-            ),
-            sn(
-                nil,
-                fmta(
-                    [[
-                        function (#~) {
-                            #~
-                        }
-                    ]],
-                    { i(1), i(2) }
-                )
-            ),
-        }),
     }),
 
-    bs(atr('afn ', 'async function block'), {
+    s('afun', {
-        c(1, {
+        t 'async function ',
-            sn(
+        i(1),
-                nil,
+        t '(',
-                fmta(
+        i(2),
-                    [[
+        t ') {',
-                        async (#~) => {
+        t { '', '    ' },
-                            #~
+        i(0),
-                        }
+        t { '', '}' },
-                    ]],
-                    { i(1), i(2) }
-                )
-            ),
-            sn(
-                nil,
-                fmta(
-                    [[
-                        async function (#~) {
-                            #~
-                        }
-                    ]],
-                    { i(1), i(2) }
-                )
-            ),
     }),
+
+    s('()', {
+        t '() => {',
+        t { '', '    ' },
+        i(0),
+        t { '', '}' },
     }),
 }

lua/snippets/php.lua

@@ -16,7 +16,6 @@ local fmta = extend_decorator.apply(fmt, { delimiters = '#~' })
 local utils = require 'snippets.snip_utils'
 local tr = utils.tr
 local etr = utils.etr
-local Etr = utils.Etr
 local atr = utils.atr
 local ctr = utils.ctr
 local bs = utils.bs
@@ -70,10 +69,10 @@ return {
     ---------------
     -- DEBUGGING --
     ---------------
-    s(etr('du ', 'Dump a variable to the dump server', { priority = 1001 }), fmta('dump(#~);', { i(0) })),
+    s(etr('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) })),
+    bs(atr('du ', 'Dump a variable to the dump server'), fmta('dump(#~)', { i(0) })),
-    s(etr('r ', 'ray', { priority = 1001 }), fmta('ray(#~);', { i(0) })),
+    s(etr('r ', 'ray'), fmta('ray(#~);', { i(0) })),
-    bs(etr('r ', 'ray'), fmta('ray(#~)', { i(0) })),
+    bs(atr('r ', 'ray'), fmta('ray(#~)', { i(0) })),
     s(etr('dt ', 'Dump PHPStan type definition'), fmta('\\PhpStan\\dumpType(#~);', { i(0) })),
     s(
         etr('ql ', 'Log all queries'),
@@ -108,7 +107,6 @@ return {
     }),
     s(etr('@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('* @pb', 'Class boolean property docblock'), fmta('* @property bool $#~', { i(0) })),
     s(ctr('* @pi', 'Class int property docblock'), fmta('* @property int $#~', { i(0) })),
@@ -172,7 +170,7 @@ return {
     s(etr('return ', 'Add semicolon after return'), fmta('return #~;', { i(0) })),
     s(atr(' use ', 'Add use to function'), fmta(' use (#~)', { i(0) })),
     s(etr('rt ', 'return alias'), fmta('return #~;', { i(0) })),
-    bs(atr('fn ', 'Shorthand function block'), {
+    bs(etr('fn ', 'Shorthand function block'), {
         c(1, {
             sn(nil, fmta('fn (#~) => #~', { i(1), i(2) })),
             sn(
@@ -188,7 +186,7 @@ return {
             ),
         }),
     }),
-    bs(atr('fun ', 'Shorthand function block'), {
+    bs(etr('fun ', 'Shorthand function block'), {
         c(1, {
             sn(
                 nil,
@@ -214,36 +212,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('s%$', 'string type parameter'), fmta('string $#~', { i(0, 'var') })),
     bs(atr('i%$', 'int type parameter'), fmta('int $#~', { i(0, 'var') })),
@@ -360,20 +358,9 @@ return {
         etr('test', 'Create a test function'),
         fmta(
             [[
-                test('#~', function () {
+                test(#~ function () {
                     #~
-                });
+                })
-            ]],
-            { i(1), i(0) }
-        )
-    ),
-    s(
-        etr('it ', 'Create a test function'),
-        fmta(
-            [[
-                it('#~', function () {
-                    #~
-                });
             ]],
             { i(1), i(0) }
         )
@@ -384,7 +371,7 @@ return {
     -------------
     s(
         etr('bt', 'belongsTo Laravel relationship method'),
-        c(1, {
+        c(0, {
             sn(
                 nil,
                 fmta(
@@ -397,7 +384,7 @@ return {
                             return $this->belongsTo(#~::class);
                         }
                     ]],
-                    { rep(1), i(2), i(1) }
+                    { rep(1), i(0), i(1) }
                 )
             ),
             sn(
@@ -412,14 +399,14 @@ return {
                             return $this->belongsTo(#~::class, #~);
                         }
                     ]],
-                    { rep(1), i(2), i(1), i(3) }
+                    { rep(1), i(2), i(1), i(0) }
                 )
             ),
         })
     ),
     s(
         etr('hm', 'hasMany Laravel relationship method'),
-        c(1, {
+        c(0, {
             sn(
                 nil,
                 fmta(
@@ -432,7 +419,7 @@ return {
                             return $this->hasOne(#~::class);
                         }
                     ]],
-                    { rep(1), i(2), i(1) }
+                    { rep(1), i(0), i(1) }
                 )
             ),
             sn(
@@ -447,14 +434,14 @@ return {
                             return $this->hasOne(#~::class, #~);
                         }
                     ]],
-                    { rep(1), i(2), i(1), i(3) }
+                    { rep(1), i(2), i(1), i(0) }
                 )
             ),
         })
     ),
     s(
         etr('ho', 'hasOne Laravel relationship method'),
-        c(1, {
+        c(0, {
             sn(
                 nil,
                 fmta(
@@ -467,7 +454,7 @@ return {
                             return $this->hasOne(#~::class);
                         }
                     ]],
-                    { rep(1), i(2), i(1) }
+                    { rep(1), i(0), i(1) }
                 )
             ),
             sn(
@@ -482,14 +469,14 @@ return {
                             return $this->hasOne(#~::class, #~);
                         }
                     ]],
-                    { rep(1), i(2), i(1), i(3) }
+                    { rep(1), i(2), i(1), i(0) }
                 )
             ),
         })
     ),
     s(
         etr('bm', 'belongsToMany Laravel relationship method'),
-        c(1, {
+        c(0, {
             sn(
                 nil,
                 fmta(
@@ -502,7 +489,7 @@ return {
                             return $this->belongsToMany(#~::class, #~);
                         }
                     ]],
-                    { rep(1), i(2), i(1), i(3) }
+                    { rep(1), i(2), i(1), i(0) }
                 )
             ),
             sn(
@@ -517,97 +504,97 @@ return {
                             return $this->belongsToMany(#~::class, #~, #~);
                         }
                     ]],
-                    { rep(1), i(2), i(1), i(3), i(4) }
+                    { rep(1), i(2), i(1), i(3), i(0) }
+                )
+            ),
+        })
+    ),
+    s(
+        atr('->wr', 'Eloquent where method'),
+        c(0, {
+            sn(nil, fmta("->where('#~', #~)", { i(1), i(0) })),
+            sn(nil, fmta('->where(fn ($query) => #~)', { i(0) })),
+            sn(
+                nil,
+                fmta(
+                    [[
+                        ->where(function ($query) {
+                            #~
+                        })
+                    ]],
+                    { i(0) }
+                )
+            ),
+            sn(
+                nil,
+                fmta(
+                    [[
+                        ->where(function ($query) use (#~) {
+                            #~
+                        })
+                    ]],
+                    { 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('->wh', 'Eloquent where has method'),
+        c(0, {
+            sn(nil, fmta("->whereHas('#~')", { i(1) })),
+            sn(nil, fmta("->whereHas('#~', fn ($query) => #~)", { i(1), i(0) })),
+            sn(
+                nil,
+                fmta(
+                    [[
+                        ->whereHas('#~', function ($query) {
+                            #~
+                        })
+                    ]],
+                    { i(1), i(0) }
+                )
+            ),
+            sn(
+                nil,
+                fmta(
+                    [[
+                        ->whereHas('#~', function ($query) use (#~) {
+                            #~
+                        })
+                    ]],
+                    { i(1), i(2), i(0) }
+                )
+            ),
+        })
+    ),
+    s(
+        atr('->we', 'Eloquent where exists method'),
+        c(0, {
+            sn(nil, fmta('->whereExists(fn ($query) => #~)', { i(0) })),
+            sn(
+                nil,
+                fmta(
+                    [[
+                        ->whereExists(function ($query) {
+                            #~
+                        })
+                    ]],
+                    { i(0) }
+                )
+            ),
+            sn(
+                nil,
+                fmta(
+                    [[
+                        ->whereExists(function ($query) use (#~) {
+                            #~
+                        })
+                    ]],
+                    { i(1), i(0) }
                 )
             ),
         })
     ),
-    -- s(
-    --     atr('->wr', 'Eloquent where method'),
-    --     c(0, {
-    --         sn(nil, fmta("->where('#~', #~)", { i(1), i(0) })),
-    --         sn(nil, fmta('->where(fn ($query) => #~)', { i(0) })),
-    --         sn(
-    --             nil,
-    --             fmta(
-    --                 [[
-    --                     ->where(function ($query) {
-    --                         #~
-    --                     })
-    --                 ]],
-    --                 { i(0) }
-    --             )
-    --         ),
-    --         sn(
-    --             nil,
-    --             fmta(
-    --                 [[
-    --                     ->where(function ($query) use (#~) {
-    --                         #~
-    --                     })
-    --                 ]],
-    --                 { 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('->wha', 'Eloquent where has method'),
-    --     c(0, {
-    --         sn(nil, fmta("->whereHas('#~')", { i(1) })),
-    --         sn(nil, fmta("->whereHas('#~', fn ($query) => #~)", { i(1), i(0) })),
-    --         sn(
-    --             nil,
-    --             fmta(
-    --                 [[
-    --                     ->whereHas('#~', function ($query) {
-    --                         #~
-    --                     })
-    --                 ]],
-    --                 { i(1), i(0) }
-    --             )
-    --         ),
-    --         sn(
-    --             nil,
-    --             fmta(
-    --                 [[
-    --                     ->whereHas('#~', function ($query) use (#~) {
-    --                         #~
-    --                     })
-    --                 ]],
-    --                 { i(1), i(2), i(0) }
-    --             )
-    --         ),
-    --     })
-    -- ),
-    -- s(
-    --     atr('->we', 'Eloquent where exists method'),
-    --     c(0, {
-    --         sn(nil, fmta('->whereExists(fn ($query) => #~)', { i(0) })),
-    --         sn(
-    --             nil,
-    --             fmta(
-    --                 [[
-    --                     ->whereExists(function ($query) {
-    --                         #~
-    --                     })
-    --                 ]],
-    --                 { i(0) }
-    --             )
-    --         ),
-    --         sn(
-    --             nil,
-    --             fmta(
-    --                 [[
-    --                     ->whereExists(function ($query) use (#~) {
-    --                         #~
-    --                     })
-    --                 ]],
-    --                 { i(1), i(0) }
-    --             )
-    --         ),
-    --     })
-    -- ),
 }

lua/snippets/snip_utils.lua

@@ -11,7 +11,6 @@ local d = ls.dynamic_node
 local fmt = require('luasnip.extras.fmt').fmt
 local rep = require('luasnip.extras').rep
 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 fmta = extend_decorator.apply(fmt, { delimiters = '#~' })
 
@@ -110,21 +109,6 @@ utils.atr = function(trigger, description, options)
     )
 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
 ---@param trigger any
 ---@param nodes any