fix: list options required param (#1138)

fix: list optins required param Signed-off-by: peefy <xpf6677@163.com>
kcl-lang · Mar 15, 2024 · a1132d1 · a1132d1
1 parent 4e7ab40
commit a1132d1
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 6 deletions.
diff --git a/kclvm/api/src/capi_test.rs b/kclvm/api/src/capi_test.rs
@@ -212,6 +212,15 @@ fn test_c_api_rename_code() {
     );
 }
 
+#[test]
+fn test_c_api_list_options() {
+    test_c_api_without_wrapper::<ParseProgramArgs, ListOptionsResult>(
+        "KclvmService.ListOptions",
+        "list-options.json",
+        "list-options.response.json",
+    );
+}
+
 #[test]
 fn test_c_api_testing() {
     test_c_api::<TestArgs, TestResult, _>(

diff --git a/kclvm/api/src/testdata/list-options.json b/kclvm/api/src/testdata/list-options.json
@@ -0,0 +1,3 @@
+{
+	"paths": ["./src/testdata/option/main.k"]
+}
diff --git a/kclvm/api/src/testdata/list-options.response.json b/kclvm/api/src/testdata/list-options.response.json
@@ -0,0 +1,25 @@
+{
+	"options": [
+		{
+			"name": "key1",
+			"type": "",
+			"required": false,
+			"default_value": "",
+			"help": ""
+		},
+		{
+			"name": "key2",
+			"type": "",
+			"required": true,
+			"default_value": "",
+			"help": ""
+		},
+		{
+			"name": "metadata-key",
+			"type": "",
+			"required": false,
+			"default_value": "",
+			"help": ""
+		}
+	]
+}
diff --git a/kclvm/loader/src/option.rs b/kclvm/loader/src/option.rs
@@ -3,7 +3,7 @@ use kclvm_ast::{ast, walker::MutSelfWalker};
 use kclvm_sema::builtin::BUILTIN_FUNCTIONS;
 use kclvm_sema::{builtin::option::OptionHelp, resolver::scope::NodeKey};
 
-use crate::util::get_call_args_strip_string;
+use crate::util::{get_call_args_string, get_call_args_strip_string};
 use crate::{load_packages, util::get_call_args_bool, LoadPackageOptions, Packages};
 
 #[derive(Debug)]
@@ -33,7 +33,7 @@ impl<'ctx> MutSelfWalker for OptionHelpExtractor<'ctx> {
                         name: get_call_args_strip_string(call_expr, 0, Some("key")),
                         ty: get_call_args_strip_string(call_expr, 1, Some("type")),
                         required: get_call_args_bool(call_expr, 2, Some("required")),
-                        default_value: get_call_args_strip_string(call_expr, 3, Some("default")),
+                        default_value: get_call_args_string(call_expr, 3, Some("default")),
                         help: get_call_args_strip_string(call_expr, 3, Some("help")),
                     })
                 }

diff --git a/kclvm/loader/src/snapshots/kclvm_loader__tests__list_options_1.snap b/kclvm/loader/src/snapshots/kclvm_loader__tests__list_options_1.snap
@@ -6,7 +6,7 @@ expression: "format!(\"{:#?}\", options)"
     OptionHelp {
         name: "key1",
         ty: "str",
-        required: false,
+        required: true,
         default_value: "",
         help: "",
     },

diff --git a/kclvm/loader/src/snapshots/kclvm_loader__tests__list_options_2.snap b/kclvm/loader/src/snapshots/kclvm_loader__tests__list_options_2.snap
@@ -6,8 +6,8 @@ expression: "format!(\"{:#?}\", options)"
     OptionHelp {
         name: "key1",
         ty: "str",
-        required: false,
-        default_value: "value",
+        required: true,
+        default_value: "\"value\"",
         help: "help me",
     },
     OptionHelp {

diff --git a/kclvm/loader/src/snapshots/kclvm_loader__tests__list_options_3.snap b/kclvm/loader/src/snapshots/kclvm_loader__tests__list_options_3.snap
@@ -0,0 +1,13 @@
+---
+source: loader/src/tests.rs
+expression: "format!(\"{:#?}\", options)"
+---
+[
+    OptionHelp {
+        name: "key1",
+        ty: "int",
+        required: false,
+        default_value: "123",
+        help: "help me",
+    },
+]
diff --git a/kclvm/loader/src/tests.rs b/kclvm/loader/src/tests.rs
@@ -71,3 +71,6 @@ a = option("key1", type="str", required=True, default="value", help="help me")
 if True:
     b = option("key2")
 "#}
+list_options_snapshot! {list_options_3, r#"
+a = option("key1", type="int", required=False, default=123, help="help me")
+"#}
diff --git a/kclvm/loader/src/util.rs b/kclvm/loader/src/util.rs
@@ -9,7 +9,7 @@ pub(crate) fn get_call_args_bool(
     index: usize,
     key: Option<&str>,
 ) -> bool {
-    let val = get_call_args_strip_string(call_expr, index, key);
+    let val = get_call_args_string(call_expr, index, key);
     val == "True" || val == "true"
 }