Remove defaultable from error message

ballerina-platform · Oct 2, 2024 · d036b9f · d036b9f
1 parent fe0509b
commit d036b9f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/compiler/ballerina-lang/src/main/resources/compiler.properties b/compiler/ballerina-lang/src/main/resources/compiler.properties
@@ -925,7 +925,7 @@ error.compiler.plugin.no.annotations.found.in.package=\
   no annotations found in module ''{0}'' specified in compiler plugin ''{1}''
 
 error.undefined.parameter=\
-  undefined defaultable parameter ''{0}''
+  undefined parameter ''{0}''
 
 error.invalid.error.reason.type=\
   invalid error reason type ''{0}'', expected a subtype of ''string''

diff --git a/...src/main/java/org/ballerinalang/debugadapter/evaluation/engine/NodeBasedArgProcessor.java b/...src/main/java/org/ballerinalang/debugadapter/evaluation/engine/NodeBasedArgProcessor.java
@@ -134,7 +134,7 @@ public List<Value> process(List<Map.Entry<String, Evaluator>> argEvaluators)
 
                 String argName = arg.getKey();
                 if (!remainingParams.containsKey(argName)) {
-                    throw createEvaluationException("undefined defaultable parameter '" + argName + "'.");
+                    throw createEvaluationException("undefined parameter '" + argName + "'.");
                 }
                 namedArgsFound = true;
                 Value argValue = arg.getValue().evaluate().getJdiValue();

diff --git a/...c/main/java/org/ballerinalang/debugadapter/evaluation/engine/SymbolBasedArgProcessor.java b/...c/main/java/org/ballerinalang/debugadapter/evaluation/engine/SymbolBasedArgProcessor.java
@@ -143,7 +143,7 @@ public List<Value> process(List<Map.Entry<String, Evaluator>> argEvaluators)
 
                 String argName = arg.getKey();
                 if (!remainingParams.containsKey(argName)) {
-                    throw createEvaluationException("undefined defaultable parameter '" + argName + "'.");
+                    throw createEvaluationException("undefined parameter '" + argName + "'.");
                 }
                 namedArgsFound = true;
                 Value argValue = arg.getValue().evaluate().getJdiValue();

diff --git a/.../org/ballerinalang/debugger/test/adapter/evaluation/ExpressionEvaluationNegativeTest.java b/.../org/ballerinalang/debugger/test/adapter/evaluation/ExpressionEvaluationNegativeTest.java
@@ -187,7 +187,7 @@ public void functionCallEvaluationTest() throws BallerinaTestException {
                 "too many arguments in call to 'calculate'.");
 
         debugTestRunner.assertEvaluationError(context, "calculate(5, 6, 7, d = 8)", EvaluationExceptionKind.PREFIX +
-                "undefined defaultable parameter 'd'.");
+                "undefined parameter 'd'.");
 
         debugTestRunner.assertEvaluationError(context, "calculate(5, ...b, 7)", String.format(EvaluationExceptionKind
                 .SYNTAX_ERROR.getString(), "arguments not allowed after rest argument"));

diff --git a/...t/src/test/java/org/ballerinalang/test/action/ClientResourceAccessActionNegativeTest.java b/...t/src/test/java/org/ballerinalang/test/action/ClientResourceAccessActionNegativeTest.java
@@ -82,7 +82,7 @@ public void testClientResourceCallNegative() {
                 "missing required parameter 'name' in call to 'get()'",
                 78, 13);
         validateError(clientResourceAccessNegative, index++,
-                "undefined defaultable parameter 'b'",
+                "undefined parameter 'b'",
                 78, 38);
         validateError(clientResourceAccessNegative, index++,
                 "too many arguments in call to 'get()'", 79, 52);

diff --git a/.../src/test/java/org/ballerinalang/test/expressions/invocations/FuncInvocationExprTest.java b/.../src/test/java/org/ballerinalang/test/expressions/invocations/FuncInvocationExprTest.java
@@ -215,7 +215,7 @@ public void testFunctionCallNegativeCases() {
         validateError(funcInvocationNegative, i++,
                 "missing required parameter 's' in call to 'fromString()'", 106, 16);
         validateError(funcInvocationNegative, i++,
-                "undefined defaultable parameter 'ss'", 106, 31);
+                "undefined parameter 'ss'", 106, 31);
         validateError(funcInvocationNegative, i++, "variable assignment is required", 110, 5);
         validateError(funcInvocationNegative, i++, "variable assignment is required", 111, 5);
         validateError(funcInvocationNegative, i++, "variable assignment is required", 112, 5);

