diff --git a/lua/keymap.lua b/lua/keymap.lua index 484782e..63b59bf 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -428,7 +428,7 @@ end, { desc = 'Luasnip accept copilot or jump forward' }) -- directory if the file does not exist vim.keymap.set('n', 'es', function() local ft = vim.bo.filetype - if ft == 'vue' then + if ft == 'vue' or ft == 'typescript' then ft = 'javascript' end local snippets_dir = vim.fn.stdpath 'config' .. '/lua/snippets' diff --git a/lua/lazy_init.lua b/lua/lazy_init.lua index c4c32c7..ab2417b 100644 --- a/lua/lazy_init.lua +++ b/lua/lazy_init.lua @@ -47,3 +47,4 @@ require('lazy').setup({ }) require('helpers').edit_cf('l', '/lua/lazy_init.lua') + diff --git a/lua/plugins/blade-nav.lua b/lua/plugins/blade-nav.lua index b445fd7..21811f8 100644 --- a/lua/plugins/blade-nav.lua +++ b/lua/plugins/blade-nav.lua @@ -4,6 +4,10 @@ return { config = function() require('blade-nav').setup { close_tag_on_complete = false, + integrations = { + cmp = false, + coq = false, + }, } end, } diff --git a/lua/plugins/snippets.lua b/lua/plugins/snippets.lua index 1f758dd..0c8bc95 100644 --- a/lua/plugins/snippets.lua +++ b/lua/plugins/snippets.lua @@ -13,6 +13,7 @@ return { config = function() local ls = require 'luasnip' ls.filetype_extend('vue', { 'javascript' }) + ls.filetype_extend('typescript', { 'javascript' }) local snippets_dir = vim.fn.stdpath 'config' .. '/lua/snippets' require('luasnip.loaders.from_lua').load { paths = { snippets_dir }, @@ -24,3 +25,4 @@ return { end, opts = {}, } + diff --git a/lua/plugins/treesitter-textobjects.lua b/lua/plugins/treesitter-textobjects.lua new file mode 100644 index 0000000..8bd98ee --- /dev/null +++ b/lua/plugins/treesitter-textobjects.lua @@ -0,0 +1,8 @@ +return { + 'nvim-treesitter/nvim-treesitter-textobjects', + branch = 'main', + config = function() + -- put your config here + end, +} + diff --git a/lua/projects/hylark.lua b/lua/projects/hylark.lua index 077b2c0..310378f 100644 --- a/lua/projects/hylark.lua +++ b/lua/projects/hylark.lua @@ -99,7 +99,7 @@ return function(dir) laravel_utils.laravel_keymaps 'server/' laravel_utils.laravel_makes 'server/' laravel_utils.laravel_utils 'server/' - laravel_utils.laravel_bookmarks 'server/' + laravel_utils.laravel_bookmarks(dir .. '/server/') create_bookmark('s', dir .. '/frontend2/src/types/api/server-types.d.ts') end diff --git a/lua/snippets/javascript.lua b/lua/snippets/javascript.lua index 909ce50..2b0523e 100644 --- a/lua/snippets/javascript.lua +++ b/lua/snippets/javascript.lua @@ -45,7 +45,7 @@ return { 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) })), sn( nil, fmta( @@ -60,6 +60,38 @@ return { }), }), + s(etr('ref ', 'ref'), { + c(1, { + sn(nil, fmta('const #~ = ref(#~);', { i(1), i(2) })), + sn( + nil, + fmta( + [[ + const #~ = ref<#~>(#~); + ]], + { i(1), i(2), i(3) } + ) + ), + }), + }), + + s(etr('com ', 'computed'), { + c(1, { + sn(nil, fmta('const #~ = computed(() => #~);', { i(1), i(2) })), + sn( + nil, + fmta( + [[ + const #~ = computed(() => { + #~ + }) + ]], + { i(1), i(2) } + ) + ), + }), + }), + s( etr('fn ', 'function block'), fmta( @@ -126,3 +158,4 @@ return { }), }), } +