Skip to content

Commit ee6e78b

Browse files
committed
fix(java): ignore comment extras in record accessor parameters
Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
1 parent e2660c4 commit ee6e78b

2 files changed

Lines changed: 83 additions & 1 deletion

File tree

‎internal/cbm/extract_defs.c‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9590,7 +9590,19 @@ static bool record_declares_accessor(CBMExtractCtx *ctx, TSNode node, const char
95909590
}
95919591
/* Same name, no parameters — that is the accessor. */
95929592
TSNode params = ts_node_child_by_field_name(member, TS_FIELD("parameters"));
9593-
if (ts_node_is_null(params) || ts_node_named_child_count(params) == 0) {
9593+
if (ts_node_is_null(params)) {
9594+
return true;
9595+
}
9596+
/* Comments are named extras, not parameters. */
9597+
bool has_parameters = false;
9598+
uint32_t pc = ts_node_named_child_count(params);
9599+
for (uint32_t pi = 0; pi < pc; pi++) {
9600+
if (!ts_node_is_extra(ts_node_named_child(params, pi))) {
9601+
has_parameters = true;
9602+
break;
9603+
}
9604+
}
9605+
if (!has_parameters) {
95949606
return true;
95959607
}
95969608
}

‎tests/test_call_reference_contract.c‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,74 @@ TEST(call_java_record_varargs_accessor_has_array_return) {
578578
PASS();
579579
}
580580

581+
/* Comment extras in an otherwise empty parameter list must not create a
582+
* second, implicit accessor at the record component's source location. */
583+
TEST(call_java_record_commented_accessor_has_only_explicit_span) {
584+
static const char *sources[] = {"record Value(int x) {\n"
585+
" public int x(/* explanation */) {\n"
586+
" return x;\n"
587+
" }\n"
588+
"}\n",
589+
"record Value(int x) {\n"
590+
" public int x(// explanation\n"
591+
" ) {\n"
592+
" return x;\n"
593+
" }\n"
594+
"}\n"};
595+
static const int end_lines[] = {4, 5};
596+
for (int fixture = 0; fixture < 2; fixture++) {
597+
CBMFileResult *result =
598+
cbm_extract_file(sources[fixture], (int)strlen(sources[fixture]), CBM_LANG_JAVA,
599+
"repro", "Value.java", 0, NULL, NULL);
600+
ASSERT_NOT_NULL(result);
601+
int accessors = 0;
602+
int explicit_spans = 0;
603+
for (int i = 0; i < result->defs.count; i++) {
604+
CBMDefinition *def = &result->defs.items[i];
605+
if (strcmp(def->name, "x") == 0 && strcmp(def->label, "Method") == 0) {
606+
accessors++;
607+
if (def->start_line == 2 && def->end_line == end_lines[fixture]) {
608+
explicit_spans++;
609+
}
610+
}
611+
}
612+
cbm_free_result(result);
613+
ASSERT_EQ(accessors, 1);
614+
ASSERT_EQ(explicit_spans, 1);
615+
}
616+
PASS();
617+
}
618+
619+
TEST(call_java_record_commented_overload_keeps_implicit_accessor) {
620+
static const char source[] =
621+
"record Value(int x) {\n"
622+
" public int x(/* explanation */ int scale) { return x * scale; }\n"
623+
"}\n";
624+
CBMFileResult *result = cbm_extract_file(source, (int)strlen(source), CBM_LANG_JAVA, "repro",
625+
"Value.java", 0, NULL, NULL);
626+
ASSERT_NOT_NULL(result);
627+
int methods = 0;
628+
int implicit_spans = 0;
629+
int overload_spans = 0;
630+
for (int i = 0; i < result->defs.count; i++) {
631+
CBMDefinition *def = &result->defs.items[i];
632+
if (strcmp(def->name, "x") == 0 && strcmp(def->label, "Method") == 0) {
633+
methods++;
634+
if (def->start_line == 1 && def->end_line == 1) {
635+
implicit_spans++;
636+
}
637+
if (def->start_line == 2 && def->end_line == 2) {
638+
overload_spans++;
639+
}
640+
}
641+
}
642+
cbm_free_result(result);
643+
ASSERT_EQ(methods, 2);
644+
ASSERT_EQ(implicit_spans, 1);
645+
ASSERT_EQ(overload_spans, 1);
646+
PASS();
647+
}
648+
581649
SUITE(call_reference_contract) {
582650
RUN_TEST(call_reference_typescript_direct_argument_is_exact);
583651
RUN_TEST(call_reference_kotlin_alias_argument_is_exact);
@@ -596,6 +664,8 @@ SUITE(call_reference_contract) {
596664
RUN_TEST(call_reference_go_ambiguous_promoted_method_stays_usage);
597665
RUN_TEST(call_java_record_accessor_binds_the_record);
598666
RUN_TEST(call_java_record_varargs_accessor_has_array_return);
667+
RUN_TEST(call_java_record_commented_accessor_has_only_explicit_span);
668+
RUN_TEST(call_java_record_commented_overload_keeps_implicit_accessor);
599669
RUN_TEST(call_java_static_import_does_not_call_field_sequential);
600670
RUN_TEST(call_java_static_import_does_not_call_field_parallel);
601671
}

0 commit comments

Comments
 (0)