branch: elpa/typst-ts-mode
commit 361dfe6001d5299547219a63381d70433877b926
Author: Ziqi Yang <[email protected]>
Commit: Ziqi Yang <[email protected]>
fix: allow dynamic indentation offset
---
typst-ts-mode.el | 57 ++++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 29 deletions(-)
diff --git a/typst-ts-mode.el b/typst-ts-mode.el
index 621f1ed9a8..71b8c88d2a 100644
--- a/typst-ts-mode.el
+++ b/typst-ts-mode.el
@@ -498,37 +498,36 @@ corresponding ancestor node. Return nil if ancestor not
matching."
TYPES."
(typst-ts-mode--ancestor-in types t))
-(defconst typst-ts-mode--indent-rules
+(defvar typst-ts-mode--indent-rules
;; you can set `treesit--indent-verbose' variable to t to see which
indentation
;; rule matches.
- (let ((offset typst-ts-mode-indent-offset))
- `((typst
- ;; ((lambda (node parent bol)
- ;; (message "%s %s %s" (treesit-node-type node) (treesit-node-type
parent) bol)
- ;; nil) parent-bol 0)
-
- ((and (node-is ")") (parent-is "group")) parent-bol 0)
- ((and (node-is "}") (parent-is "block")) parent-bol 0)
- ((and (node-is "]") (parent-is "content")) parent-bol 0)
-
- ((and (node-is "item") (parent-is "item")) parent-bol ,offset)
-
- ((parent-is "block") parent-bol ,offset)
- ((parent-is "content") parent-bol ,offset)
- ((parent-is "group") parent-bol ,offset)
-
- ;; don't indent raw block
- ((and no-node ,(typst-ts-mode--ancestor-in (list "raw_blck")))
- no-indent 0)
-
- ((and no-node
- ,(typst-ts-mode--ancestor-in typst-ts-mode--bracket-node-types))
- ,(typst-ts-mode--ancestor-bol typst-ts-mode--bracket-node-types)
- ,offset)
-
- ((and no-node
- (not ,(typst-ts-mode--ancestor-in
typst-ts-mode--bracket-node-types)))
- parent-bol 0))))
+ `((typst
+ ;; ((lambda (node parent bol)
+ ;; (message "%s %s %s" (treesit-node-type node) (treesit-node-type
parent) bol)
+ ;; nil) parent-bol 0)
+
+ ((and (node-is ")") (parent-is "group")) parent-bol 0)
+ ((and (node-is "}") (parent-is "block")) parent-bol 0)
+ ((and (node-is "]") (parent-is "content")) parent-bol 0)
+
+ ((and (node-is "item") (parent-is "item")) parent-bol
typst-ts-mode-indent-offset)
+
+ ((parent-is "block") parent-bol typst-ts-mode-indent-offset)
+ ((parent-is "content") parent-bol typst-ts-mode-indent-offset)
+ ((parent-is "group") parent-bol typst-ts-mode-indent-offset)
+
+ ;; don't indent raw block
+ ((and no-node ,(typst-ts-mode--ancestor-in (list "raw_blck")))
+ no-indent 0)
+
+ ((and no-node
+ ,(typst-ts-mode--ancestor-in typst-ts-mode--bracket-node-types))
+ ,(typst-ts-mode--ancestor-bol typst-ts-mode--bracket-node-types)
+ typst-ts-mode-indent-offset)
+
+ ((and no-node
+ (not ,(typst-ts-mode--ancestor-in
typst-ts-mode--bracket-node-types)))
+ parent-bol 0)))
"Tree-sitter indent rules for `rust-ts-mode'.")
(defun typst-ts-mode-comment-setup()
