branch: elpa/nix-mode
commit 1e0709acde8003af10ead4950ce646c6856f3dcf
Author: Matthew Bauer <[email protected]>
Commit: Matthew Bauer <[email protected]>
Fixup indentation
---
nix-mode.el | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index 5eaefc3977..71b22d99d9 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -148,18 +148,17 @@ If a close brace `}' ends an antiquote, the next
character begins a string."
(0 (ignore (nix-syntax-propertize-close-brace)))))
start end))
-(defun nix-paren-level ()
- "Get current parenthesis level."
- (* 2 (nth 0 (syntax-ppss))))
-
(defun nix-indent-level ()
"Get current indent level."
(save-excursion
(beginning-of-line)
(skip-chars-forward "[:space:]")
- (let ((baseline (nix-paren-level)))
+ (let ((baseline (+
+ (* tab-width (nth 0 (syntax-ppss)))
+ (if (nth 3 (syntax-ppss)) tab-width 0))))
(cond
((looking-at "[]})]") (- baseline tab-width))
+ ((looking-at "''") (- baseline tab-width))
;; ((nix-inside-args) (- baseline tab-width))
;; ((nix-inside-let) (+ baseline tab-width))
(t baseline)))))
@@ -167,15 +166,16 @@ If a close brace `}' ends an antiquote, the next
character begins a string."
(defun nix-indent-line ()
"Indent current line in a Nix expression."
(interactive)
- (cond
- ;; string
- ((nth 3 (syntax-ppss)) (indent-relative))
+ (save-excursion
+ (cond
+ ;; string
+ ;; ((nth 3 (syntax-ppss)) (indent-relative))
- ;; comment
- ((nth 4 (syntax-ppss)) nil)
+ ;; comment
+ ((nth 4 (syntax-ppss)) nil)
- ;; else
- (t (indent-line-to (nix-indent-level)))))
+ ;; else
+ (t (indent-line-to (nix-indent-level))))))
(defun nix-visit-file ()
"Go to file under cursor."