diff --git a/...it-test/src/test/java/org/ballerinalang/test/functions/FunctionSignatureNegativeTest.java b/...it-test/src/test/java/org/ballerinalang/test/functions/FunctionSignatureNegativeTest.java
@@ -38,7 +38,7 @@ public void testFuncSignatureSemanticsNegative() {
 
         BAssertUtil.validateError(result, i++, "redeclared symbol 'c'", 1, 73);
         BAssertUtil.validateError(result, i++, "redeclared argument 'a'", 17, 19);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'c'", 21, 19);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'c'", 21, 19);
         BAssertUtil.validateError(result, i++, "incompatible types: expected 'int', found 'float'", 29, 20);
         BAssertUtil.validateError(result, i++, "incompatible types: expected 'json', found 'xml:Text'", 40, 56);
         BAssertUtil.validateError(result, i++, "missing required parameter 'a' in call to " +

diff --git a/...-test/src/test/java/org/ballerinalang/test/functions/FunctionWithIncludedRecordParam.java b/...-test/src/test/java/org/ballerinalang/test/functions/FunctionWithIncludedRecordParam.java
@@ -56,15 +56,15 @@ public void testFuncSignatureSemanticsNegative() {
         BAssertUtil.validateError(result, i++, "too many arguments in call to " +
                                             "'functionWithIncludedRecordParam3()'", 59, 95);
         BAssertUtil.validateError(result, i++, "undeclared field 'firstName' in record 'Address'", 67, 12);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'a'", 80, 47);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'abc'", 81, 51);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'a'", 80, 47);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'abc'", 81, 51);
         BAssertUtil.validateError(result, i++, "undefined field 'abc' in 'Bar2'", 90, 12);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'abc'", 104, 75);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'abc'", 122, 71);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'abc'", 104, 75);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'abc'", 122, 71);
         BAssertUtil.validateError(result, i++, "missing required parameter 'c' in call to " +
                                 "'functionWithIncludedRecordParam8()'", 136, 18);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'abc'", 136, 71);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'abc'", 144, 63);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'abc'", 136, 71);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'abc'", 144, 63);
         BAssertUtil.validateError(result, i++, "redeclared symbol 'id'", 161, 53);
         BAssertUtil.validateError(result, i++, "redeclared symbol 'name'", 161, 72);
         BAssertUtil.validateError(result, i++, "cannot specify a named argument for a field of an included record " +
@@ -125,9 +125,9 @@ public void testFuncSignatureSemanticsNegative() {
                 "not found in type 'int'", 280, 21);
         BAssertUtil.validateError(result, i++, "too many arguments in call to 'fn5()'", 296, 23);
         BAssertUtil.validateError(result, i++, "too many arguments in call to 'fn5()'", 297, 16);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'j'", 298, 23);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'j'", 298, 23);
         BAssertUtil.validateError(result, i++, "too many arguments in call to 'fn6()'", 299, 37);
-        BAssertUtil.validateError(result, i++, "undefined defaultable parameter 'j'", 300, 9);
+        BAssertUtil.validateError(result, i++, "undefined parameter 'j'", 300, 9);
         BAssertUtil.validateError(result, i++, "too many arguments in call to 'fn6()'", 300, 30);
         BAssertUtil.validateError(result, i++, "too many arguments in call to 'fn9()'", 301, 37);
         BAssertUtil.validateError(result, i++, "redeclared symbol 'r'", 308, 15);

diff --git a/...-test/src/test/java/org/ballerinalang/test/javainterop/DependentlyTypedFunctionsTest.java b/...-test/src/test/java/org/ballerinalang/test/javainterop/DependentlyTypedFunctionsTest.java
@@ -158,7 +158,7 @@ public void testNegatives() {
         validateError(errors, indx++, "incompatible types: expected 'string', found 'int'", 340, 17);
         validateError(errors, indx++, "incompatible types: expected 'string', found 'int'", 341, 17);
         validateError(errors, indx++, "incompatible types: expected 'int', found 'string'", 342, 14);
-        validateError(errors, indx++, "undefined defaultable parameter 'targetTypes'", 343, 74);
+        validateError(errors, indx++, "undefined parameter 'targetTypes'", 343, 74);
         validateError(errors, indx++, "incompatible types: expected 'int', found '(string|error)'", 345, 14);
         validateError(errors, indx++, "incompatible types: expected 'string', found '(int|error)'", 346, 17);
         validateError(errors, indx++, "incompatible types: expected 'string', found '(int|error)'", 347, 17);