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

chore: fix formatting

Browse Source
This commit is contained in:
Oscar Wallberg
2024-04-19 17:25:24 +02:00
parent 7d7699474d
commit 096a4713ae
2 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/lsp/config/pylsp.lua
+7 -6
View File
@@ -6,18 +6,19 @@ return {
dependencies = { dependencies = {
"python3", "python3",
}, },
py_module_deps = {
"venv",
},
mason = { mason = {
name = "python-lsp-server", name = "python-lsp-server",
post_install = { post_install = {
{ {
command = "./venv/bin/pip", command = "./venv/bin/pip",
-- command = "sh",
args = { args = {
"install", -- "install",
"python-lsp-black", -- "python-lsp-black",
"python-lsp-isort", -- "python-lsp-isort",
"--version",
-- "-c",
-- "./venv/bin/pip --version",
}, },
}, },
-- { -- {
lua/plugins/cmp.lua
+27 -32
View File
@@ -6,30 +6,33 @@ local function has_words_before()
unpack = unpack or table.unpack unpack = unpack or table.unpack
local line, col = unpack(vim.api.nvim_win_get_cursor(0)) local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 return col ~= 0
and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1] and vim.api
.nvim_buf_get_lines(0, line - 1, line, true)[1]
:sub(col, col) :sub(col, col)
:match(word_pattern) ~= nil :match(word_pattern)
~= nil
end end
local function has_words_after() local function has_words_after()
unpack = unpack or table.unpack unpack = unpack or table.unpack
local line, col = unpack(vim.api.nvim_win_get_cursor(0)) local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 return col ~= 0
and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1] and vim.api
.nvim_buf_get_lines(0, line - 1, line, true)[1]
:sub(col + 1, col + 1) :sub(col + 1, col + 1)
:match(word_pattern) ~= nil :match(word_pattern)
~= nil
end end
local function setup() local function setup()
local module_name = "plugins.config.cmp"
local utils = require("utils") local utils = require("utils")
local cmp = require("cmp") local cmp = require("cmp")
local luasnip = require("luasnip") local luasnip = require("luasnip")
local lspkind = utils.try_require("lspkind", module_name) local lspkind = utils.try_require("lspkind")
local opt = { local opt = {
preselect = cmp.PreselectMode.None, preselect = cmp.PreselectMode.None,
completion = { keyword_length = 0, }, completion = { keyword_length = 0 },
snippet = { snippet = {
expand = function(args) expand = function(args)
luasnip.lsp_expand(args.body) luasnip.lsp_expand(args.body)
@@ -61,7 +64,7 @@ local function setup()
}), }),
["<C-y>"] = function(fallback) ["<C-y>"] = function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, }) cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace })
else else
fallback() fallback()
end end
@@ -97,47 +100,39 @@ local function setup()
end, end,
}, },
sources = { sources = {
{ name = "nvim_lsp", }, { name = "nvim_lsp" },
-- { name = "luasnip", }, -- { name = "luasnip", },
{ name = "orgmode", }, { name = "orgmode" },
{ name = "path", }, { name = "path" },
}, },
} }
utils.try_require("moonfly", module_name, function (_) if utils.try_require("moonfly") then
local winhighlight = { local winhighlight = {
winhighlight = winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel",
"Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel",
} }
opt.window = { opt.window = {
completion = cmp.config.window.bordered(winhighlight), completion = cmp.config.window.bordered(winhighlight),
documentation = cmp.config.window.bordered(winhighlight), documentation = cmp.config.window.bordered(winhighlight),
} }
end) end
cmp.setup(opt) cmp.setup(opt)
cmp.setup.cmdline( cmp.setup.cmdline("/", {
"/",
{
mapping = cmp.mapping.preset.cmdline(), mapping = cmp.mapping.preset.cmdline(),
sources = { { name = "buffer", }, }, sources = { { name = "buffer" } },
} })
)
cmp.setup.cmdline( cmp.setup.cmdline(":", {
":",
{
mapping = cmp.mapping.preset.cmdline(), mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources( sources = cmp.config.sources({ { name = "path" } }, {
{ { name = "path", }, }, {
{ {
name = "cmdline", name = "cmdline",
option = { ignore_cmds = { "Man", "!", }, }, option = { ignore_cmds = { "Man", "!" } },
}, } },
), }),
} })
)
end end
return setup return setup