change EVALUATE IF and EVALUATE FOR formatting

commit_hash:435092fd6b4de1e8a0df445829d40475c5c4a166

35 files changed, 261 insertions, 257 deletions

diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp
index 7422b37a938..bb8d20b9a00 100644
--- a/yql/essentials/sql/v1/format/sql_format.cpp
+++ b/yql/essentials/sql/v1/format/sql_format.cpp
@@ -1166,10 +1166,11 @@ private:
     }
 
     void VisitDo(const TRule_do_stmt& msg) {
-        NewLine();
         VisitKeyword(msg.GetToken1());
         switch (msg.GetBlock2().Alt_case()) {
         case TRule_do_stmt_TBlock2::kAlt1: { // CALL
+            PushCurrentIndent();
+            NewLine();
             const auto& alt = msg.GetBlock2().GetAlt1().GetRule_call_action1();
             Visit(alt.GetBlock1());
             AfterInvokeExpr = true;
@@ -1177,8 +1178,9 @@ private:
             if (alt.HasBlock3()) {
                 Visit(alt.GetBlock3());
             }
-
             Visit(alt.GetToken4());
+            PopCurrentIndent();
+            NewLine();
             break;
         }
         case TRule_do_stmt_TBlock2::kAlt2: { // INLINE
@@ -1222,52 +1224,12 @@ private:
 
     void VisitIf(const TRule_if_stmt& msg) {
         NewLine();
-        if (msg.HasBlock1()) {
-            Visit(msg.GetBlock1());
-        }
-
-        Visit(msg.GetToken2());
-        Visit(msg.GetRule_expr3());
-        NewLine();
-        PushCurrentIndent();
-        Visit(msg.GetRule_do_stmt4());
-        PopCurrentIndent();
-        if (msg.HasBlock5()) {
-            NewLine();
-            Visit(msg.GetBlock5().GetToken1());
-            NewLine();
-            PushCurrentIndent();
-            Visit(msg.GetBlock5().GetRule_do_stmt2());
-            PopCurrentIndent();
-        }
+        VisitAllFields(TRule_if_stmt::GetDescriptor(), msg);
     }
 
     void VisitFor(const TRule_for_stmt& msg) {
         NewLine();
-        if (msg.HasBlock1()) {
-            Visit(msg.GetBlock1());
-        }
-
-        if (msg.HasBlock2()) {
-            Visit(msg.GetBlock2());
-        }
-
-        Visit(msg.GetToken3());
-        Visit(msg.GetRule_bind_parameter4());
-        Visit(msg.GetToken5());
-        Visit(msg.GetRule_expr6());
-        NewLine();
-        PushCurrentIndent();
-        Visit(msg.GetRule_do_stmt7());
-        PopCurrentIndent();
-        if (msg.HasBlock8()) {
-            NewLine();
-            Visit(msg.GetBlock8().GetToken1());
-            NewLine();
-            PushCurrentIndent();
-            Visit(msg.GetBlock8().GetRule_do_stmt2());
-            PopCurrentIndent();
-        }
+        VisitAllFields(TRule_for_stmt::GetDescriptor(), msg);
     }
 
     void VisitValues(const TRule_values_stmt& msg) {
diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h
index bed9e055abc..abf893c72eb 100644
--- a/yql/essentials/sql/v1/format/sql_format_ut.h
+++ b/yql/essentials/sql/v1/format/sql_format_ut.h
@@ -532,7 +532,7 @@ Y_UNIT_TEST(TopicExistsStatement) {
 Y_UNIT_TEST(Do) {
     TCases cases = {
         {"do $a(1,2,3)",
-            "DO $a(1, 2, 3);\n"},
+            "DO\n\t$a(1, 2, 3)\n;\n"},
         {"do begin values(1); end do;",
             "DO BEGIN\n\tVALUES\n\t\t(1);\nEND DO;\n"},
     };
@@ -556,7 +556,7 @@ Y_UNIT_TEST(DefineActionOrSubquery) {
             "DEFINE ACTION $a() AS\n\tDEFINE ACTION $b() AS\n\t\t"
             "VALUES\n\t\t\t(1);\n\tEND DEFINE;\n\n\t"
             "DEFINE SUBQUERY $c() AS\n\t\tSELECT\n\t\t\t1;\n\t"
-            "END DEFINE;\n\tDO $b();\n\n\tPROCESS $c();\nEND DEFINE;\n"},
+            "END DEFINE;\n\tDO\n\t\t$b()\n\t;\n\n\tPROCESS $c();\nEND DEFINE;\n"},
     };
 
     TSetup setup;
@@ -566,14 +566,14 @@ Y_UNIT_TEST(DefineActionOrSubquery) {
 Y_UNIT_TEST(If) {
     TCases cases = {
         {"evaluate if 1=1 do $a()",
-            "EVALUATE IF 1 == 1\n\tDO $a();\n"},
+            "EVALUATE IF 1 == 1 DO\n\t$a()\n;\n"},
         {"evaluate if 1=1 do $a() else do $b()",
-            "EVALUATE IF 1 == 1\n\tDO $a()\nELSE\n\tDO $b();\n"},
+            "EVALUATE IF 1 == 1 DO\n\t$a()\nELSE DO\n\t$b()\n;\n"},
         {"evaluate if 1=1 do begin select 1; end do",
-            "EVALUATE IF 1 == 1\n\tDO BEGIN\n\t\tSELECT\n\t\t\t1;\n\tEND DO;\n"},
+            "EVALUATE IF 1 == 1 DO BEGIN\n\tSELECT\n\t\t1;\nEND DO;\n"},
         {"evaluate if 1=1 do begin select 1; end do else do begin select 2; end do",
-            "EVALUATE IF 1 == 1\n\tDO BEGIN\n\t\tSELECT\n\t\t\t1;\n\tEND DO\n"
-            "ELSE\n\tDO BEGIN\n\t\tSELECT\n\t\t\t2;\n\tEND DO;\n"},
+            "EVALUATE IF 1 == 1 DO BEGIN\n\tSELECT\n\t\t1;\nEND DO "
+            "ELSE DO BEGIN\n\tSELECT\n\t\t2;\nEND DO;\n"},
     };
 
     TSetup setup;
@@ -583,15 +583,15 @@ Y_UNIT_TEST(If) {
 Y_UNIT_TEST(For) {
     TCases cases = {
         {"evaluate for $x in [] do $a($x)",
-            "EVALUATE FOR $x IN []\n\tDO $a($x);\n"},
+            "EVALUATE FOR $x IN [] DO\n\t$a($x)\n;\n"},
         {"evaluate for $x in [] do $a($x) else do $b()",
-            "EVALUATE FOR $x IN []\n\tDO $a($x)\nELSE\n\tDO $b();\n"},
+            "EVALUATE FOR $x IN [] DO\n\t$a($x)\nELSE DO\n\t$b()\n;\n"},
         {"evaluate for $x in [] do begin select $x; end do",
-            "EVALUATE FOR $x IN []\n\tDO BEGIN\n\t\tSELECT\n\t\t\t$x;\n\tEND DO;\n"},
+            "EVALUATE FOR $x IN [] DO BEGIN\n\tSELECT\n\t\t$x;\nEND DO;\n"},
         {"evaluate for $x in [] do begin select $x; end do else do begin select 2; end do",
-            "EVALUATE FOR $x IN []\n\tDO BEGIN\n\t\tSELECT\n\t\t\t$x;\n\tEND DO\nELSE\n\tDO BEGIN\n\t\tSELECT\n\t\t\t2;\n\tEND DO;\n"},
+            "EVALUATE FOR $x IN [] DO BEGIN\n\tSELECT\n\t\t$x;\nEND DO ELSE DO BEGIN\n\tSELECT\n\t\t2;\nEND DO;\n"},
         {"evaluate parallel for $x in [] do $a($x)",
-            "EVALUATE PARALLEL FOR $x IN []\n\tDO $a($x);\n"},
+            "EVALUATE PARALLEL FOR $x IN [] DO\n\t$a($x)\n;\n"},
     };
 
     TSetup setup;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_for_/formatted.sql
