From dba8c8e781cf9cc88a47ad65edf182784fdffaf1 Mon Sep 17 00:00:00 2001
From: Zheng PiaoDan <zhengpiaodan@gmail.com>
Date: Sat, 13 May 2023 06:03:05 +0000
Subject: fix(nickel): wrong indent on line after top level comment (#4792)

* fix(nickel): wrong indent on line after top level comment

Previous incorrect indentation on line after top level comment:

```
# no indent after this comment
  {
  another = 1
}
```

Expected result:

```
# no indent after this comment
{
  another = 1
}
````
---
 queries/nickel/indents.scm             | 10 +++++-----
 tests/indent/nickel/indent-newline.ncl |  5 +++++
 tests/indent/nickel_spec.lua           |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/queries/nickel/indents.scm b/queries/nickel/indents.scm
index 23e779bb1..3195d7feb 100644
--- a/queries/nickel/indents.scm
+++ b/queries/nickel/indents.scm
@@ -1,13 +1,13 @@
 [
-  (term)
+ (atom (uni_record)) ; for {...}
+ (atom terms: (term)) ; for [...]
 ] @indent.begin
 
 [
   "]"
   "}"
-] @indent.branch
+] @indent.end @indent.branch
 
 [
-  "]"
-  "}"
-] @indent.end
+  (comment)
+] @indent.auto
diff --git a/tests/indent/nickel/indent-newline.ncl b/tests/indent/nickel/indent-newline.ncl
index c9813ea2d..f6a8b613c 100644
--- a/tests/indent/nickel/indent-newline.ncl
+++ b/tests/indent/nickel/indent-newline.ncl
@@ -7,3 +7,8 @@
     key4 = 4
   }
 }
+
+# no indent after this line
+{
+  another = 1
+}
diff --git a/tests/indent/nickel_spec.lua b/tests/indent/nickel_spec.lua
index 01d3c3d17..d178dab52 100644
--- a/tests/indent/nickel_spec.lua
+++ b/tests/indent/nickel_spec.lua
@@ -20,5 +20,6 @@ describe("indent Nickel:", function()
     run:new_line("indent-newline.ncl", { on_line = 5, text = "stmt", indent = 2 })
     run:new_line("indent-newline.ncl", { on_line = 6, text = "stmt", indent = 4 })
     run:new_line("indent-newline.ncl", { on_line = 7, text = "}", indent = 2 })
+    run:new_line("indent-newline.ncl", { on_line = 11, text = "stmt", indent = 0 })
   end)
 end)
-- 
cgit v1.2.3-70-g09d2