portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix autocomplete of @@ and @@@ (#4838)

Browse source
This commit is contained in:
Khairul Azhar Kasmiran 2025-01-15 22:14:39 +08:00 committed by GitHub
parent 380a94d619
commit aeae32ea56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
librz/core/cautocmpl.c
View file

@ -846,8 +846,9 @@ static bool is_arg_identifier_in_tmp_stmt(TSNode node) {
return false;
}
const char *node_type = ts_node_type(node);
bool is_iter_or_tmp = rz_str_startswith(node_type, "tmp_") || rz_str_startswith(node_type, "iter_");
return is_iter_or_tmp && rz_str_endswith(node_type, "_op");
bool is_tmp = rz_str_startswith(node_type, "tmp_") && rz_str_endswith(node_type, "_op");
bool is_iter = rz_str_startswith(node_type, "iter_") && rz_str_endswith(node_type, "_stmt");
return is_tmp || is_iter;
}
static bool find_autocmplt_type_at_stmt(struct autocmplt_data_t *ad, RzCore *core, RzLineBuffer *buf) {

58
test/integration/test_autocmplt.c
View file

@ -537,6 +537,63 @@ static bool test_autocmplt_tmp_operators(void) {
mu_end;
}
static bool test_autocmplt_iter_operators(void) {
RzCore *core = fake_core_new();
mu_assert_notnull(core, "core should be created");
RzLineBuffer *buf = &core->cons->line->buffer;
const char *s = "pd @@";
strcpy(buf->data, s);
buf->length = strlen(s);
buf->index = buf->length;
RzLineNSCompletionResult *r = rz_core_autocomplete_rzshell(core, buf, RZ_LINE_PROMPT_DEFAULT);
mu_assert_notnull(r, "r should not be null");
mu_assert_eq(r->start, strlen("pd "), "should autocomplete the @@ operator");
mu_assert_eq(r->end, buf->length, "should autocomplete ending at end of buffer");
const char *iter_ops[] = {
"@@.",
"@@=",
"@@@=",
"@@",
"@@c:",
"@@@c:",
"@@C",
"@@C:",
"@@dbt",
"@@dbtb",
"@@dbts",
"@@t",
"@@b",
"@@i",
"@@ii",
"@@iS",
"@@iSS",
"@@is",
"@@iz",
"@@f",
"@@f:",
"@@F",
"@@F:",
"@@om",
"@@dm",
"@@r",
"@@s:",
};
mu_assert_eq(rz_pvector_len(&r->options), RZ_ARRAY_SIZE(iter_ops), "there are all @@/@@ operators (see @@?)");
int i;
for (i = 0; i < RZ_ARRAY_SIZE(iter_ops); i++) {
char msg[100];
rz_strf(msg, "%d-th should be %s", i, iter_ops[i]);
mu_assert_streq(rz_pvector_at(&r->options, i), iter_ops[i], msg);
}
rz_line_ns_completion_result_free(r);
rz_core_free(core);
mu_end;
}
static bool test_autocmplt_tmp_seek(void) {
RzCore *core = fake_core_new();
mu_assert_notnull(core, "core should be created");
@ -649,6 +706,7 @@ bool all_tests() {
mu_run_test(test_autocmplt_seek);
mu_run_test(test_autocmplt_global);
mu_run_test(test_autocmplt_tmp_operators);
mu_run_test(test_autocmplt_iter_operators);
mu_run_test(test_autocmplt_tmp_seek);
mu_run_test(test_autocmplt_tmp_config);
mu_run_test(test_autocmplt_tmp_arch);