branch: externals/ellama
commit 1b78d0f617492ad52c4cbe3f5c4c3c59753d6225
Author: Alex Bennée <[email protected]>
Commit: Alex Bennée <[email protected]>
ellama-blueprints: be less aggressive matching template vars
As various languages use {} as function markers its hard to include
example code snippets in blueprints due to the variable expansion. It
seems reasonable to restrict the substitutions to {selfcontained}
variables that don't span multiple lines.
While at it I created a variable for the regexp so future changes
don't need to find all the references.
---
ellama-blueprint.el | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/ellama-blueprint.el b/ellama-blueprint.el
index 10d1c58fd2..ab77fd3853 100644
--- a/ellama-blueprint.el
+++ b/ellama-blueprint.el
@@ -58,8 +58,12 @@
"C-c C-c" #'ellama-transient-blueprint-mode-menu
"C-c C-k" #'ellama-kill-current-buffer)
+(defvar ellama-blueprint-variable-regexp
+ "{\\([[:alnum:]_-]+\\)}"
+ "Regular expression to match blueprint variables like {var_name}.")
+
(defvar ellama-blueprint-font-lock-keywords
- '(("{\\([^}]+\\)}" 1 'font-lock-keyword-face))
+ '((,ellama-blueprint-variable-regexp 1 'font-lock-keyword-face))
"Highlight variables in curly braces for Ellama Blueprint Mode.")
;;;###autoload
@@ -69,7 +73,7 @@
"Toggle Ellama Blueprint mode."
:keymap ellama-blueprint-mode-map
:group 'ellama
- (setq font-lock-defaults '((("{\\([^}]+\\)}" 1 font-lock-keyword-face t))))
+ (setq font-lock-defaults '(((,ellama-blueprint-variable-regexp 1
font-lock-keyword-face t))))
(setq header-line-format
(concat
(propertize
@@ -228,7 +232,7 @@ corresponding prompt is inserted into a blueprint buffer."
(save-excursion
(let ((vars '()))
(goto-char (point-min))
- (while (re-search-forward "\{\\([^}]+\\)}" nil t)
+ (while (re-search-forward ellama-blueprint-variable-regexp nil t)
(push (match-string 1) vars))
(seq-uniq vars))))