index 3a0a31659ca..14b4f9a0286 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_for_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_for_/formatted.sql
@@ -12,5 +12,6 @@ DEFINE ACTION $a($x) AS
         key;
 END DEFINE;
 
-EVALUATE FOR $i IN AsList("PLATO"u)
-    DO $a($i);
+EVALUATE FOR $i IN AsList("PLATO"u) DO
+    $a($i)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
index d511182b23f..75afbcbe5a2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
@@ -21,4 +21,6 @@ DEFINE ACTION $bar() AS
     ORDER BY
         key;
 END DEFINE;
-DO $bar();
+DO
+    $bar()
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql
index f92e8bd49c8..9d56b726261 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql
@@ -15,4 +15,6 @@ DEFINE ACTION $action() AS
     ORDER BY
         key;
 END DEFINE;
-DO $action();
+DO
+    $action()
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql
index 1e41b9121d0..d2c1388d6af 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql
@@ -4,5 +4,9 @@ DEFINE ACTION $action($a, $b?) AS
     SELECT
         $a + ($b ?? 0);
 END DEFINE;
-DO $action(1);
-DO $action(2, 3);
+DO
+    $action(1)
+;
+DO
+    $action(2, 3)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql
index af885991d83..f90c2a9a67d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql
@@ -5,4 +5,6 @@ DEFINE ACTION $f($x) AS
         $x;
 END DEFINE;
 $x = CAST(Unicode::ToUpper("abc"u) AS String);
