Skip to content

Commit 9706eed

Browse files
authored
Merge branch 'Saghen:main' into feat/snippet_desc
2 parents 19459e7 + 4e9edba commit 9706eed

File tree

8 files changed

+15
-14
lines changed

8 files changed

+15
-14
lines changed

doc/blink-cmp.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*blink-cmp.txt* For NVIM v0.10.0 Last change: 2025 August 09
1+
*blink-cmp.txt* For NVIM v0.10.0 Last change: 2025 August 14
22

33
==============================================================================
44
Table of Contents *blink-cmp-table-of-contents*
@@ -1592,7 +1592,7 @@ DEFAULT
15921592
>lua
15931593
['<C-space>'] = { 'show', 'show_documentation', 'hide_documentation' },
15941594
['<C-e>'] = { 'hide', 'fallback' },
1595-
['<C-y>'] = { 'select_and_accept' },
1595+
['<C-y>'] = { 'select_and_accept', 'fallback' },
15961596

15971597
['<Up>'] = { 'select_prev', 'fallback' },
15981598
['<Down>'] = { 'select_next', 'fallback' },
@@ -2027,6 +2027,7 @@ sources
20272027
- blink-cmp-sshconfig <https://github.com/bydlw98/blink-cmp-sshconfig>
20282028
- blink-cmp-words <https://github.com/archie-judd/blink-cmp-words>: Definitions and synonyms
20292029
- blink-cmp-vsnip <https://codeberg.org/FelipeLema/blink-cmp-vsnip>
2030+
- blink-cmp-dat-word <https://github.com/xieyonn/blink-cmp-dat-word>: Word completion
20302031

20312032

20322033
WORKING NVIM-CMP SOURCES VIA BLINK.COMPAT
@@ -2853,7 +2854,7 @@ for more information on defining your own.
28532854
['<Right>'] = { 'select_next', 'fallback' },
28542855
['<Left>'] = { 'select_prev', 'fallback' },
28552856

2856-
['<C-y>'] = { 'select_and_accept' },
2857+
['<C-y>'] = { 'select_and_accept', 'fallback' },
28572858
['<C-e>'] = { 'cancel', 'fallback' },
28582859
}
28592860
<

doc/configuration/keymap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Set the preset to `'none'` to disable the presets
9292
```lua
9393
['<C-space>'] = { 'show', 'show_documentation', 'hide_documentation' },
9494
['<C-e>'] = { 'hide', 'fallback' },
95-
['<C-y>'] = { 'select_and_accept' },
95+
['<C-y>'] = { 'select_and_accept', 'fallback' },
9696

9797
['<Up>'] = { 'select_prev', 'fallback' },
9898
['<Down>'] = { 'select_next', 'fallback' },

doc/configuration/sources.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ See [blink.compat](https://github.com/Saghen/blink.compat) for using `nvim-cmp`
125125
- [blink-cmp-sshconfig](https://github.com/bydlw98/blink-cmp-sshconfig)
126126
- [blink-cmp-words](https://github.com/archie-judd/blink-cmp-words): Definitions and synonyms
127127
- [blink-cmp-vsnip](https://codeberg.org/FelipeLema/blink-cmp-vsnip)
128+
- [blink-cmp-dat-word](https://github.com/xieyonn/blink-cmp-dat-word): Word completion
128129

129130
### Working `nvim-cmp` sources via `blink.compat`
130131

doc/modes/cmdline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Set via `cmdline.keymap.preset = 'cmdline'`, which is the default. Set to `'none
4343
['<Right>'] = { 'select_next', 'fallback' },
4444
['<Left>'] = { 'select_prev', 'fallback' },
4545

