emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/nix-mode 04a268a6fe 126/500: Remove "let" handling of inde


From: ELPA Syncer
Subject: [nongnu] elpa/nix-mode 04a268a6fe 126/500: Remove "let" handling of indent.
Date: Sat, 29 Jan 2022 08:26:48 -0500 (EST)

branch: elpa/nix-mode
commit 04a268a6feb1878470cadaee282e5b3b505ded2b
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>

    Remove "let" handling of indent.
    
    Fixes #23
    but loses some functionality with "let" handling.
---
 nix-mode.el | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/nix-mode.el b/nix-mode.el
index ac5824b641..2825392da8 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -281,35 +281,6 @@
 
       n)))
 
-(defun nix-indent-level-let ()
-  "Get indent level based on # of let statements."
-  (save-excursion
-    (beginning-of-line)
-
-    (let ((lets 0)
-          (ins 0))
-      (while (not (eq (point) (point-min)))
-        (forward-line -1)
-        (cond
-         ((save-excursion (end-of-line) (nth 4 (syntax-ppss))) nil)
-         ((and
-           (or
-            (looking-at "[[:space:]]*let$")
-            (looking-at "[[:space:]]*let[[:space:]]")
-            (looking-at ".*[[:space:]]let$"))
-           (not
-            (or
-             (looking-at ".*[[:space:]]in$")
-             (looking-at ".*[[:space:]]in[[:space:]]"))))
-          (setq lets (1+ lets)))
-         ((or
-           (looking-at "^in$")
-           (looking-at "^in[[:space:]]")
-           (looking-at "[[:space:]]+in$")
-           (looking-at "[[:space:]]+in[[:space:]]"))
-          (setq ins (1+ ins)))))
-      (- lets ins))))
-
 (defun nix-indent-level-is-closing ()
   "Go forward from beginning of line."
   (save-excursion
@@ -349,10 +320,9 @@
 (defun nix-indent-level ()
   "Get current indent level."
   (* tab-width (+
-               (nix-indent-level-parens)
-               (nix-indent-level-let)
-               (if (nix-indent-level-is-closing) -1
-                 (if (nix-indent-level-is-hanging) 1 0)))))
+                (nix-indent-level-parens)
+                (if (nix-indent-level-is-closing) -1
+                  (if (nix-indent-level-is-hanging) 1 0)))))
 
 (defun nix-indent-line ()
   "Indent current line in a Nix expression."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]