-DO $f($x);
+DO
+    $f($x)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql
index 84dcd3aef30..6ad7601aeed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql
@@ -14,6 +14,10 @@ DEFINE ACTION $action($b, $c) AS
 END DEFINE;
 
 DEFINE ACTION $closure_action($a) AS
-    DO $a(3, 4);
+    DO
+        $a(3, 4)
+    ;
 END DEFINE;
-DO $closure_action($action);
+DO
+    $closure_action($action)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql
index e2df18f8e99..9c285ffe2bd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql
@@ -12,4 +12,6 @@ DEFINE ACTION $action($b, $c) AS
     SELECT
         $d;
 END DEFINE;
-DO $action(1, 2);
+DO
+    $action(1, 2)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_action_quote_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_action_quote_/formatted.sql
index 5e92f404b60..469fba1ce27 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_action_quote_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_action_quote_/formatted.sql
@@ -17,8 +17,11 @@ DEFINE ACTION $aaa($z) AS
         FROM $table;
     END DEFINE;
     $ccc = EvaluateCode(QuoteCode($bbb));
-    DO $ccc("1");
+    DO
+        $ccc("1")
+    ;
 END DEFINE;
 
-EVALUATE FOR $z IN AsList(AsTuple("Input", "foo"), AsTuple("Input", "bar"))
-    DO $aaa($z);
+EVALUATE FOR $z IN AsList(AsTuple("Input", "foo"), AsTuple("Input", "bar")) DO
+    $aaa($z)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
index b06a38b8516..74455c7ea81 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
@@ -35,6 +35,9 @@ DEFINE ACTION $aaa($z) AS
     FROM $fullQuery();
 END DEFINE;
 
-EVALUATE FOR $z IN AsList("Input")
-    DO $aaa($z);
-DO $aaa("Input");
+EVALUATE FOR $z IN AsList("Input") DO
+    $aaa($z)
+;
+DO
+    $aaa("Input")
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql
index 1d3df162255..4ce66dcd7bf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql
@@ -1,9 +1,15 @@
 /* syntax version 1 */
 /* postgres can not */
