branch: elpa/nix-mode
commit a521468c5bdfe86857b663a9cc12577de1b834e0
Author: Matthew Bauer <[email protected]>
Commit: Matthew Bauer <[email protected]>
Fixup string indenting
---
nix-mode.el | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index 00adee0d4f..af5a7b03e1 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -296,15 +296,6 @@
(looking-at "in[[:space:]]")
(looking-at "in$"))))
-(defun nix-indent-level-is-opening ()
- "Is opening indent?"
- (save-excursion
- (end-of-line)
- (skip-chars-backward "[:space:]")
-
- (or
- (looking-back "''"))))
-
(defun nix-indent-level-is-hanging ()
"Is hanging?"
(save-excursion
@@ -368,7 +359,18 @@
(beginning-of-line)
(nth 3 (syntax-ppss)))
(indent-line-to (+ (nix-indent-prev-level)
- (if (save-excursion (forward-line -1)
(nix-indent-level-is-opening)) tab-width 0))))
+ (* tab-width (+ (if (save-excursion
+ (forward-line -1)
+ (end-of-line)
+ (skip-chars-backward "[:space:]")
+ (looking-back "''")) 1 0)
+ (if (save-excursion
+ (beginning-of-line)
+ (skip-chars-forward
+ "[:space:]")
+ (looking-at "''")
+ ) -1 0)
+ )))))
;; else
(t
