zoriya/jj.nvim
1
0
Fork 0
mirror of https://github.com/zoriya/jj.nvim.git synced 2026-08-10 13:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(parser): use / instead of \ as divergent change separator

Browse Source 
jj uses / (e.g., rs/1) for divergent changes, not \. Update the parser
to match revsets with /N suffix and update all related tests.
This commit is contained in:
NicolasGB
2026-02-13 10:13:30 +01:00
parent 27ab6707be
commit 3115a0b3f0
2 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/jj/core/parser.lua
+7 -6
View File
@@ -125,7 +125,8 @@ function M.get_revset(line)
}
-- ASCII markers (escaped for pattern matching)
local ascii_markers = { "@", "%*", "/", "\\", "%-", "%+", "|" }
-- Note: "/" is excluded because it's used as divergent change separator (e.g., rs/1)
local ascii_markers = { "@", "%*", "\\", "%-", "%+", "|" }
-- MUST have at least one commit marker symbol to be a valid commit line
-- Otherwise it's a description/message line, not a commit marker line
@@ -162,13 +163,13 @@ function M.get_revset(line)
allowed_prefix = allowed_prefix .. "]+" -- close class, match one or more (not zero)
-- Match first alphanumeric sequence after graph prefix
-- Supports divergent changes: revset\0, revset\1, etc.
-- Only match if it's followed by whitespace, backslash (for divergent), or end of string
-- Supports divergent changes: revset/0, revset/1, etc.
-- Only match if it's followed by whitespace, slash (for divergent), or end of string
-- Try matching with divergent suffix first: revset\N where N is a number
local revset, divergent_num = line:match("^" .. allowed_prefix .. "(%w+)\\(%d+)")
-- Try matching with divergent suffix first: revset/N where N is a number
local revset, divergent_num = line:match("^" .. allowed_prefix .. "(%w+)/(%d+)")
if revset and divergent_num then
return revset .. "\\" .. divergent_num
return revset .. "/" .. divergent_num
end
-- Try regular match followed by whitespace