-DO EMPTY_ACTION();
+DO
+    EMPTY_ACTION()
+;
 $action1 = EMPTY_ACTION;
-DO $action1();
+DO
+    $action1()
+;
 $action2 = ($a, $_b) -> {
     RETURN $a;
 };
-DO $action2(12);
+DO
+    $action2(12)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql
index b292df6cde0..b5f5e1497a7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql
@@ -10,27 +10,32 @@ $f = ($i) -> {
     RETURN CAST(Unicode::ToUpper(CAST($i AS Utf8)) AS String);
 };
 
-EVALUATE FOR $i IN ListMap(ListFromRange(0, 3), $f)
-    DO $action1($i);
+EVALUATE FOR $i IN ListMap(ListFromRange(0, 3), $f) DO
+    $action1($i)
+;
 
-EVALUATE FOR $i IN ListMap(ListFromRange(0, 0), $f)
-    DO $action1($i)
-ELSE
-    DO $action1(100);
+EVALUATE FOR $i IN ListMap(ListFromRange(0, 0), $f) DO
+    $action1($i)
+ELSE DO
+    $action1(100)
+;
 
-EVALUATE FOR $i IN ListMap(ListFromRange(0, 0), $f)
-    DO $action1($i);
+EVALUATE FOR $i IN ListMap(ListFromRange(0, 0), $f) DO
+    $action1($i)
+;
 
 EVALUATE FOR $i IN Yql::Map(
     1 / 1, ($x) -> {
         RETURN AsList($x)
     }
-)
-    DO $action1($i);
+) DO
+    $action1($i)
+;
 
 EVALUATE FOR $i IN Yql::Map(
     1 / 0, ($x) -> {
         RETURN AsList($x)
     }
-)
-    DO $action1($i);
+) DO
+    $action1($i)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_over_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_over_subquery_/formatted.sql
index 016dea3d95c..329e48fc5e5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_over_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_over_subquery_/formatted.sql
@@ -13,5 +13,6 @@ DEFINE ACTION $echo($x) AS
         $x;
 END DEFINE;
 
-EVALUATE FOR $a IN $list
-    DO $echo($a);
+EVALUATE FOR $a IN $list DO
+    $echo($a)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_/formatted.sql
index f0ac90828aa..44815abc12f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_/formatted.sql
@@ -7,13 +7,16 @@ DEFINE ACTION $action1($x) AS
         $x;
 END DEFINE;
 
-EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) == "I"
-    DO $action1(1)
-ELSE
-    DO $action1(2);
+EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) == "I" DO
+    $action1(1)
+ELSE DO
+    $action1(2)
+;
 
-EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) != "I"
-    DO $action1(3);
+EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) != "I" DO
+    $action1(3)
+;
 
-EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) == "I"
-    DO $action1(4);
+EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) == "I" DO
+    $action1(4)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
index 6417c38e065..251fbb0aed6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
@@ -9,5 +9,6 @@ DEFINE ACTION $process() AS
     FROM each($list);
 END DEFINE;
 
-EVALUATE IF ListLength($list) > 0
-    DO $process();
+EVALUATE IF ListLength($list) > 0 DO
+    $process()
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
index ab3e20f5201..b9b7176a8f7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
@@ -3,4 +3,6 @@
 /* kikimr can not - range not supported */
 PRAGMA library("lib1.sql");
 IMPORT lib1 SYMBOLS $action;
-DO $action("Input");
+DO
+    $action("Input")
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-inline_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-inline_action_/formatted.sql
index 9558e50ea6b..30822ac71f3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-inline_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-inline_action_/formatted.sql
@@ -5,19 +5,15 @@ DO BEGIN
         1;
 END DO;
 
-EVALUATE IF TRUE
-    DO BEGIN
-        SELECT
-            1;
-    END DO
-ELSE
-    DO BEGIN
-        SELECT
-            2;
-    END DO;
+EVALUATE IF TRUE DO BEGIN
+    SELECT
+        1;
+END DO ELSE DO BEGIN
+    SELECT
+        2;
+END DO;
 
