Skip to content

Commit 168d0f1

Browse files
committed
Consistant vim.cmd.<cmd> and remove unnecessary function wrapping
1 parent 04d7c04 commit 168d0f1

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

after/plugin/fugitive.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
vim.keymap.set("n", "<leader>gs", vim.cmd.Git);
1+
vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
22

33
local ThePrimeagen_Fugitive = vim.api.nvim_create_augroup("ThePrimeagen_Fugitive", {})
44

@@ -14,12 +14,12 @@ autocmd("BufWinEnter", {
1414
local bufnr = vim.api.nvim_get_current_buf()
1515
local opts = {buffer = bufnr, remap = false}
1616
vim.keymap.set("n", "<leader>p", function()
17-
vim.cmd [[ Git push ]]
17+
vim.cmd.Git('push')
1818
end, opts)
1919

2020
-- rebase always
2121
vim.keymap.set("n", "<leader>P", function()
22-
vim.cmd [[ Git pull --rebase ]]
22+
vim.cmd.Git({'pull', '--rebase'})
2323
end, opts)
2424

2525
-- NOTE: It allows me to easily set the branch i am pushing and any tracking

after/plugin/lsp.lua

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ lsp.on_attach(function(client, bufnr)
4545
local opts = {buffer = bufnr, remap = false}
4646

4747
if client.name == "eslint" then
48-
vim.cmd [[ LspStop eslint ]]
48+
vim.cmd.LspStop('eslint')
4949
return
5050
end
5151

52-
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
53-
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
54-
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
55-
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
56-
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
57-
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
58-
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
59-
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
60-
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
61-
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
52+
vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
53+
vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
54+
vim.keymap.set("n", "<leader>vws", vim.lsp.buf.workspace_symbol, opts)
55+
vim.keymap.set("n", "<leader>vd", vim.diagnostic.open_float, opts)
56+
vim.keymap.set("n", "[d", vim.diagnostic.goto_next, opts)
57+
vim.keymap.set("n", "]d", vim.diagnostic.goto_prev, opts)
58+
vim.keymap.set("n", "<leader>vca", vim.lsp.buf.code_action, opts)
59+
vim.keymap.set("n", "<leader>vrr", vim.lsp.buf.references, opts)
60+
vim.keymap.set("n", "<leader>vrn", vim.lsp.buf.rename, opts)
61+
vim.keymap.set("i", "<C-h>", vim.lsp.buf.signature_help, opts)
6262
end)
6363

6464
lsp.setup()

after/plugin/telescope.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ local builtin = require('telescope.builtin')
22
vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
33
vim.keymap.set('n', '<C-p>', builtin.git_files, {})
44
vim.keymap.set('n', '<leader>ps', function()
5-
builtin.grep_string({ search = vim.fn.input("Grep > ") });
5+
builtin.grep_string({ search = vim.fn.input("Grep > ") })
66
end)
77

lua/theprimeagen/packer.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- This file can be loaded by calling `lua require('plugins')` from your init.vim
22

33
-- Only required if you have packer configured as `opt`
4-
vim.cmd [[packadd packer.nvim]]
4+
vim.cmd.packadd('packer.nvim')
55

66
return require('packer').startup(function(use)
77
-- Packer can manage itself

lua/theprimeagen/remap.lua

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ vim.keymap.set("i", "<C-c>", "<Esc>")
3232

3333
vim.keymap.set("n", "Q", "<nop>")
3434
vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
35-
vim.keymap.set("n", "<leader>f", function()
36-
vim.lsp.buf.format()
37-
end)
35+
vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
3836

3937
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
4038
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")

0 commit comments

Comments
 (0)