Skip to content

Commit 7028640

Browse files
committed
fix(csharp): preserve escaped constructors and conditional extension members
Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
1 parent 5e6b1bb commit 7028640

2 files changed

Lines changed: 62 additions & 7 deletions

File tree

‎internal/cbm/extract_defs.c‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8943,9 +8943,15 @@ static bool csharp_is_extension_block(TSNode node, TSNode class_node, const char
89438943
}
89448944
TSNode type_name = ts_node_child_by_field_name(class_node, TS_FIELD("name"));
89458945
if (!ts_node_is_null(type_name)) {
8946+
const char *type_text = source + ts_node_start_byte(type_name);
89468947
uint32_t tlen = ts_node_end_byte(type_name) - ts_node_start_byte(type_name);
8947-
if (tlen == kw_len &&
8948-
strncmp(source + ts_node_start_byte(type_name), "extension", kw_len) == 0) {
8948+
/* A verbatim identifier names the same type: class @extension may
8949+
* declare a genuine constructor spelled extension(). */
8950+
if (tlen > 0 && type_text[0] == '@') {
8951+
type_text++;
8952+
tlen--;
8953+
}
8954+
if (tlen == kw_len && strncmp(type_text, "extension", kw_len) == 0) {
89498955
return false;
89508956
}
89518957
}
@@ -8963,11 +8969,11 @@ static void extract_csharp_extension_members(CBMExtractCtx *ctx, TSNode ext_node
89638969
if (ts_node_is_null(body)) {
89648970
return;
89658971
}
8966-
uint32_t count = ts_node_child_count(body);
8967-
for (uint32_t i = 0; i < count; i++) {
8968-
TSNode member = ts_node_child(body, i);
8969-
if (ts_node_is_null(member) ||
8970-
strcmp(ts_node_type(member), "local_function_statement") != 0) {
8972+
member_iter_t it;
8973+
member_iter_init(&it, body, ctx->language, false);
8974+
TSNode member;
8975+
while (member_iter_next(&it, &member)) {
8976+
if (strcmp(ts_node_type(member), "local_function_statement") != 0) {
89718977
continue;
89728978
}
89738979
TSNode name = resolve_method_name(member, ctx->language);
@@ -8976,6 +8982,7 @@ static void extract_csharp_extension_members(CBMExtractCtx *ctx, TSNode ext_node
89768982
}
89778983
push_method_def(ctx, member, class_node, class_qn, spec, name);
89788984
}
8985+
member_iter_done(&it);
89798986
}
89808987

89818988
// Extract methods inside a class body

‎tests/test_extraction.c‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,52 @@ TEST(csharp_constructor_of_type_named_extension) {
916916
PASS();
917917
}
918918

919+
/* Escaping a type identifier does not change its constructor's identity. */
920+
TEST(csharp_constructor_of_escaped_type_named_extension) {
921+
const char *src = "namespace App { public class @extension { "
922+
"public extension() { int ConstructorLocal() => 1; } } }";
923+
CBMFileResult *r = extract(src, CBM_LANG_CSHARP, "t", "extension.cs");
924+
ASSERT_NOT_NULL(r);
925+
ASSERT_FALSE(r->has_error);
926+
ASSERT(has_def(r, "Method", "extension"));
927+
ASSERT_FALSE(has_def(r, "Method", "ConstructorLocal"));
928+
cbm_free_result(r);
929+
PASS();
930+
}
931+
932+
/* All conditional branches expose extension members, but method-local
933+
* functions must never be promoted to members of the enclosing type. */
934+
TEST(csharp_extension_block_conditional_members) {
935+
const char *src = "public static class TextExtensions\n"
936+
"{\n"
937+
" extension(string text)\n"
938+
" {\n"
939+
"#if FIRST\n"
940+
" public int First() { int Nested() => 1; return Nested(); }\n"
941+
"#elif SECOND\n"
942+
" public int Second() => 2;\n"
943+
"#else\n"
944+
"#if NESTED\n"
945+
" public int Third() => 3;\n"
946+
"#else\n"
947+
" public int Fourth() => 4;\n"
948+
"#endif\n"
949+
"#endif\n"
950+
" }\n"
951+
"}\n";
952+
CBMFileResult *r = extract(src, CBM_LANG_CSHARP, "t", "TextExtensions.cs");
953+
ASSERT_NOT_NULL(r);
954+
ASSERT_FALSE(r->has_error);
955+
ASSERT(has_def(r, "Method", "First"));
956+
ASSERT(has_def(r, "Method", "Second"));
957+
ASSERT(has_def(r, "Method", "Third"));
958+
ASSERT(has_def(r, "Method", "Fourth"));
959+
ASSERT_FALSE(has_def_any(r, "extension"));
960+
ASSERT_FALSE(has_def(r, "Method", "Nested"));
961+
cbm_free_result(r);
962+
PASS();
963+
}
964+
919965
/* --- Swift --- */
920966
TEST(swift_class) {
921967
CBMFileResult *r = extract("class Vehicle {\n var speed: Int = 0\n func accelerate() { "
@@ -13195,6 +13241,8 @@ SUITE(extraction) {
1319513241
RUN_TEST(csharp_interface);
1319613242
RUN_TEST(csharp_extension_block_members);
1319713243
RUN_TEST(csharp_constructor_of_type_named_extension);
13244+
RUN_TEST(csharp_constructor_of_escaped_type_named_extension);
13245+
RUN_TEST(csharp_extension_block_conditional_members);
1319813246
RUN_TEST(swift_class);
1319913247
RUN_TEST(swift_protocol);
1320013248
RUN_TEST(kotlin_function);

0 commit comments

Comments
 (0)