-EVALUATE FOR $i IN AsList(1, 2, 3)
-    DO BEGIN
-        SELECT
-            $i;
-    END DO;
+EVALUATE FOR $i IN AsList(1, 2, 3) DO BEGIN
+    SELECT
+        $i;
+END DO;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-large_evaluate_for_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-large_evaluate_for_fail_/formatted.sql
index 0750a8c4215..ed41ea1ea9f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-large_evaluate_for_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-large_evaluate_for_fail_/formatted.sql
@@ -3,5 +3,6 @@
 /* custom error: Too large list for EVALUATE FOR, allowed: 3, got: 10 */
 PRAGMA config.flags("EvaluateForLimit", "3");
 
-EVALUATE FOR $_i IN ListFromRange(0, 10)
-    DO EMPTY_ACTION();
+EVALUATE FOR $_i IN ListFromRange(0, 10) DO
+    EMPTY_ACTION()
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
index 64a1d9b724a..7afaac3a574 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
@@ -49,9 +49,10 @@ DEFINE ACTION $func($input, $output) AS
 END DEFINE;
 $exps = [('Input', 'Output1'), ('Input', 'Output2'), ('Input', 'Output3')];
 
-EVALUATE FOR $exp_name IN $exps
-    DO BEGIN
-        $input = $exp_name.0;
-        $output = $exp_name.1;
-        DO $func($input, $output);
-    END DO;
+EVALUATE FOR $exp_name IN $exps DO BEGIN
+    $input = $exp_name.0;
+    $output = $exp_name.1;
+    DO
+        $func($input, $output)
+    ;
+END DO;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql
index 8f31e1b266a..c84430a82b5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql
@@ -10,7 +10,13 @@ DEFINE ACTION $action($b, $c) AS
         SELECT
             $c;
     END DEFINE;
-    DO $aaa();
-    DO $bbb();
+    DO
+        $aaa()
+    ;
+    DO
+        $bbb()
+    ;
 END DEFINE;
-DO $action(1, 2);
+DO
+    $action(1, 2)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql
index f4666e89f5f..12c0c88a817 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql
@@ -1,12 +1,11 @@
 /* yt can not */
 USE plato;
 
-EVALUATE PARALLEL FOR $i IN [1, 2, 1, 2, 1]
-    DO BEGIN
-        INSERT INTO Output
-        SELECT
-            $i AS a;
-    END DO;
+EVALUATE PARALLEL FOR $i IN [1, 2, 1, 2, 1] DO BEGIN
+    INSERT INTO Output
+    SELECT
+        $i AS a;
+END DO;
 COMMIT;
 
 INSERT INTO Output WITH truncate
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
index e62b4dc237d..5a3f6550347 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
@@ -1,13 +1,21 @@
 /* syntax version 1 */
 /* postgres can not */
 DEFINE ACTION $dup($x) AS
-    DO $x();
-    DO $x();
+    DO
+        $x()
+    ;
+    DO
+        $x()
+    ;
 END DEFINE;
-DO $dup(EMPTY_ACTION);
+DO
+    $dup(EMPTY_ACTION)
+;
 
 DEFINE ACTION $sel_foo() AS
     SELECT
         "foo";
 END DEFINE;
-DO $dup($sel_foo);
+DO
+    $dup($sel_foo)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_for_select_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_for_select_/formatted.sql
index 0204a1dd965..acc50d516e3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_for_select_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_for_select_/formatted.sql
@@ -1,68 +1,51 @@
 /* syntax version 1 */
 /* postgres can not */
-FOR $i IN Just(AsList(1, 2, 3))
-    DO BEGIN
-        SELECT
-            $i;
-    END DO
-ELSE
-    DO BEGIN
-        SELECT
-            10;
-    END DO;
+FOR $i IN Just(AsList(1, 2, 3)) DO BEGIN
+    SELECT
+        $i;
+END DO ELSE DO BEGIN
+    SELECT
+        10;
+END DO;
 
