Local code intelligence for developers and AI agents. Connect code, docs and infrastructure in a persistent graph, with CBM Lens, MCP tools, agent integrations and change-aware test selection.
C aiderastclaude-codecode-analysiscode-intelligencecodexcursorcypherdeveloper-toolsgemini-cligraph-visualizationkilocodeknowledge-graphmcpmcp-servermodel-context-protocolopencodesqlitetree-sitterwindsurf
fix(discover): split dep-rule targets on every D whitespace
Nelson Spence006f2a991c6a
diff --git a/src/discover/language.c b/src/discover/language.cindex 0d6d3faca..c0f6f1894 100644--- a/src/discover/language.c+++ b/src/discover/language.c@@ -1338,6 +1338,20 @@ static bool is_rule_colon(const char *p, bool whole_file) {(next == '\0' && whole_file));}+/* Bytes of D whitespace at p, or 0: space, tab, vertical tab, form feed, CR+ * and the UTF-8 line and paragraph separators U+2028/U+2029, all of which split+ * D tokens. '\n' ends the line and is the caller's. */+static size_t d_space_len(const char *p) {+ if (*p == ' ' || *p == '\t' || *p == '\v' || *p == '\f' || *p == '\r') {+ return SKIP_ONE;+ }+ if (strncmp(p, "\xE2\x80\xA8", SLEN("\xE2\x80\xA8")) == 0 ||+ strncmp(p, "\xE2\x80\xA9", SLEN("\xE2\x80\xA9")) == 0) {+ return SLEN("\xE2\x80\xA8");+ }+ return 0;+}+/* True if the line at p is a make rule "target...: prereq..." whose targets all* look like paths (contain '/', '\' or '.'); a backslash-escaped space stays* inside its target. D source fails this: "public:", "@safe:", "extern(C):"@@ -1353,12 +1367,14 @@ static bool is_dep_rule_line(const char *p, bool whole_file) {if (is_rule_colon(p, whole_file)) {return in_target ? path_like : any_target;}- if (*p == ' ' || *p == '\t' || *p == '\r') {+ size_t space = d_space_len(p);+ if (space) {if (in_target && !path_like) {return false;}in_target = false;path_like = false;+ p += space - SKIP_ONE;continue;}if (strchr("(){};=\"',@", *p)) {diff --git a/tests/test_language.c b/tests/test_language.cindex d93eb0ecb..9b3bdc0a9 100644--- a/tests/test_language.c+++ b/tests/test_language.c@@ -886,6 +886,16 @@ TEST(lang_d_source_stays_dlang) {ASSERT_EQ(disambiguate_d_content("public/**/:\nvoid f() {}\n"), CBM_LANG_DLANG);ASSERT_EQ(disambiguate_d_content("public/+ +/:\nvoid f() {}\n"), CBM_LANG_DLANG);ASSERT_EQ(disambiguate_d_content("public//note: x\nvoid f() {}\n"), CBM_LANG_DLANG);+ /* Every D whitespace splits tokens, not only space, tab and CR: form feed,+ * vertical tab, U+2028 and U+2029. */+ ASSERT_EQ(disambiguate_d_content("import\fstd.stdio : writeln;\n"), CBM_LANG_DLANG);+ ASSERT_EQ(disambiguate_d_content("import\vstd.stdio : writeln;\n"), CBM_LANG_DLANG);+ ASSERT_EQ(disambiguate_d_content("import\xE2\x80\xA8"+ "std.stdio : writeln;\n"),+ CBM_LANG_DLANG);+ ASSERT_EQ(disambiguate_d_content("import\xE2\x80\xA9"+ "std.stdio : writeln;\n"),+ CBM_LANG_DLANG);/* Default on doubt: empty or unreadable. */ASSERT_EQ(disambiguate_d_content(""), CBM_LANG_DLANG);ASSERT_EQ(cbm_disambiguate_d("/tmp/nonexistent_file_12345.d"), CBM_LANG_DLANG);