From 693ba29a5cb1a870bcb06228d032f8879735fbaa Mon Sep 17 00:00:00 2001
From: Sven Thiele <sthiele78@gmail.com>
Date: Mon, 17 Jan 2022 17:31:27 +0100
Subject: [PATCH] address issue 6
---
src/main.rs | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index f46296e..c0f8dac 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -84,6 +84,11 @@ fn run() -> Result<()> {
let mut in_literal = false;
let mut indent_level = 0;
let mut did_visit_children = false;
+ // rule properties
+ let mut has_head = false;
+ // after position markers
+ let mut after_if = false;
+
loop {
let node = cursor.node();
let is_named = node.is_named();
@@ -93,9 +98,16 @@ fn run() -> Result<()> {
match node.kind() {
"statement" | "comment" => {
writeln!(&mut stdout)?;
+ //reset rule properties
+ has_head = false;
+ }
+ "head" => {
+ has_head = true;
+ needs_space = true;
}
- "head" | "NOT" | "aggregatefunction" => needs_space = true,
+ "NOT" | "aggregatefunction" => needs_space = true,
"IF" => {
+ after_if = true;
needs_space = true;
}
"literal" => {
@@ -146,7 +158,7 @@ fn run() -> Result<()> {
in_condition = true;
}
"literal" => {
- if in_body && !in_literal {
+ if in_body && !in_literal && (!after_if || has_head) {
write!(&mut stdout, "\n ")?;
}
if in_body_agg {
@@ -158,14 +170,19 @@ fn run() -> Result<()> {
in_literal = true;
}
"lubodyaggregate" => {
- if in_body && !in_literal {
+ if in_body && !in_literal && (!after_if || has_head) {
write!(&mut stdout, "\n ")?;
}
in_body_agg = true;
}
+ "IF" => {
+ if !has_head {
+ write!(&mut stdout, " ")?;
+ }
+ }
"COLON" | "cmp" => write!(&mut stdout, " ")?,
"RBRACE" => {
- if in_body {
+ if in_body && (!after_if || has_head) {
write!(&mut stdout, "\n ")?;
} else {
write!(&mut stdout, " ")?;
@@ -183,6 +200,8 @@ fn run() -> Result<()> {
if opt.debug {
debug!("{} ", text);
}
+ // reset after position markers
+ after_if = false
}
if opt.debug {