46-
['<C-y>'] = { 'select_and_accept' },
46+
['<C-y>'] = { 'select_and_accept', 'fallback' },
4747
['<C-e>'] = { 'cancel', 'fallback' },
4848
}
4949
```

lua/blink/cmp/config/keymap.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
--- {
3535
--- ['<C-space>'] = { 'show', 'show_documentation', 'hide_documentation' },
3636
--- ['<C-e>'] = { 'cancel', 'fallback' },
37-
--- ['<C-y>'] = { 'select_and_accept' },
37+
--- ['<C-y>'] = { 'select_and_accept', 'fallback' },
3838
---
3939
--- ['<Up>'] = { 'select_prev', 'fallback' },
4040
--- ['<Down>'] = { 'select_next', 'fallback' },
@@ -61,7 +61,7 @@
6161
--- ['<C-n>'] = { 'select_next' },
6262
--- ['<C-p>'] = { 'select_prev' },
6363
---
64-
--- ['<C-y>'] = { 'select_and_accept' },
64+
--- ['<C-y>'] = { 'select_and_accept', 'fallback' },
6565
--- ['<C-e>'] = { 'cancel', 'fallback' },
6666
--- }
6767
--- ```

lua/blink/cmp/keymap/presets.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local presets_keymaps = {
77
default = {
88
['<C-space>'] = { 'show', 'show_documentation', 'hide_documentation' },
99
['<C-e>'] = { 'cancel', 'fallback' },
10-
['<C-y>'] = { 'select_and_accept' },
10+
['<C-y>'] = { 'select_and_accept', 'fallback' },
1111

1212
['<Up>'] = { 'select_prev', 'fallback' },
1313
['<Down>'] = { 'select_next', 'fallback' },
@@ -34,7 +34,7 @@ local presets_keymaps = {
3434
['<Right>'] = { 'select_next', 'fallback' },
3535
['<Left>'] = { 'select_prev', 'fallback' },
3636

37-
['<C-y>'] = { 'select_and_accept' },
37+
['<C-y>'] = { 'select_and_accept', 'fallback' },
3838
['<C-e>'] = { 'cancel', 'fallback' },
3939
['<End>'] = { 'hide', 'fallback' },
4040
},

lua/blink/cmp/sources/cmdline/init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ local function get_completions(pattern, type, completion_type)
7777
local orig_path = vim.env.PATH
7878
local new_path = table.concat(vim.tbl_filter(filter_fn, vim.split(orig_path, separator)), separator)
7979
vim.env.PATH = new_path
80-
local completions = vim.fn.getcompletion(pattern, type)
80+
local completions = vim.fn.getcompletion(pattern, type, true)
8181
vim.env.PATH = orig_path
8282
return completions
8383
end
8484
end
8585

86-
return vim.fn.getcompletion(pattern, type)
86+
return vim.fn.getcompletion(pattern, type, true)
8787
end
8888

8989
--- @class blink.cmp.Source

lua/blink/cmp/sources/lib/init.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
local async = require('blink.cmp.lib.async')
22
local config = require('blink.cmp.config')
3-
local utils = require('blink.cmp.lib.utils')
3+
local deduplicate = require('blink.cmp.lib.utils').deduplicate
44

55
--- @class blink.cmp.Sources
66
--- @field completions_queue blink.cmp.SourcesQueue | nil
@@ -43,7 +43,6 @@ local sources = {
4343
per_filetype_provider_ids = {},
4444
completions_emitter = require('blink.cmp.lib.event_emitter').new('source_completions'),
4545
}
46-
local deduplicate = require('blink.cmp.lib.utils').deduplicate
4746

4847
function sources.get_all_providers()
4948
local providers = {}
@@ -126,7 +125,7 @@ function sources.get_provider_by_id(provider_id)
126125
'Requested provider "'
127126
.. provider_id
128127
.. '" has not been configured. Available providers: '
129-
.. vim.fn.join(vim.tbl_keys(sources.providers), ', ')
128+
.. table.concat(vim.tbl_keys(sources.providers), ', ')
130129
)
131130

132131
-- initialize the provider if it hasn't been initialized yet

0 commit comments

Comments
 (0)