Merge branch 'main' into main

Author: andrewinci

CHANGELOG.md

@@ -11,24 +11,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added default `image_name_func` similar to Obsidian's.
 - Added support `text/uri-list` to `ObsidianPasteImg`.
+- Added support for obsidian style `%%` comment
 
 ### Changed
 
-- `ObsidianToggleCheckbox` now works in visual mode for multiline toggle
-- `ObsidianRename` input field is pre-filled filled with the current note id to ease renaming
+- Moved all commands into one `:Obsidian` command.
+- Added `opts.legacy_commands` option which enables the old commands.
+- `ObsidianToggleCheckbox` now works in visual mode for multiline toggle.
+- `ObsidianRename` input field is pre-filled filled with the current note id to ease renaming.
 - Improved type annotations for user commands: add `CommandArgs` type.
 
 ### Fixed
 
 - Enhanced completion menu to correctly display and handle non-English (ex. Korean) file names and tags in link, fixing Unicode encoding issues
+- Fixed bug where `ObsidianRename` did not update the note_id if run in current buffer and not remove the old buffer
+- Fixed `<C-x>` not working after command merging
 
 ## [v3.10.0](https://github.com/obsidian-nvim/obsidian.nvim/releases/tag/v3.10.0) - 2025-04-12
 
 ### Added
 
 - Added `opts.follow_img_func` option for customizing how to handle image paths.
 - Added better handling for undefined template fields, which will now be prompted for.
