Merge pull request #271 from Trivadis/bugfix/issue-264-whenever-oserror

Bugfix/issue 264 whenever oserror

Author: PhilippSalvisberg

settings/sql_developer/trivadis_custom_format.arbori

@@ -2075,12 +2075,18 @@ r3_case_expressions:
     & parent < node
 ;
 
+r3_no_commands:
+    [node) sqlplus_command & [oserror) 'OSERROR' & [oserror+1 = [node
+;
+
 r3_commands:
-      r3_sqlplus_commands
-    | r3_sql_commands
-    | r3_plsql_commands
-    | r3_plsql_keywords
-    | r3_case_expressions
+    (
+          r3_sqlplus_commands
+        | r3_sql_commands
+        | r3_plsql_commands
+        | r3_plsql_keywords
+        | r3_case_expressions
+    ) - r3_no_commands
 -> {
     var node = tuple.get("node");
     // do not add a line break on the first line.

standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_264_exit_in_whenever_oserror.java

@@ -0,0 +1,20 @@
+package com.trivadis.plsql.formatter.settings.tests.issues;
+
+import com.trivadis.plsql.formatter.settings.ConfiguredTestFormatter;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.IOException;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class Issue_264_exit_in_whenever_oserror extends ConfiguredTestFormatter {
+    @Test
+    public void exit_in_whenever_os_error() throws IOException {
+        var input = """
+                whenever sqlerror exit failure
+                whenever oserror exit failure
+                select * from dual;
+                """;
+        formatAndAssert(input);
+    }
+}