fix copilot issues

Author: SteveL-MSFT

dsc/src/subcommand.rs

@@ -697,7 +697,7 @@ fn list_functions(functions: &FunctionDispatcher, function_name: Option<&String>
         write_table = true;
     }
     let mut include_separator = false;
-    let accepted_arg_types= [
+    let returned_types= [
         (FunctionArgKind::Array, "a"),
         (FunctionArgKind::Boolean, "b"),
         (FunctionArgKind::Number, "n"),
@@ -724,8 +724,8 @@ fn list_functions(functions: &FunctionDispatcher, function_name: Option<&String>
 
         if write_table {
             // construct arg_types from '-' times number of accepted_arg_types
-            let mut arg_types = "-".repeat(accepted_arg_types.len());
-            for (i, (arg_type, letter)) in accepted_arg_types.iter().enumerate() {
+            let mut arg_types = "-".repeat(returned_types.len());
+            for (i, (arg_type, letter)) in returned_types.iter().enumerate() {
                 if function.return_types.contains(arg_type) {
                     arg_types.replace_range(i..=i, letter);
                 }

dsc_lib/locales/en-us.toml

@@ -205,10 +205,9 @@ argCountRequired = "Function '%{name}' requires between %{min_args} and %{max_ar
 noArrayArgs = "Function '%{name}' does not accept array arguments, accepted types are: %{accepted_args_string}"
 noBooleanArgs = "Function '%{name}' does not accept boolean arguments, accepted types are: %{accepted_args_string}"
 noNumberArgs = "Function '%{name}' does not accept number arguments, accepted types are: %{accepted_args_string}"
+noNullArgs = "Function '%{name}' does not accept null arguments, accepted types are: %{accepted_args_string}"
 noObjectArgs = "Function '%{name}' does not accept object arguments, accepted types are: %{accepted_args_string}"
 noStringArgs = "Function '%{name}' does not accept string arguments, accepted types are: %{accepted_args_string}"
-tooFewArgs = "Function '%{name}' requires at least %{count} arguments"
-tooManyArgs = "Function '%{name}' does not accept more than %{count} arguments"
 
 [functions.add]
 description = "Adds two or more numbers together"

dsc_lib/src/functions/if.rs

@@ -22,7 +22,7 @@ impl Function for If {
             accepted_arg_ordered_types: vec![
                 vec![FunctionArgKind::Boolean],
                 vec![FunctionArgKind::String, FunctionArgKind::Number, FunctionArgKind::Array, FunctionArgKind::Object],
-                vec![FunctionArgKind::String, FunctionArgKind::Number, FunctionArgKind::Array, FunctionArgKind::Object]
+                vec![FunctionArgKind::String, FunctionArgKind::Number, FunctionArgKind::Array, FunctionArgKind::Object],
                 ],
             remaining_arg_accepted_types: None,
             return_types: vec![FunctionArgKind::String, FunctionArgKind::Number, FunctionArgKind::Array, FunctionArgKind::Object],

dsc_lib/src/functions/mod.rs

@@ -189,14 +189,6 @@ impl FunctionDispatcher {
             return Err(DscError::Parser(t!("functions.argCountRequired", name = name, min = min_args, max = max_args).to_string()));
         }
 
-        // iterate over the args and check if they match the order of accepted_arg_types, any remaining args must match the remaining_arg_types
-        if args.len() < metadata.accepted_arg_ordered_types.len() {
-            return Err(DscError::Parser(t!("functions.tooFewArgs", name = name, count = metadata.accepted_arg_ordered_types.len()).to_string()));
-        }
-        if args.len() > metadata.accepted_arg_ordered_types.len() && metadata.remaining_arg_accepted_types.is_none() {
-            return Err(DscError::Parser(t!("functions.tooManyArgs", name = name, count = metadata.accepted_arg_ordered_types.len()).to_string()));
-        }
-
         for (index, value) in args.iter().enumerate() {
             if index >= metadata.accepted_arg_ordered_types.len() {
                 break;
@@ -206,6 +198,8 @@ impl FunctionDispatcher {
                 return Err(DscError::Parser(t!("functions.noArrayArgs", name = name, accepted_args_string = metadata.accepted_arg_ordered_types[index].iter().map(std::string::ToString::to_string).collect::<Vec<_>>().join(", ")).to_string()));
             } else if value.is_boolean() && !metadata.accepted_arg_ordered_types[index].contains(&FunctionArgKind::Boolean) {
                 return Err(DscError::Parser(t!("functions.noBooleanArgs", name = name, accepted_args_string = metadata.accepted_arg_ordered_types[index].iter().map(std::string::ToString::to_string).collect::<Vec<_>>().join(", ")).to_string()));
+            } else if value.is_null() && !metadata.accepted_arg_ordered_types[index].contains(&FunctionArgKind::Null) {
+                return Err(DscError::Parser(t!("functions.noNullArgs", name = name, accepted_args_string = metadata.accepted_arg_ordered_types[index].iter().map(std::string::ToString::to_string).collect::<Vec<_>>().join(", ")).to_string()));
             } else if value.is_number() && !metadata.accepted_arg_ordered_types[index].contains(&FunctionArgKind::Number) {
                 return Err(DscError::Parser(t!("functions.noNumberArgs", name = name, accepted_args_string = metadata.accepted_arg_ordered_types[index].iter().map(std::string::ToString::to_string).collect::<Vec<_>>().join(", ")).to_string()));
             } else if value.is_object() && !metadata.accepted_arg_ordered_types[index].contains(&FunctionArgKind::Object) {
@@ -222,6 +216,8 @@ impl FunctionDispatcher {
                     return Err(DscError::Parser(t!("functions.noArrayArgs", name = name, accepted_args_string = remaining_arg_types.iter().map(std::string::ToString::to_string).collect::<Vec<_>>().join(", ")).to_string()));
                 } else if value.is_boolean() && !remaining_arg_types.contains(&FunctionArgKind::Boolean) {
                     return Err(DscError::Parser(t!("functions.noBooleanArgs", name = name, accepted_args_string = remaining_arg_types.iter().map(std::string::ToString::to_string).collect::<Vec<_>>().join(", ")).to_string()));
+                } else if value.is_null() && !remaining_arg_types.contains(&FunctionArgKind::Null) {
+                    return Err(DscError::Parser(t!("functions.noNullArgs", name = name, accepted_args_string = remaining_arg_types.iter().map(std::string::ToString::to_string).collect::<Vec<_>>().join(", ")).to_string()));
                 } else if value.is_number() && !remaining_arg_types.contains(&FunctionArgKind::Number) {
                     return Err(DscError::Parser(t!("functions.noNumberArgs", name = name, accepted_args_string = remaining_arg_types.iter().map(std::string::ToString::to_string).collect::<Vec<_>>().join(", ")).to_string()));
                 } else if value.is_object() && !remaining_arg_types.contains(&FunctionArgKind::Object) {