From 4747a611e29e6dd6295734417c60da7abefd3b26 Mon Sep 17 00:00:00 2001
From: Philipp Salvisberg <philipp.salvisberg@trivadis.com>
Date: Wed, 9 Jun 2021 04:26:08 +0200
Subject: [PATCH 1/2] optimize splitArg query as suggested by @Vadimtro in #109

---
 .../sql_developer/trivadis_custom_format.arbori  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/settings/sql_developer/trivadis_custom_format.arbori b/settings/sql_developer/trivadis_custom_format.arbori
index b882a15d..c64f34f2 100644
--- a/settings/sql_developer/trivadis_custom_format.arbori
+++ b/settings/sql_developer/trivadis_custom_format.arbori
@@ -275,11 +275,6 @@ addLongDotted:
     addToLongSet('parent');
   }
 
-allArgList:
-  [parent) paren_expr_list
-;
-
-
 splittableArgList1:
   [parent) paren_expr_list 
     & [arg1) arg_list 
@@ -345,14 +340,15 @@ indentArgListParent:
 
 splitArg:
   .breaksProcArgs
-    & [node) arg 
-    & allArgList.parent < node
+    & [node) arg
+    & allArgListParent < node
+    & [allArgListParent) paren_expr_list
     & splittableArgList.parent < node
   -> {
     // filter via JavaScript
-    var all = tuple.get("allArgList.parent");
-    var splittable = tuple.get("splittableArgList.parent");
-    logger.fine(struct.getClass(), "splitArg (found): " + tuple.get('node'));
+    var all = tuple.get("allArgListParent");
+    var splittable = tuple.get("parent");
+    logger.fine(struct.getClass(), "splitArg (found) node: " + tuple.get('node'));
     if (all == splittable) {
       logger.fine(struct.getClass(), "splitArg (splitted): " + tuple.get('node'));
       splittedNodeSet.add(tuple.get('node').interval());

From 0832a7966c5e67dbe71c7ce7ee05dd6edeb268d0 Mon Sep 17 00:00:00 2001
From: Philipp Salvisberg <philipp.salvisberg@trivadis.com>
Date: Wed, 9 Jun 2021 04:27:43 +0200
Subject: [PATCH 2/2] optimize splitExpr query as suggested by @Vadimtro in
 #109

---
 settings/sql_developer/trivadis_custom_format.arbori | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/settings/sql_developer/trivadis_custom_format.arbori b/settings/sql_developer/trivadis_custom_format.arbori
index c64f34f2..7c72a918 100644
--- a/settings/sql_developer/trivadis_custom_format.arbori
+++ b/settings/sql_developer/trivadis_custom_format.arbori
@@ -297,11 +297,6 @@ splittableArgList:
   | splittableArgList2 
 ;
  
-
-allExprList:
-  [parent) "(x,y,z)"
-;
-
 splittableExprList1:
   [parent) "(x,y,z)" 
     & [arg1) "expr_list" 
@@ -360,12 +355,13 @@ splitExpr:
     & [node) expr 
     & ![node^) assoc_arg 
     & ![node^) compound_expression
-    & allExprList.parent < node
+    & allExprListParent < node
+    & [allExprListParent) "(x,y,z)"
     & splittableExprList.parent < node
   -> {
     // filter via JavaScript
-    var all = tuple.get("allExprList.parent");
-    var splittable = tuple.get("splittableExprList.parent");
+    var all = tuple.get("allExprListParent");
+    var splittable = tuple.get("parent");
     logger.fine(struct.getClass(), "splitExpr (found): " + tuple.get('node'));
     if (all == splittable) {
       logger.fine(struct.getClass(), "splitExpr (splitted): " + tuple.get('node'));