oli/nvim
1
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity

More movement of setup files

Browse Source
This commit is contained in:
Oliver Hartmann 2022-03-16 18:03:36 +01:00
parent 86b8b65c99
commit c0aa5e03d0
4 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.lua
View File

@ -10,10 +10,6 @@ require('my_plugins')
require('my_keymappings') require('my_keymappings')
require('my_options') require('my_options')
require("my_autocommands") require("my_autocommands")
-- plugins
require('my_neogen')
require('my_luasnip')
-------------------- TREE-SITTER --------------------------- -------------------- TREE-SITTER ---------------------------
require('nvim-treesitter.configs').setup({ require('nvim-treesitter.configs').setup({
ensure_installed = 'maintained', ensure_installed = 'maintained',

6
lua/my_plugins.lua
View File

@ -68,6 +68,9 @@ return require('packer').startup(function()
}, },
config = get_setup("cmp") config = get_setup("cmp")
} }
use {'L3MON4D3/LuaSnip',
config = get_setup("luasnip")
}
use {'rafamadriz/friendly-snippets'} use {'rafamadriz/friendly-snippets'}
use {'onsails/lspkind-nvim'} use {'onsails/lspkind-nvim'}
use {'Shatur/neovim-cmake', use {'Shatur/neovim-cmake',
@ -94,7 +97,8 @@ return require('packer').startup(function()
} }
use { use {
'danymat/neogen', 'danymat/neogen',
requires = 'nvim-treesitter/nvim-treesitter' requires = 'nvim-treesitter/nvim-treesitter',
config = get_setup("neogen")
} }
use {'abecodes/tabout.nvim'} use {'abecodes/tabout.nvim'}
use {'stevearc/dressing.nvim'} use {'stevearc/dressing.nvim'}

112
lua/my_luasnip.lua → lua/setup/luasnip.lua
View File

@ -1,56 +1,56 @@
local ls = require("luasnip") local ls = require("luasnip")
require("luasnip.loaders.from_vscode").load() require("luasnip.loaders.from_vscode").load()
-- some shorthands... -- some shorthands...
local s = ls.snippet local s = ls.snippet
local sn = ls.snippet_node local sn = ls.snippet_node
local isn = ls.indent_snippet_node local isn = ls.indent_snippet_node
local t = ls.text_node local t = ls.text_node
local i = ls.insert_node local i = ls.insert_node
local f = ls.function_node local f = ls.function_node
local c = ls.choice_node local c = ls.choice_node
local d = ls.dynamic_node local d = ls.dynamic_node
local r = ls.restore_node local r = ls.restore_node
local l = require("luasnip.extras").lambda local l = require("luasnip.extras").lambda
local rep = require("luasnip.extras").rep local rep = require("luasnip.extras").rep
local p = require("luasnip.extras").partial local p = require("luasnip.extras").partial
local m = require("luasnip.extras").match local m = require("luasnip.extras").match
local n = require("luasnip.extras").nonempty local n = require("luasnip.extras").nonempty
local dl = require("luasnip.extras").dynamic_lambda local dl = require("luasnip.extras").dynamic_lambda
local fmt = require("luasnip.extras.fmt").fmt local fmt = require("luasnip.extras.fmt").fmt
local fmta = require("luasnip.extras.fmt").fmta local fmta = require("luasnip.extras.fmt").fmta
local types = require("luasnip.util.types") local types = require("luasnip.util.types")
local conds = require("luasnip.extras.expand_conditions") local conds = require("luasnip.extras.expand_conditions")
local function getRegA(capitalize) local function getRegA(capitalize)
local clipboard = vim.fn.getreg('a') local clipboard = vim.fn.getreg('a')
clipboard = clipboard:gsub('^m_', '') clipboard = clipboard:gsub('^m_', '')
if capitalize then if capitalize then
clipboard = clipboard:gsub("^%l", string.upper); clipboard = clipboard:gsub("^%l", string.upper);
end end
return clipboard return clipboard
end end
ls.snippets = { ls.snippets = {
cpp = { cpp = {
s('TEST_F_getset', s('TEST_F_getset',
{ {
t('TEST_F('), i(1, 'TestClass'), t(' ,test_'), p(getRegA, false), t({'_set_get)', '{', ' '}), t('TEST_F('), i(1, 'TestClass'), t(' ,test_'), p(getRegA, false), t({'_set_get)', '{', ' '}),
i(2, 'm_object'), t('.set'), p(getRegA, true), t('('), i(3, '32.F'), t({');', ' '}), i(2, 'm_object'), t('.set'), p(getRegA, true), t('('), i(3, '32.F'), t({');', ' '}),
i(4, 'EXPECT_EQ('), rep(3), t(', '), rep(2), t('.get'), p(getRegA, true), t({'());', ''}), i(4, 'EXPECT_EQ('), rep(3), t(', '), rep(2), t('.get'), p(getRegA, true), t({'());', ''}),
t({'','}', ''}) t({'','}', ''})
}), }),
s('TEST_fn_getset', s('TEST_fn_getset',
{ {
t('void '), p(getRegA, false), t('_'), i(1, 'get'), t('_'), i(2, 'set'), t({'()', '{', ' '}), t('void '), p(getRegA, false), t('_'), i(1, 'get'), t('_'), i(2, 'set'), t({'()', '{', ' '}),
i(3, 'm_object'), t('.set'), p(getRegA, true), t('('), i(4, '32.F'), t({');', ' '}), i(3, 'm_object'), t('.set'), p(getRegA, true), t('('), i(4, '32.F'), t({');', ' '}),
i(5, 'EXPECT_EQ('), rep(4), t(', '), rep(3), t('.get'), p(getRegA, true), t({'());', ''}), i(5, 'EXPECT_EQ('), rep(4), t(', '), rep(3), t('.get'), p(getRegA, true), t({'());', ''}),
t({'','}', '', ''}), t({'','}', '', ''}),
t('TEST_F('), i(5), t(' ,test_'), p(getRegA, false), t({'_set_get)', '{', ' '}), t('TEST_F('), i(5), t(' ,test_'), p(getRegA, false), t({'_set_get)', '{', ' '}),
p(getRegA, false), t('_'), rep(1), t('_'), rep(2), t({'();'}), p(getRegA, false), t('_'), rep(1), t('_'), rep(2), t({'();'}),
t({'','}'}), t({'','}'}),
}) })
}, },
} }

0
lua/my_neogen.lua → lua/setup/neogen.lua
View File