-FOR $i IN Just(ListCreate(Int32))
-    DO BEGIN
-        SELECT
-            $i;
-    END DO
-ELSE
-    DO BEGIN
-        SELECT
-            11;
-    END DO;
+FOR $i IN Just(ListCreate(Int32)) DO BEGIN
+    SELECT
+        $i;
+END DO ELSE DO BEGIN
+    SELECT
+        11;
+END DO;
 
-FOR $i IN NULL
-    DO BEGIN
-        SELECT
-            $i;
-    END DO
-ELSE
-    DO BEGIN
-        SELECT
-            12;
-    END DO;
+FOR $i IN NULL DO BEGIN
+    SELECT
+        $i;
+END DO ELSE DO BEGIN
+    SELECT
+        12;
+END DO;
 
-FOR $i IN AsList(4)
-    DO BEGIN
-        SELECT
-            $i;
-    END DO
-ELSE
-    DO BEGIN
-        SELECT
-            13;
-    END DO;
+FOR $i IN AsList(4) DO BEGIN
+    SELECT
+        $i;
+END DO ELSE DO BEGIN
+    SELECT
+        13;
+END DO;
 
-FOR $i IN ListCreate(String)
-    DO BEGIN
-        SELECT
-            $i;
-    END DO
-ELSE
-    DO BEGIN
-        SELECT
-            14;
-    END DO;
+FOR $i IN ListCreate(String) DO BEGIN
+    SELECT
+        $i;
+END DO ELSE DO BEGIN
+    SELECT
+        14;
+END DO;
 
-FOR $i IN AsList(5)
-    DO BEGIN
-        SELECT
-            $i;
-    END DO;
+FOR $i IN AsList(5) DO BEGIN
+    SELECT
+        $i;
+END DO;
 
-FOR $i IN ListCreate(Bool)
-    DO BEGIN
-        SELECT
-            $i;
-    END DO;
+FOR $i IN ListCreate(Bool) DO BEGIN
+    SELECT
+        $i;
+END DO;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql
index b331c3f6a53..4f7928fcb3d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql
@@ -15,36 +15,28 @@ $n = (
 );
 $predicate = $n > 1;
 
-IF $predicate
-    DO BEGIN
-        SELECT
-            1;
-    END DO;
+IF $predicate DO BEGIN
+    SELECT
+        1;
+END DO;
 
-IF NOT $predicate
-    DO BEGIN
-        SELECT
-            2;
-    END DO;
+IF NOT $predicate DO BEGIN
+    SELECT
+        2;
+END DO;
 
-IF $predicate
-    DO BEGIN
-        SELECT
-            3;
-    END DO
-ELSE
-    DO BEGIN
-        SELECT
-            4;
-    END DO;
+IF $predicate DO BEGIN
+    SELECT
+        3;
+END DO ELSE DO BEGIN
+    SELECT
+        4;
+END DO;
 
-IF NOT $predicate
-    DO BEGIN
-        SELECT
-            5;
-    END DO
-ELSE
-    DO BEGIN
-        SELECT
-            6;
-    END DO;
+IF NOT $predicate DO BEGIN
+    SELECT
+        5;
+END DO ELSE DO BEGIN
+    SELECT
+        6;
+END DO;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
index 6cc75800fcc..798b320177b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
@@ -39,7 +39,15 @@ DEFINE ACTION $hello_world($sub, $name, $suffix?) AS
         "Hello, " || $name || "!"
     FROM $sub();
 END DEFINE;
