[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode 5e61391ca1 047/500: Merge branch 'lets'
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode 5e61391ca1 047/500: Merge branch 'lets' |
Date: |
Sat, 29 Jan 2022 08:26:35 -0500 (EST) |
branch: elpa/nix-mode
commit 5e61391ca124d79f4fa51ff105527ac7deddfdb7
Merge: 76ad5882f0 76df9f3e6b
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>
Merge branch 'lets'
---
nix-mode.el | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/nix-mode.el b/nix-mode.el
index 7c02a1a20c..37bc17e999 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -168,6 +168,23 @@ If a close brace `}' ends an antiquote, the next character
begins a string."
n)
+(defun nix-indent-level-let ()
+ (save-excursion
+ (setq lets 0)
+ (setq ins 0)
+ (beginning-of-line)
+ (while (not (eq (point) (point-min)))
+ (forward-line -1)
+ (cond
+ ((and
+ (looking-at "[:space:]*let")
+ (not (looking-at ".*in")))
+ (setq lets (1+ lets)))
+ ((looking-at "[:space:]*in")
+ (setq ins (1+ ins)))))
+
+ (- lets ins)))
+
(defun nix-indent-level-is-closing ()
"Go forward from beginning of line."
(save-excursion
@@ -215,6 +232,7 @@ If a close brace `}' ends an antiquote, the next character
begins a string."
"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)))))
- [nongnu] elpa/nix-mode 8721f63650 310/500: Merge pull request #79 from j-piecuch/smie, (continued)
- [nongnu] elpa/nix-mode 8721f63650 310/500: Merge pull request #79 from j-piecuch/smie, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 5fcdd667de 312/500: Make smie-indent-line the default indent function, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode b902e15c1f 003/500: Create nix-mode.el, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1e74e5021a 002/500: Create LICENSE, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 616c368898 007/500: Add two spaces after period., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7292d8971c 021/500: Refactor indenting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7f69c71f8d 019/500: Fixup mode map., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 32929d9aed 024/500: Indent relative for string, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9ab56cd6c9 035/500: Refactor indenting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 65d0b6471f 039/500: Add more font lock constants., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 5e61391ca1 047/500: Merge branch 'lets',
ELPA Syncer <=
- [nongnu] elpa/nix-mode ddf091708b 353/500: Merge pull request #87 from conao3/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode abf54fb448 354/500: Emacs 25 is now the minimum version required, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode de6ef0d0c7 355/500: Give "-" the "symbol" character class, since it is a legal symbol constituent, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 28e83dd56b 360/500: Don’t overwrite smie-indent-exps & smie-indent-close, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9f24153d67 367/500: Remove redundant case in tokenizer., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode b4518ae3ee 374/500: fixed a typo, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode d13d70b37d 377/500: Merge pull request #102 from yilinwei/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode a00b3f776d 384/500: Merge pull request #103 from yilinwei/patch-1, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode bb0b49e3ac 408/500: Merge pull request #112 from leungbk/makefile-load-path, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7d09073976 424/500: Merge pull request #121 from znewman01/fixbuild, ELPA Syncer, 2022/01/29