Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Provide Quick fixes for Compile errors #1359

Merged
merged 2 commits into from
May 25, 2024
Merged

Provide Quick fixes for Compile errors #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c7986a
quick fix implemented for argument errors
shashank-iitbhu May 25, 2024
29bed58
grammar test fixed
shashank-iitbhu May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 57 additions & 7 deletions kclvm/sema/src/resolver/arg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,17 @@ impl<'ctx> Resolver<'ctx> {
let mut kwarg_types: Vec<(String, TypeRef)> = vec![];
let mut check_table: IndexSet<String> = IndexSet::default();
for kw in kwargs {
let (suggs, msg) = self.get_arg_kw_err_suggestion(kw, func_ty);
if !kw.node.arg.node.names.is_empty() {
let arg_name = &kw.node.arg.node.names[0].node;
if check_table.contains(arg_name) {
self.handler.add_compile_error(
&format!("{} has duplicated keyword argument {}", func_name, arg_name),
self.handler.add_compile_error_with_suggestions(
&format!(
"{} has duplicated keyword argument {}{}",
func_name, arg_name, msg
),
kw.get_span_pos(),
Some(suggs),
);
}
check_table.insert(arg_name.to_string());
Expand All @@ -53,7 +58,7 @@ impl<'ctx> Resolver<'ctx> {
kwarg_types.push((arg_name.to_string(), arg_value_type.clone()));
} else {
self.handler
.add_compile_error("missing argument", kw.get_span_pos());
.add_compile_error(&format!("missing argument{}", msg), kw.get_span_pos());
Peefy marked this conversation as resolved.
Show resolved Hide resolved
}
}
// Do few argument count check
Expand Down Expand Up @@ -87,7 +92,7 @@ impl<'ctx> Resolver<'ctx> {
Some(param) => param.ty.clone(),
None => {
if !func_ty.is_variadic {
self.handler.add_compile_error(
self.handler.add_compile_error_with_suggestions(
&format!(
"{} takes {} but {} were given",
func_name,
Expand All @@ -96,6 +101,7 @@ impl<'ctx> Resolver<'ctx> {
args.len(),
),
args[i].get_span_pos(),
Some(vec![]),
);
}
return;
Expand All @@ -112,12 +118,14 @@ impl<'ctx> Resolver<'ctx> {
.any(|x| x == *arg_name)
&& !func_ty.is_variadic
{
self.handler.add_compile_error(
let (suggs, msg) = self.get_arg_kw_err_suggestion_from_name(arg_name, func_ty);
self.handler.add_compile_error_with_suggestions(
&format!(
"{} got an unexpected keyword argument '{}'",
func_name, arg_name
"{} got an unexpected keyword argument '{}'{}",
func_name, arg_name, msg
),
kwargs[i].get_span_pos(),
Some(suggs),
);
}
let expected_types: Vec<TypeRef> = func_ty
Expand All @@ -137,4 +145,46 @@ impl<'ctx> Resolver<'ctx> {
};
}
}

/// Generate suggestions for keyword argument errors.
pub(crate) fn get_arg_kw_err_suggestion(
&self,
kw: &ast::NodeRef<ast::Keyword>,
func_ty: &FunctionType,
) -> (Vec<String>, String) {
let attr = &kw.node.arg.node.names[0].node;
let valid_params: Vec<&str> = func_ty
.params
.iter()
.map(|param| param.name.as_str())
.collect();
let suggs = suggestions::provide_suggestions(attr, valid_params.into_iter());

let suggestion = if !suggs.is_empty() {
format!(", did you mean '{}'?", suggs.join(" or "))
} else {
String::new()
};

(suggs, suggestion)
}

pub(crate) fn get_arg_kw_err_suggestion_from_name(
&self,
arg_name: &str,
func_ty: &FunctionType,
) -> (Vec<String>, String) {
let valid_params: Vec<&str> = func_ty
.params
.iter()
.map(|param| param.name.as_str())
.collect();
let suggs = suggestions::provide_suggestions(arg_name, valid_params.into_iter());
let suggestion = if !suggs.is_empty() {
format!(", did you mean '{}'?", suggs.join(" or "))
} else {
String::new()
};
(suggs, suggestion)
}
}
14 changes: 10 additions & 4 deletions kclvm/tools/src/LSP/src/quick_fix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,16 @@ pub(crate) fn quick_fix(uri: &Url, diags: &[Diagnostic]) -> Vec<lsp_types::CodeA
new_text: replacement_text.clone(),
}],
);
let action_title = format!(
"a local variable with a similar name exists: `{}`",
replacement_text
);

let action_title = if replacement_text.is_empty() {
"Consider removing the problematic code".to_string()
} else {
format!(
"A local variable with a similar name exists: `{}`",
replacement_text
)
};

code_actions.push(CodeActionOrCommand::CodeAction(CodeAction {
title: action_title,
kind: Some(CodeActionKind::QUICKFIX),
Expand Down
9 changes: 7 additions & 2 deletions kclvm/tools/src/LSP/src/to_lsp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,13 @@ fn kcl_msg_to_lsp_diags(
.filter(|s| !s.is_empty())
.collect::<Vec<&String>>()
})
.filter(|v| !v.is_empty())
.map(|s| json!({ "suggested_replacement": s }));
.map(|s| {
if s.is_empty() {
json!({ "suggested_replacement": "" })
} else {
json!({ "suggested_replacement": s })
}
});

let related_information = if related_msg.is_empty() {
None
Expand Down
2 changes: 1 addition & 1 deletion test/grammar/schema/init/init_kwargs_fail_0/stderr.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ error[E2L23]: CompileError
--> ${CWD}/main.k:4:17
|
4 | person = Person(_naem="Alice") {}
| ^ "Person" got an unexpected keyword argument '_naem'
| ^ "Person" got an unexpected keyword argument '_naem', did you mean '_name'?
|
Loading