diff --git a/lua/code-completion.lua b/lua/code-completion.lua index 62bdc94..554facf 100644 --- a/lua/code-completion.lua +++ b/lua/code-completion.lua @@ -11,7 +11,7 @@ cmp.setup({ -- configuration snippet = { expand = function(args) - -- vim.fn["UltiSnips#Anon"](args.body) + vim.fn["UltiSnips#Anon"](args.body) end, }, @@ -50,7 +50,7 @@ cmp.setup({ -- installed sources for code suggestion sources = cmp.config.sources({ - -- { name = "ultisnips", keyword_length = 1 }, + { name = "ultisnips", keyword_length = 1 }, { name = "path" }, { name = "nvim_lsp", keyword_length = 2 }, { name = "nvim_lsp_signature_help" }, @@ -67,6 +67,7 @@ cmp.setup({ fields = { "menu", "abbr", "kind" }, format = function(entry, item) local menu_icon = { + ultisnips = ">", nvim_lsp = "λ", path = "󰴠", calc = "Σ", diff --git a/lua/plugconfig.lua b/lua/plugconfig.lua index 1521fe4..79761ef 100644 --- a/lua/plugconfig.lua +++ b/lua/plugconfig.lua @@ -72,15 +72,6 @@ require("mason-lspconfig").setup_handlers({ function(clangd) require("lspconfig")[clangd].setup({}) end, - ["als"] = function() - require("lspconfig").als.setup({ - settings = { - ada = { - projectFile = "default.gpr", - }, - }, - }) - end, }) require("lspconfig").verible.setup({ @@ -111,21 +102,21 @@ local linters = { cpp = { "clang" }, c = { "clang" }, markdown = { "languagetool" }, - latex = { "languagetool" }, - tex = { "languagetool" }, - plaintex = { "languagetool" }, - ada = { "gnat" }, + latex = { "proselint" }, + tex = { "proselint" }, + plaintex = { "proselint" }, + ada = { "gnat", "gcc", "adals", "cspell" }, } vim.g.ale_linters = linters -vim.g.ale_fix_on_save = 0 -vim.g.ale_ada_gpr_project_file = "default.gpr" +vim.g.ale_fix_on_save = 1 +-- vim.g.ale_ada_gpr_project_file = "default.gpr" vim.g.ale_fixers = { - ada = { "gcc", "gnat" }, + ada = { "gnatpp" }, asm = { "gcc" }, bash = { "bashate" }, c = { "astyle" }, - latex = { "texlab" }, + latex = { "texlab", "textlint" }, lua = { "stylua" }, markdown = { "prettier", "pandoc" }, python = { "yapf" }, @@ -133,3 +124,13 @@ vim.g.ale_fixers = { vim.keymap.set("n", "lf", ":ALEFix") vim.keymap.set("n", "ld", ":ALEDetail") + +-- Ada language server +require("lspconfig").als.setup({ + -- settings = { + -- ada = { + -- projectFile = "project.gpr"; + -- scenarioVariables = { ... }; + -- } + -- } +}) diff --git a/lua/plugins.lua b/lua/plugins.lua index cee15a3..f3c4255 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -66,4 +66,6 @@ return { "jaredgorski/spacecamp", "voldikss/vim-floaterm", "dense-analysis/ale", + { "TamaMcGlinn/nvim-lspconfig-ada" }, + "krischik/vim-ada", }