-DO EMPTY_ACTION();
-DO $hello_world($sub1, NULL);
-DO $hello_world($sub1, NULL, "John");
-DO $hello_world($sub1, NULL, "Earth");
+DO
+    EMPTY_ACTION()
+;
+DO
+    $hello_world($sub1, NULL)
+;
+DO
+    $hello_world($sub1, NULL, "John")
+;
+DO
+    $hello_world($sub1, NULL, "Earth")
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
index 82bce446ea4..8b23fde6b1f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
@@ -3,10 +3,9 @@
 USE plato;
 PRAGMA OrderedColumns;
 
-EVALUATE FOR $i IN ["1", "2", "3"]
-    DO BEGIN
-        SELECT
-            *
-        FROM Input
-        WHERE subkey == $i;
-    END DO;
+EVALUATE FOR $i IN ["1", "2", "3"] DO BEGIN
+    SELECT
+        *
+    FROM Input
+    WHERE subkey == $i;
+END DO;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
index ff77f73ad1b..493ae44f7d1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
@@ -29,5 +29,6 @@ DEFINE ACTION $make_bucket($bucket_number) AS
     );
 END DEFINE;
 
-EVALUATE FOR $bucket_number IN $buckets
-    DO $make_bucket(CAST($bucket_number AS String));
+EVALUATE FOR $bucket_number IN $buckets DO
+    $make_bucket(CAST($bucket_number AS String))
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
index e163c5c355e..306b3abc673 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
@@ -16,7 +16,9 @@ DEFINE ACTION $div_8_by_value($value) AS
     SELECT
         8 / $value;
 END DEFINE;
-DO $div_8_by_value(9);
+DO
+    $div_8_by_value(9)
+;
 
 SELECT
     10 / 11;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
index 32b93e89148..c750e2cb10d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
@@ -94,5 +94,6 @@ DEFINE ACTION $action($param) AS
     PROCESS $g;
 END DEFINE;
 
-EVALUATE FOR $param IN ListFromRange(1, 3)
-    DO $action($param);
+EVALUATE FOR $param IN ListFromRange(1, 3) DO
+    $action($param)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
index ad9bb3f3549..0cbed4c02ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
@@ -94,5 +94,6 @@ DEFINE ACTION $action($param) AS
     PROCESS $g;
 END DEFINE;
 
-EVALUATE FOR $param IN ListFromRange(1, 3)
-    DO $action($param);
+EVALUATE FOR $param IN ListFromRange(1, 3) DO
+    $action($param)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
index f9f66118c6e..7c4e98a1e33 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
@@ -94,5 +94,6 @@ DEFINE ACTION $action($param) AS
     PROCESS $g;
 END DEFINE;
 
-EVALUATE FOR $param IN ListFromRange(1, 2)
-    DO $action($param);
+EVALUATE FOR $param IN ListFromRange(1, 2) DO
+    $action($param)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
index f4b879dde47..17d33a6a28b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
@@ -95,5 +95,6 @@ DEFINE ACTION $action($param) AS
     PROCESS $g;
 END DEFINE;
 
-EVALUATE FOR $param IN ListFromRange(1, 2)
-    DO $action($param);
+EVALUATE FOR $param IN ListFromRange(1, 2) DO
+    $action($param)
+;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-system_sampling_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-system_sampling_/formatted.sql
index e3976f08f76..25e777dcb85 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-system_sampling_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-system_sampling_/formatted.sql
@@ -3,14 +3,13 @@
 /* syntax version 1 */
 USE plato;
 
-EVALUATE FOR $_i IN ListFromRange(0, 10)
-    DO BEGIN
-        INSERT INTO Output
-        SELECT
-            *
-        FROM Input;
-        COMMIT;
-    END DO;
+EVALUATE FOR $_i IN ListFromRange(0, 10) DO BEGIN
+    INSERT INTO Output
+    SELECT
+        *
+    FROM Input;
+    COMMIT;
+END DO;
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql
index 09993cef873..91541280cf1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql
@@ -20,4 +20,6 @@ DEFINE ACTION $a() AS
         *
     FROM $r;
 END DEFINE;
-DO $a();
+DO
+    $a()
+;