Mon, 20 May 2024 12:53:43 -0500
Bump nvim-treesitter to more recent commit
1044 | 1 | return { |
2 | { | |
3 | "hrsh7th/nvim-cmp", | |
1131
f3044a1658fc
nvim: switch to preferring last symver tag / add exceptions
Meredith Howard <mhoward@roomag.org>
parents:
1123
diff
changeset
|
4 | branch = "main", |
1044 | 5 | event = "InsertEnter", |
6 | dependencies = { | |
7 | "hrsh7th/cmp-buffer", | |
8 | "hrsh7th/cmp-calc", | |
9 | "hrsh7th/cmp-nvim-lsp", | |
10 | "hrsh7th/cmp-nvim-lua", | |
11 | "hrsh7th/cmp-path", | |
12 | "quangnguyen30192/cmp-nvim-tags", | |
13 | }, | |
1070
72b613de1102
disable lsp preselect
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
14 | config = function() |
1044 | 15 | local cmp = require("cmp") |
1097
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
16 | local luasnip = require("luasnip") |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
17 | |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
18 | local has_words_before = function() |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
19 | local line, col = unpack(vim.api.nvim_win_get_cursor(0)) |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
20 | return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
21 | end |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
22 | |
1070
72b613de1102
disable lsp preselect
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
23 | cmp.setup({ |
72b613de1102
disable lsp preselect
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
24 | preselect = cmp.PreselectMode.None, |
1044 | 25 | completion = { |
1054
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
26 | keyword_length = 3, |
1044 | 27 | }, |
1097
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
28 | snippet = { |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
29 | expand = function(args) |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
30 | luasnip.lsp_expand(args.body) |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
31 | end, |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
32 | }, |
1054
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
33 | formatting = { |
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
34 | format = function(entry, vim_item) |
1122
8a56361b077f
Replace nvim_lsp_signature_help with lsp_signature.nvim
Meredith Howard <mhoward@roomag.org>
parents:
1098
diff
changeset
|
35 | if vim_item.kind == "Text" then |
1054
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
36 | vim_item.kind = entry.source.name |
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
37 | end |
1098
8d479a558198
Remove long signature previews
Meredith Howard <mhoward@roomag.org>
parents:
1097
diff
changeset
|
38 | vim_item.menu = nil |
1054
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
39 | return vim_item |
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
40 | end, |
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
41 | }, |
1044 | 42 | mapping = cmp.mapping.preset.insert({ |
43 | ["<C-b>"] = cmp.mapping.scroll_docs(-4), | |
44 | ["<C-f>"] = cmp.mapping.scroll_docs(4), | |
1097
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
45 | ["<Tab>"] = cmp.mapping(function(fallback) |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
46 | if cmp.visible() then |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
47 | cmp.select_next_item() |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
48 | elseif luasnip.expand_or_locally_jumpable() then |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
49 | luasnip.expand_or_jump() |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
50 | elseif has_words_before() then |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
51 | cmp.complete() |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
52 | else |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
53 | fallback() |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
54 | end |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
55 | end, { "i", "s" }), |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
56 | ["<S-Tab>"] = cmp.mapping(function(fallback) |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
57 | if cmp.visible() then |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
58 | cmp.select_prev_item() |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
59 | elseif luasnip.jumpable(-1) then |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
60 | luasnip.jump(-1) |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
61 | else |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
62 | fallback() |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
63 | end |
7df98d33285d
actually set up lsp snippets
Meredith Howard <mhoward@roomag.org>
parents:
1071
diff
changeset
|
64 | end, { "i", "s" }), |
1044 | 65 | ["<C-g>"] = cmp.mapping.abort(), |
1071
e76020af023d
add explicit begin-completion bind
Meredith Howard <mhoward@roomag.org>
parents:
1070
diff
changeset
|
66 | ["<C-Space>"] = cmp.mapping.complete(), |
1168
52750027eff6
simplify nvim-cmp setup
Meredith Howard <mhoward@roomag.org>
parents:
1148
diff
changeset
|
67 | ["<Space>"] = cmp.mapping(function(fallback) |
52750027eff6
simplify nvim-cmp setup
Meredith Howard <mhoward@roomag.org>
parents:
1148
diff
changeset
|
68 | cmp.confirm({ select = false }) |
1044 | 69 | fallback() |
1168
52750027eff6
simplify nvim-cmp setup
Meredith Howard <mhoward@roomag.org>
parents:
1148
diff
changeset
|
70 | end, { "i", "s" }), |
1044 | 71 | }), |
72 | sources = cmp.config.sources({ | |
73 | { name = "nvim_lsp" }, | |
74 | { name = "nvim_lua" }, | |
1054
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
75 | { name = "buffer", option = { keyword_pattern = [[\k\+]] } }, |
1044 | 76 | { name = "path" }, |
77 | { name = "tags" }, | |
1054
3a0ff0563a7b
tweak completion a little more
Meredith Howard <mhoward@roomag.org>
parents:
1044
diff
changeset
|
78 | { name = "calc" }, |
1044 | 79 | }), |
1070
72b613de1102
disable lsp preselect
Meredith Howard <mhoward@roomag.org>
parents:
1064
diff
changeset
|
80 | }) |
1044 | 81 | end, |
82 | }, | |
1139
1359a563b5ce
split out LuaSnip spec
Meredith Howard <mhoward@roomag.org>
parents:
1132
diff
changeset
|
83 | { |
1359a563b5ce
split out LuaSnip spec
Meredith Howard <mhoward@roomag.org>
parents:
1132
diff
changeset
|
84 | "L3MON4D3/LuaSnip", |
1359a563b5ce
split out LuaSnip spec
Meredith Howard <mhoward@roomag.org>
parents:
1132
diff
changeset
|
85 | lazy = true, |
1144
dc1def95331f
skip luasnip/jsregexp build on windows (oops)
Meredith Howard <mhoward@roomag.org>
parents:
1143
diff
changeset
|
86 | build = (jit.os ~= "Windows") and "make install_jsregexp", |
1139
1359a563b5ce
split out LuaSnip spec
Meredith Howard <mhoward@roomag.org>
parents:
1132
diff
changeset
|
87 | opts = { |
1359a563b5ce
split out LuaSnip spec
Meredith Howard <mhoward@roomag.org>
parents:
1132
diff
changeset
|
88 | history = true, |
1359a563b5ce
split out LuaSnip spec
Meredith Howard <mhoward@roomag.org>
parents:
1132
diff
changeset
|
89 | delete_check_events = "TextChanged", |
1359a563b5ce
split out LuaSnip spec
Meredith Howard <mhoward@roomag.org>
parents:
1132
diff
changeset
|
90 | }, |
1359a563b5ce
split out LuaSnip spec
Meredith Howard <mhoward@roomag.org>
parents:
1132
diff
changeset
|
91 | }, |
1044 | 92 | } |