-- Added support for the [`snacks.picker`](https://github.com/folke/snacks.nvim/blob/main/docs/picker.md) picker
+- Added support for the [`snacks.picker`](https://github.com/folke/snacks.nvim/blob/main/docs/picker.md) picker.
 - Added support for the [`blink.cmp`](https://github.com/Saghen/blink.cmp) completion plugin.
 - Added health check module
 - Added a minimal sandbox script `minimal.lua`
@@ -39,7 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Default to not activate ui render when `render-markdown.nvim` or `markview.nvim` is present
 - `smart_action` shows picker for tags (`ObsidianTag`) when cursor is on a tag
 - `ObsidianToggleCheckbox` now works with numbered lists
-- `Makefile` is friendlier: self-documenting and automatically gets dependencies
+- # `Makefile` is friendlier: self-documenting and automatically gets dependencies
+- Default to not activate ui render when `render-markdown.nvim` or `markview.nvim` is present.
 
 ### Fixed
 

README.md

@@ -48,54 +48,54 @@ The fork aims to stay close to the original, but fix bugs, include and merge use
 
 ### Commands
 
-- `:ObsidianOpen [QUERY]` to open a note in the Obsidian app.
+- `:Obsidian open [QUERY]` to open a note in the Obsidian app.
   This command has one optional argument: a query used to resolve the note to open by ID, path, or alias. If not given, the note corresponding to the current buffer is opened.
 
-- `:ObsidianNew [TITLE]` to create a new note.
+- `:Obsidian new [TITLE]` to create a new note.
   This command has one optional argument: the title of the new note.
 
-- `:ObsidianQuickSwitch` to quickly switch to (or open) another note in your vault, searching by its name using [ripgrep](https://github.com/BurntSushi/ripgrep) with your preferred picker (see [plugin dependencies](#plugin-dependencies) below).
+- `:Obsidian quick_switch` to quickly switch to (or open) another note in your vault, searching by its name using [ripgrep](https://github.com/BurntSushi/ripgrep) with your preferred picker (see [plugin dependencies](#plugin-dependencies) below).
 
-- `:ObsidianFollowLink [vsplit|hsplit]` to follow a note reference under the cursor, optionally opening it in a vertical or horizontal split.
+- `:Obsidian follow_link [vsplit|hsplit]` to follow a note reference under the cursor, optionally opening it in a vertical or horizontal split.
 
-- `:ObsidianBacklinks` for getting a picker list of references to the current buffer.
+- `:Obsidian backlinks` for getting a picker list of references to the current buffer.
 
-- `:ObsidianTags [TAG ...]` for getting a picker list of all occurrences of the given tags.
+- `:Obsidian tags [TAG ...]` for getting a picker list of all occurrences of the given tags.
 
-- `:ObsidianToday [OFFSET]` to open/create a new daily note. This command also takes an optional offset in days, e.g. use `:ObsidianToday -1` to go to yesterday's note. Unlike `:ObsidianYesterday` and `:ObsidianTomorrow` this command does not differentiate between weekdays and weekends.
+- `:Obsidian today [OFFSET]` to open/create a new daily note. This command also takes an optional offset in days, e.g. use `:Obsidian today -1` to go to yesterday's note. Unlike `:Obsidian yesterday` and `:Obsidian tomorrow` this command does not differentiate between weekdays and weekends.
 
-- `:ObsidianYesterday` to open/create the daily note for the previous working day.
+- `:Obsidian yesterday` to open/create the daily note for the previous working day.
 
-- `:ObsidianTomorrow` to open/create the daily note for the next working day.
+- `:Obsidian tomorrow` to open/create the daily note for the next working day.
 
-- `:ObsidianDailies [OFFSET ...]` to open a picker list of daily notes. For example, `:ObsidianDailies -2 1` to list daily notes from 2 days ago until tomorrow.
+- `:Obsidian dailies [OFFSET ...]` to open a picker list of daily notes. For example, `:Obsidian dailies -2 1` to list daily notes from 2 days ago until tomorrow.
 
-- `:ObsidianTemplate [NAME]` to insert a template from the templates folder, selecting from a list using your preferred picker. See ["using templates"](#using-templates) for more information.
+- `:Obsidian template [NAME]` to insert a template from the templates folder, selecting from a list using your preferred picker. See ["using templates"](#using-templates) for more information.
 
-- `:ObsidianSearch [QUERY]` to search for (or create) notes in your vault using `ripgrep` with your preferred picker.
+- `:Obsidian search [QUERY]` to search for (or create) notes in your vault using `ripgrep` with your preferred picker.
 
-- `:ObsidianLink [QUERY]` to link an inline visual selection of text to a note.
+- `:Obsidian link [QUERY]` to link an inline visual selection of text to a note.
   This command has one optional argument: a query that will be used to resolve the note by ID, path, or alias. If not given, the selected text will be used as the query.
 
-- `:ObsidianLinkNew [TITLE]` to create a new note and link it to an inline visual selection of text.
+- `:Obsidian linknew [TITLE]` to create a new note and link it to an inline visual selection of text.
   This command has one optional argument: the title of the new note. If not given, the selected text will be used as the title.
 
-- `:ObsidianLinks` to collect all links within the current buffer into a picker window.
+- `:Obsidian links` to collect all links within the current buffer into a picker window.
 
-- `:ObsidianExtractNote [TITLE]` to extract the visually selected text into a new note and link to it.
+- `:Obsidian extract_note [TITLE]` to extract the visually selected text into a new note and link to it.
 
-- `:ObsidianWorkspace [NAME]` to switch to another workspace.
+- `:Obsidian workspace [NAME]` to switch to another workspace.
 
-- `:ObsidianPasteImg [IMGNAME]` to paste an image from the clipboard into the note at the cursor position by saving it to the vault and adding a markdown image link. You can configure the default folder to save images to with the `attachments.img_folder` option.
+- `:Obsidian paste_img [IMGNAME]` to paste an image from the clipboard into the note at the cursor position by saving it to the vault and adding a markdown image link. You can configure the default folder to save images to with the `attachments.img_folder` option.
 
-- `:ObsidianRename [NEWNAME] [--dry-run]` to rename the note of the current buffer or reference under the cursor, updating all backlinks across the vault. Since this command is still relatively new and could potentially write a lot of changes to your vault, I highly recommend committing the current state of your vault (if you're using version control) before running it, or doing a dry-run first by appending "--dry-run" to the command, e.g. `:ObsidianRename new-id --dry-run`.
+- `:Obsidian rename [NEWNAME] [--dry-run]` to rename the note of the current buffer or reference under the cursor, updating all backlinks across the vault. Since this command is still relatively new and could potentially write a lot of changes to your vault, I highly recommend committing the current state of your vault (if you're using version control) before running it, or doing a dry-run first by appending "--dry-run" to the command, e.g. `:Obsidian rename new-id --dry-run`.
 
-- `:ObsidianToggleCheckbox` to cycle through checkbox options.
+- `:Obsidian toggle_checkbox` to cycle through checkbox options.
 
-- `:ObsidianNewFromTemplate [TITLE]` to create a new note from a template in the templates folder. Selecting from a list using your preferred picker.
+- `:Obsidian new_from_template [TITLE]` to create a new note from a template in the templates folder. Selecting from a list using your preferred picker.
   This command has one optional argument: the title of the new note.
 
-- `:ObsidianTOC` to load the table of contents of the current note into a picker list.
+- `:Obsidian toc` to load the table of contents of the current note into a picker list.
 
 ### Demo
 
@@ -111,11 +111,11 @@ The fork aims to stay close to the original, but fix bugs, include and merge use
 
 Specific operating systems also require additional dependencies in order to use all of obsidian.nvim's functionality:
 
-- **Windows WSL** users need [`wsl-open`](https://gitlab.com/4U6U57/wsl-open) for the `:ObsidianOpen` command.
-- **MacOS** users need [`pngpaste`](https://github.com/jcsalterego/pngpaste) (`brew install pngpaste`) for the `:ObsidianPasteImg` command.
-- **Linux** users need xclip (X11) or wl-clipboard (Wayland) for the `:ObsidianPasteImg` command.
+- **Windows WSL** users need [`wsl-open`](https://gitlab.com/4U6U57/wsl-open) for the `:Obsidian open` command.
+- **MacOS** users need [`pngpaste`](https://github.com/jcsalterego/pngpaste) (`brew install pngpaste`) for the `:Obsidian pasteimg` command.
+- **Linux** users need xclip (X11) or wl-clipboard (Wayland) for the `:Obsidian pasteimg` command.
 
-Search functionality (e.g. via the `:ObsidianSearch` and `:ObsidianQuickSwitch` commands) also requires a picker such [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) (see [plugin dependencies](#plugin-dependencies) below).
+Search functionality (e.g. via the `:Obsidian search` and `:Obsidian quickswitch` commands) also requires a picker such [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) (see [plugin dependencies](#plugin-dependencies) below).
 
 ### Install and configure
 
@@ -424,7 +424,7 @@ This is a complete list of all of the options that can be passed to `require("ob
     substitutions = {},
   },
 
-  -- Optional, by default when you use `:ObsidianFollowLink` on a link to an external
+  -- Optional, by default when you use `:Obsidian followlink` on a link to an external
   -- URL it will be ignored but you can customize this behavior here.
   ---@param url string
   follow_url_func = function(url)
@@ -435,7 +435,7 @@ This is a complete list of all of the options that can be passed to `require("ob
     -- vim.ui.open(url) -- need Neovim 0.10.0+
   end,
 
-  -- Optional, by default when you use `:ObsidianFollowLink` on a link to an image
+  -- Optional, by default when you use `:Obsidian followlink` on a link to an image
   -- file it will be ignored but you can customize this behavior here.
   ---@param img string
   follow_img_func = function(img)
@@ -448,7 +448,7 @@ This is a complete list of all of the options that can be passed to `require("ob
   -- https://github.com/Vinzent03/obsidian-advanced-uri
   use_advanced_uri = false,
 
-  -- Optional, set to true to force ':ObsidianOpen' to bring the app to the foreground.
+  -- Optional, set to true to force ':Obsidian open' to bring the app to the foreground.
   open_app_foreground = false,
 
   picker = {
@@ -472,7 +472,7 @@ This is a complete list of all of the options that can be passed to `require("ob
 
   -- Optional, sort search results by "path", "modified", "accessed", or "created".
   -- The recommend value is "modified" and `true` for `sort_reversed`, which means, for example,
-  -- that `:ObsidianQuickSwitch` will show the notes sorted by latest modified time
+  -- that `:Obsidian quickswitch` will show the notes sorted by latest modified time
   sort_by = "modified",
   sort_reversed = true,
 
@@ -559,7 +559,7 @@ This is a complete list of all of the options that can be passed to `require("ob
 
   -- Specify how to handle attachments.
   attachments = {
-    -- The default folder to place images in via `:ObsidianPasteImg`.
+    -- The default folder to place images in via `:Obsidian pasteimg`.
     -- If this is a relative path it will be interpreted as relative to the vault root.
     -- You can always override this per image by passing a full path to the command instead of just a filename.
     img_folder = "assets/imgs",  -- This is the default

after/ftplugin/markdown.lua

@@ -0,0 +1,12 @@
+local obsidian = require "obsidian"
+local buf = vim.api.nvim_get_current_buf()
+local buf_dir = vim.fs.dirname(vim.api.nvim_buf_get_name(buf))
+
+local client = obsidian.get_client()
+
+local workspace = obsidian.Workspace.get_workspace_for_dir(buf_dir, client.opts.workspaces)
+if not workspace then
+  return -- if not in any workspace.
+end
+
+vim.o.commentstring = "%%%s%%"

after/syntax/markdown.vim

@@ -0,0 +1,2 @@
+" Match %%...%% as comment
+syntax match Comment /%%\_.\{-}%%/