1
0
Fork 0

Compare commits

..

No commits in common. "fd450fbd06c307d72b9182293107b63954bd5983" and "fdedf01228450fcf3c240252d7a029724f4dbc24" have entirely different histories.

6 changed files with 26 additions and 12 deletions

View file

@ -43,9 +43,9 @@ require('jdtls').start_or_attach({
organizeImports = true organizeImports = true
}, },
signatureHelp = { signatureHelp = {
enabled = true, enabled = false,
description = { description = {
enabled = true enabled = false
}, },
}, },
format = { format = {
@ -55,6 +55,7 @@ require('jdtls').start_or_attach({
}, },
}, },
codeGeneration = { codeGeneration = {
--generateComments = true,
insertionLocation = 'lastMember', insertionLocation = 'lastMember',
hashCodeEquals = { hashCodeEquals = {
useInstanceof = true, useInstanceof = true,

View file

@ -45,11 +45,4 @@ autocmd CompleteDone * pclose
" LSP config " LSP config
lua <<EOF lua <<EOF
require("config.lazy") require("config.lazy")
vim.o.scrolloff = 4;
vim.diagnostic.config({
virtual_text = true,
severity_sort = true,
})
EOF EOF

View file

@ -1,6 +1,7 @@
return { return {
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
lazy = true, lazy = true,
ft = { "java", "go", "python", "html" },
event = "InsertEnter", event = "InsertEnter",
dependencies = { dependencies = {
"hrsh7th/cmp-buffer", "hrsh7th/cmp-buffer",
@ -15,8 +16,10 @@ return {
["<C-f>"] = cmp.mapping.scroll_docs(4), ["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(), ["<C-e>"] = cmp.mapping.close(),
-- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. ["<CR>"] = cmp.mapping.confirm({
['<CR>'] = cmp.mapping.confirm({ select = false }), behavior = cmp.ConfirmBehavior.Replace,
select = true,
}),
}), }),
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "nvim_lsp" }, { name = "nvim_lsp" },

View file

@ -0,0 +1,11 @@
return {
"https://codeberg.org/mfussenegger/nvim-dap-python",
dependencies = {
"https://codeberg.org/mfussenegger/nvim-dap",
},
lazy = true,
ft = { "python" },
config = function()
require('dap-python').setup()
end,
}

View file

@ -53,6 +53,9 @@ return {
} }
}) })
-- Gradle
--vim.lsp.enable('gradle_ls')
-- HTML -- HTML
vim.lsp.enable('html') vim.lsp.enable('html')
@ -119,7 +122,6 @@ return {
vim.lsp.buf.format({async = false}) vim.lsp.buf.format({async = false})
end end
}) })
vim.lsp.enable('gopls')
-- PHP -- PHP
vim.lsp.enable('phpactor') vim.lsp.enable('phpactor')

View file

@ -22,6 +22,10 @@ return {
disableTelemetry = true, disableTelemetry = true,
focusOnNewCode = true, focusOnNewCode = true,
showAnalyzerLogs = true, showAnalyzerLogs = true,
rules = {
['java:S1192'] = { level = 'off' },
['go:S1192'] = { level = 'off' },
},
}, },
}, },
}, },