[nongnu] elpa/nix-mode 80a1e96c71 296/500: Merge branch 'grahamc-fix-issue-69'

[ELPA Syncer]

branch: elpa/nix-mode
commit 80a1e96c7133925797a748cf9bc097ca6483baeb
Merge: 54ef833100 e8921b8a78
Author: Elis Hirwing <e...@hirwing.se>
Commit: Elis Hirwing <e...@hirwing.se>

    Merge branch 'grahamc-fix-issue-69'
---
 nix-mode.el                    |  6 +++---
 tests/nix-mode-tests.el        | 12 ++++++++++++
 tests/testcases/issue-69.1.nix |  2 ++
 tests/testcases/issue-69.2.nix |  2 ++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/nix-mode.el b/nix-mode.el
index 300f7de99e..df664a36a3 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -502,12 +502,12 @@ STRING-TYPE type of string based off of Emacs syntax 
table types"
                                             ) -1 0)
                                       )))))
 
-            ;; indent line after 'let', 'import', '[', '=', '(', '{'
-            ((nix-indent-first-line-in-block))
-
             ;; dedent '}', ']', ')' 'in'
             ((nix-indent-to-backward-match))
 
+            ;; indent line after 'let', 'import', '[', '=', '(', '{'
+            ((nix-indent-first-line-in-block))
+
             ;; indent between = and ; + 2, or to 2
             ((nix-indent-expression-start))
 
diff --git a/tests/nix-mode-tests.el b/tests/nix-mode-tests.el
index 84c223ce76..a73a90c655 100644
--- a/tests/nix-mode-tests.el
+++ b/tests/nix-mode-tests.el
@@ -106,5 +106,17 @@ Related issue: https://github.com/NixOS/nix-mode/issues/60";
 Related issue: https://github.com/NixOS/nix-mode/issues/60";
   (with-nix-mode-test ("issue-60.3.nix" :indent t)))
 
+(ert-deftest nix-mode-test-indent-issue-69-1 ()
+  "Proper indentation of an empty attrset.
+
+Related issue: https://github.com/NixOS/nix-mode/issues/69";
+  (with-nix-mode-test ("issue-69.1.nix" :indent t)))
+
+(ert-deftest nix-mode-test-indent-issue-69-2 ()
+  "Proper indentation of an empty list.
+
+Related issue: https://github.com/NixOS/nix-mode/issues/69";
+  (with-nix-mode-test ("issue-60.2.nix" :indent t)))
+
 (provide 'nix-mode-tests)
 ;;; nix-mode-tests.el ends here
diff --git a/tests/testcases/issue-69.1.nix b/tests/testcases/issue-69.1.nix
new file mode 100644
index 0000000000..2c63c08510
--- /dev/null
+++ b/tests/testcases/issue-69.1.nix
@@ -0,0 +1,2 @@
+{
+}
diff --git a/tests/testcases/issue-69.2.nix b/tests/testcases/issue-69.2.nix
new file mode 100644
index 0000000000..0d4f101c7a
--- /dev/null
+++ b/tests/testcases/issue-69.2.nix
@@ -0,0 +1,2 @@
+[
+]