Skip to content

Commit d66b1f0

Browse files
committed
Merge branch 'main' into snacks-picker
2 parents abe7987 + e0c781e commit d66b1f0

27 files changed

+1476
-787
lines changed

.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
runtime: ~/.local/share/nvim/site/pack/vendor/start
1717
minidoc-git: https://github.com/echasnovski/mini.doc
1818
minidoc-path: ~/.local/share/nvim/site/pack/vendor/start/mini.doc
19-
nvim_url: https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz
19+
nvim_url: https://github.com/neovim/neovim/releases/download/nightly/nvim-linux-x86_64.tar.gz
2020

2121
jobs:
2222
docs:

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
5858
include:
5959
- os: ubuntu-latest
60-
nvim_url: https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz
60+
nvim_url: https://github.com/neovim/neovim/releases/download/nightly/nvim-linux-x86_64.tar.gz
6161
packages: luarocks ripgrep
6262
manager: sudo apt-get
6363

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
- Added `opts.follow_img_func` option for customizing how to handle image paths.
1313
- Added better handling for undefined template fields, which will now be prompted for.
1414
- Added support for the [`snacks.picker`](https://github.com/folke/snacks.nvim/blob/main/docs/picker.md) picker
15+
- Added support for the [`blink.cmp`](https://github.com/Saghen/blink.cmp) completion plugin.
1516

1617
### Changed
1718

README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ _Keep in mind this plugin is not meant to replace Obsidian, but to complement it
2828

2929
## Features
3030

31-
▶️ **Completion:** Ultra-fast, asynchronous autocompletion for note references and tags via [nvim-cmp](https://github.com/hrsh7th/nvim-cmp) (triggered by typing `[[` for wiki links, `[` for markdown links, or `#` for tags), powered by [`ripgrep`](https://github.com/BurntSushi/ripgrep).
31+
▶️ **Completion:** Ultra-fast, asynchronous autocompletion for note references and tags via [nvim-cmp](https://github.com/hrsh7th/nvim-cmp) or [blink.cmp](https://github.com/Saghen/blink.cmp) (triggered by typing `[[` for wiki links, `[` for markdown links, or `#` for tags), powered by [`ripgrep`](https://github.com/BurntSushi/ripgrep).
3232

3333
[![See this screenshot](https://github.com/epwalsh/obsidian.nvim/assets/8812459/90d5f218-06cd-4ebb-b00b-b59c2f5c3cc1)](https://github.com/epwalsh/obsidian.nvim/assets/8812459/90d5f218-06cd-4ebb-b00b-b59c2f5c3cc1)
3434

@@ -195,6 +195,7 @@ The only **required** plugin dependency is [plenary.nvim](https://github.com/nvi
195195
**Completion:**
196196

197197
- **[recommended]** [hrsh7th/nvim-cmp](https://github.com/hrsh7th/nvim-cmp): for completion of note references.
198+
- [blink.cmp](https://github.com/Saghen/blink.cmp) (new): for completion of note references.
198199

199200
**Pickers:**
200201

@@ -267,8 +268,10 @@ This is a complete list of all of the options that can be passed to `require("ob
267268

268269
-- Optional, completion of wiki links, local markdown links, and tags using nvim-cmp.
269270
completion = {
270-
-- Set to false to disable completion.
271+
-- Enables completion using nvim_cmp
271272
nvim_cmp = true,
273+
-- Enables completion using blink.cmp
274+
blink = false,
272275
-- Trigger completion at 2 chars.
273276
min_chars = 2,
274277
},
@@ -613,7 +616,9 @@ See [using obsidian.nvim outside of a workspace / Obsidian vault](#usage-outside
613616

614617
#### Completion
615618

616-
obsidian.nvim will set itself up as an nvim-cmp source automatically when you enter a markdown buffer within your vault directory, you do **not** need to specify this plugin as a cmp source manually.
619+
obsidian.nvim supports nvim_cmp and blink.cmp completion plugins.
620+
621+
obsidian.nvim will set itself up automatically when you enter a markdown buffer within your vault directory, you do **not** need to specify this plugin as a cmp source manually.
617622

618623
Note that in order to trigger completion for tags _within YAML frontmatter_ you still need to type the "#" at the start of the tag. obsidian.nvim will remove the "#" when you hit enter on the tag completion item.
619624

doc/obsidian.txt

+13-7
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ own as well. You don’t necessarily need to use it alongside the Obsidian app.
4040
2. Features *obsidian-features*
4141

4242
▶️ **Completion:** Ultra-fast, asynchronous autocompletion for note
43-
references and tags via nvim-cmp <https://github.com/hrsh7th/nvim-cmp>
44-
(triggered by typing `[[` for wiki links, `[` for markdown links, or `#` for
45-
tags), powered by `ripgrep` <https://github.com/BurntSushi/ripgrep>.
43+
references and tags via nvim-cmp <https://github.com/hrsh7th/nvim-cmp> or
44+
blink.cmp <https://github.com/Saghen/blink.cmp> (triggered by typing `[[` for
45+
wiki links, `[` for markdown links, or `#` for tags), powered by `ripgrep`
46+
<https://github.com/BurntSushi/ripgrep>.
4647

4748

4849
<https://github.com/epwalsh/obsidian.nvim/assets/8812459/90d5f218-06cd-4ebb-b00b-b59c2f5c3cc1>
@@ -246,6 +247,7 @@ dependencies that enhance the obsidian.nvim experience.
246247
**Completion:**
247248

248249
- **[recommended]** hrsh7th/nvim-cmp <https://github.com/hrsh7th/nvim-cmp>: for completion of note references.
250+
- blink.cmp <https://github.com/Saghen/blink.cmp> (new): for completion of note references.
249251

250252
**Pickers:**
251253

@@ -323,8 +325,10 @@ carefully and customize it to your needs:
323325

324326
-- Optional, completion of wiki links, local markdown links, and tags using nvim-cmp.
325327
completion = {
326-
-- Set to false to disable completion.
328+
-- Enables completion using nvim_cmp
327329
nvim_cmp = true,
330+
-- Enables completion using blink.cmp
331+
blink = false,
328332
-- Trigger completion at 2 chars.
329333
min_chars = 2,
330334
},
@@ -684,9 +688,11 @@ plugin’s functionality on markdown files outside of your "fixed" vaults. See
684688

685689
COMPLETION ~
686690

687-
obsidian.nvim will set itself up as an nvim-cmp source automatically when you
688-
enter a markdown buffer within your vault directory, you do **not** need to
689-
specify this plugin as a cmp source manually.
691+
obsidian.nvim supports nvim_cmp and blink.cmp completion plugins.
692+
693+
obsidian.nvim will set itself up automatically when you enter a markdown buffer
694+
within your vault directory, you do **not** need to specify this plugin as a
695+
cmp source manually.
690696

691697
Note that in order to trigger completion for tags _within YAML frontmatter_ you
692698
still need to type the "#" at the start of the tag. obsidian.nvim will remove

0 commit comments

Comments
 (0)