Make stylistic refinements to the helpers introduced in 8e6d83c

I was testing them and was too eager to commit before refining them.
Will need to write tests eventually, but I do not have time right now.
This commit is contained in:
Protesilaos 2026-05-01 18:48:34 +03:00
parent 8e6d83c652
commit 0ff9573362
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA

View file

@ -2784,23 +2784,27 @@ or `line', referring to what the function should retrieve."
(defun denote--get-front-matter-value-no-indentation (component line file-type)
"Return the COMPONENT on LINE given the FILE-TYPE without any indentation."
(with-temp-buffer
(insert line)
(goto-char (point-min))
(when (re-search-forward (funcall (denote--get-component-key-regexp-function component) file-type) nil t 1)
(re-search-forward "\\s-*" (line-end-position) t)
(buffer-substring-no-properties (point) (line-end-position)))))
(when-let* ((key-regexp-fn (denote--get-component-key-regexp-function component))
(regexp (funcall key-regexp-fn file-type)))
(with-temp-buffer
(insert line)
(goto-char (point-min))
(when (re-search-forward regexp nil t 1)
(re-search-forward "\\s-*" (line-end-position) t)
(buffer-substring-no-properties (point) (line-end-position))))))
(defun denote--rewrite-front-matter-line (component new-line file-type)
"Rewrite COMPONENT with NEW-LINE given the FILE-TYPE.
Preserve the existing key and the spacing, if any, that follows it.
Return non-nil if successful."
(when (re-search-forward (funcall (denote--get-component-key-regexp-function component) file-type) nil t 1)
(let ((new-value (denote--get-front-matter-value-no-indentation component new-line file-type)))
(re-search-forward "\\s-*" (line-end-position) t)
(delete-region (point) (line-end-position))
(insert new-value)
t)))
(when-let* ((key-regexp-fn (denote--get-component-key-regexp-function component))
(regexp (funcall key-regexp-fn file-type))
(_ (re-search-forward regexp nil t 1))
(new-value (denote--get-front-matter-value-no-indentation component new-line file-type)))
(re-search-forward "\\s-*" (line-end-position) t)
(delete-region (point) (line-end-position))
(insert new-value)
t))
;; These are private front matter retrieval functions, working with a content parameter