Merge pull request #42503 from MaryamZi/disallow-error-bp-in-on-fail

Disallow error binding patterns in on fail clauses temporarily (for U9)
ballerina-platform · Apr 8, 2024 · d89ece4 · d89ece4
2 parents 73d7f77 + 6ceaa3b
commit d89ece4
Show file tree

Hide file tree

Showing 19 changed files with 2,778 additions and 2,708 deletions.
diff --git a/...r/ballerina-lang/src/main/java/org/ballerinalang/util/diagnostic/DiagnosticErrorCode.java b/...r/ballerina-lang/src/main/java/org/ballerinalang/util/diagnostic/DiagnosticErrorCode.java
@@ -818,6 +818,7 @@ public enum DiagnosticErrorCode implements DiagnosticCode {
     EXPRESSION_OF_FUTURE_TYPE_EXPECTED("BCE4057", "future.expression.expected"),
     INSTANTIATION_ERROR("BCE4058", "instantiation.error"),
     INVALID_BINDING_PATTERN_IN_ON_FAIL("BCE4059", "invalid.binding.pattern.in.on.fail"),
+    ERROR_BINDING_PATTERN_NOT_YET_SUPPORTED_IN_ON_FAIL("BCE4060", "error.binding.pattern.not.yet.supported.in.on.fail")
     ;
 
     private String diagnosticId;

diff --git a/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SemanticAnalyzer.java b/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SemanticAnalyzer.java
@@ -3907,6 +3907,7 @@ public void visit(BLangOnFailClause onFailClause, AnalyzerData data) {
                                                               Names.fromString(anonModelHelper.getNextErrorVarKey(
                                                                       onFailEnv.enclPkg.packageID)),
                                                               onFailEnv, true);
+                dlog.error(errorVar.pos, DiagnosticErrorCode.ERROR_BINDING_PATTERN_NOT_YET_SUPPORTED_IN_ON_FAIL);
             }
         }
 

diff --git a/compiler/ballerina-lang/src/main/resources/compiler.properties b/compiler/ballerina-lang/src/main/resources/compiler.properties
@@ -2031,3 +2031,6 @@ error.inferred.query.construct.type.as.stream=\
 
 error.invalid.binding.pattern.in.on.fail=\
   invalid binding pattern in ''on fail'' clause: only a capture binding pattern or an error binding pattern is allowed
+
+error.error.binding.pattern.not.yet.supported.in.on.fail=\
+  error binding patterns are not yet supported in ''on fail'' clauses
diff --git a/...src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachNegativeTests.java b/...src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachNegativeTests.java
@@ -104,6 +104,8 @@ public void testForeachSemanticsNegative() {
                 "mismatch with member type count", 342, 13);
         BAssertUtil.validateError(compile, index++, "invalid list binding pattern; member variable count " +
                 "mismatch with member type count", 346, 18);
+        BAssertUtil.validateError(compile, index++, "error binding patterns are not yet supported in " +
+                "'on fail' clauses", 374, 15);
         BAssertUtil.validateError(compile, index++, "invalid error variable; expecting an error type " +
                 "but found '(SampleComplexError|SampleError)' in type definition", 374, 15);
         Assert.assertEquals(compile.getErrorCount(), index);

diff --git a/...t/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachOnFailTests.java b/...t/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachOnFailTests.java
@@ -87,7 +87,7 @@ public void testNestedWhileStmtWithFail() {
         Assert.assertEquals(result.toString(), expected);
     }
 
-    @Test(dataProvider = "onFailClauseWithErrorBPTestDataProvider")
+    @Test(dataProvider = "onFailClauseWithErrorBPTestDataProvider", enabled = false)
     public void testOnFailWithErrorBP(String funcName) {
         BRunUtil.invoke(program, funcName);
     }