From d198a75e2c2e24885b05650515538d055d0c64e4 Mon Sep 17 00:00:00 2001
From: Phạm Huy Hoàng <hoangtun0810@gmail.com>
Date: Sat, 20 Jan 2024 18:47:56 +0900
Subject: Fixup format (#5934)

* fix(format): newline between top-level field defs

* fixup: newline between node and comment

* fixup: optimize pattern
---
 scripts/format-queries.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'scripts/format-queries.lua')

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 88933c630..d42d5b255 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -52,10 +52,7 @@ local format_queries = [[
 ;; Preserve inline comments
 (program
   . (_)
-  (_) @_comment
-  .
   (comment) @format.prepend-newline
-  (#not-has-type? @_comment comment)
   (#is-start-of-line? @format.prepend-newline))
 (program
   . (_)
@@ -77,7 +74,9 @@ local format_queries = [[
     (grouping)
     (named_node)
     (anonymous_node)
+    (field_definition)
   ] @format.prepend-newline)
+
 (program
   (comment) @_comment
   .
@@ -86,6 +85,8 @@ local format_queries = [[
     (grouping)
     (named_node)
     (anonymous_node)
+    (field_definition)
+    (comment)
   ] @format.cancel-prepend
   (#is-start-of-line? @_comment))
 ;; }}}
-- 
cgit v1.2.3-70-g09d2