[project][-I] Return CURRENT_PROJECT for GetProject for file in -I dir

Author: thoni56

src/cxref.c

@@ -58,6 +58,16 @@ static unsigned menuFilterLevels[MAX_MENU_FILTER_LEVEL] = {
 static char *lockedProject = NULL;
 static char *lockedProjectRoot = NULL;
 
+static bool fileIsUnderIncludePaths(char *fileName) {
+    for (StringList *dir = options.includeDirs; dir != NULL; dir = dir->next) {
+        int len = strlen(dir->string);
+        if (strncmp(fileName, dir->string, len) == 0
+            && (fileName[len] == '/' || fileName[len] == '\0')) {
+            return true;
+        }
+    }
+    return false;
+}
 
 /* *********************************************************************** */
 
@@ -1794,8 +1804,10 @@ static void handleProject() {
             if (lockedProject != NULL) {
                 /* Server is locked - check if this file belongs to the locked project */
                 if (lockedProjectRoot != NULL) {
-                    /* Auto-detected project - check file path against project root */
-                    if (strncmp(fileName, lockedProjectRoot, strlen(lockedProjectRoot)) == 0) {
+                    /* Auto-detected project - file is in scope if under project root
+                     * or under a configured include path */
+                    if (strncmp(fileName, lockedProjectRoot, strlen(lockedProjectRoot)) == 0
+                        || fileIsUnderIncludePaths(fileName)) {
                         ppcGenRecord(PPC_SET_INFO, lockedProject);
                     } else {
                         ppcGenRecord(PPC_PROJECT_MISMATCH, lockedProject);

src/cxref_tests.c

@@ -66,7 +66,8 @@ Ensure(CxRef, will_return_no_active_project_if_no_optionfile_found) {
     expect(applyConventionBasedDatabasePath);
     expect(getFileItemWithFileNumber, when(fileNumber, is_equal_to(0)),
            will_return(&fileItem));
-    expect(searchForProjectConfigFileAndProjectForFile, when(sourceFilename, is_equal_to_string("file.c")),
+    expect(searchForProjectConfigFileAndProjectForFile,
+           when(sourceFilename, is_equal_to_string("file.c")),
            will_set_contents_of_parameter(foundConfigFilename, "", 1),
            will_set_contents_of_parameter(foundProjectName, "", 1));
     expect(ppcGenRecord,

tests/test_getproject_file_under_include_path/Makefile

@@ -0,0 +1,29 @@
+include ../Makefile.server
+
+# Scenario: A project includes a header from an external directory via -I.
+# When the user navigates to that header and the client sends getprojectname
+# for it, the server should return the current project (not a mismatch),
+# because the file is reachable via the project's include paths.
+#
+# Note: this also accepts unknown CUs under -I dirs, which is too broad.
+# See test_getproject_unknown_cu_under_include_path (.suspended) for that case.
+
+# Override: place .c-xrefrc in project/ for auto-detect, not in test root
+project/.c-xrefrc:
+	@echo "[$(CURDIR)/project]" > $@
+	@echo "  $(CURDIR)/project" >> $@
+	@echo "  -I $(CURDIR)/external" >> $@
+
+$(TEST): project/.c-xrefrc
+	@-$(SERVER_DRIVER) commands.input $(EXTRA) > output.tmp
+	@$(NORMALIZE) output.tmp > output
+	$(VERIFY)
+
+clean: clean-project-config
+clean-project-config:
+	@-rm -rf project/.c-xrefrc project/.c-xref
+
+trace: EXTRA = --extra '-debug -log=trace'
+trace: $(TEST)
+
+GDB_COMMANDS =

tests/test_getproject_file_under_include_path/commands.input

@@ -0,0 +1,6 @@
+CXREF -xrefactory-II -server
+-olcxgetprojectname CURDIR/project/source.c
+<sync>
+-olcxgetprojectname CURDIR/external/external.h
+<sync>
+<exit>

tests/test_getproject_file_under_include_path/expected

@@ -0,0 +1,14 @@
+CXREF -xrefactory-II -server -o server-buffer
+-olcxgetprojectname CURDIR/project/source.c
+end-of-options
+
+<sync>
+<set-info len=<n>>CURDIR/project</set-info>
+-olcxgetprojectname CURDIR/external/external.h
+end-of-options
+
+<sync>
+<set-info len=<n>>CURDIR/project</set-info>
+-exit
+end-of-options
+

tests/test_getproject_file_under_include_path/external/external.h

@@ -0,0 +1 @@
+int external_function(void);

tests/test_getproject_file_under_include_path/project/source.c

@@ -0,0 +1,5 @@
+#include "external.h"
+
+int main() {
+    return external_function();
+}

tests/test_getproject_unknown_cu_under_include_path/.suspended

@@ -0,0 +1,34 @@
+include ../Makefile.server
+
+# Scenario: A CU (external.c) exists under an -I directory but was never
+# included or parsed by the project. When the user manually opens it and
+# the client sends getprojectname, the server should return a mismatch
+# — the file is not part of the current project's scope.
+#
+# Currently SUSPENDED because:
+# - The simple fileIsUnderIncludePaths check accepts any file under -I dirs
+# - Fixing this properly requires either:
+#   (a) not adding getprojectname files to the file table (needs surgery
+#       on the init flow which depends on file table registration), or
+#   (b) file table support for removing/marking transient entries
+# See also: test_getproject_file_under_include_path for the passing case.
+
+# Override: place .c-xrefrc in project/ for auto-detect, not in test root
+project/.c-xrefrc:
+	@echo "[$(CURDIR)/project]" > $@
+	@echo "  $(CURDIR)/project" >> $@
+	@echo "  -I $(CURDIR)/external" >> $@
+
+$(TEST): project/.c-xrefrc
+	@-$(SERVER_DRIVER) commands.input $(EXTRA) > output.tmp
+	@$(NORMALIZE) output.tmp > output
+	$(VERIFY)
+
+clean: clean-project-config
+clean-project-config:
+	@-rm -rf project/.c-xrefrc project/.c-xref
+
+trace: EXTRA = --extra '-debug -log=trace'
+trace: $(TEST)
+
+GDB_COMMANDS =

tests/test_getproject_unknown_cu_under_include_path/Makefile

@@ -0,0 +1,8 @@
+CXREF -xrefactory-II -server
+-olcxgetprojectname CURDIR/project/source.c
+<sync>
+-olcxgetprojectname CURDIR/external/external.h
+<sync>
+-olcxgetprojectname CURDIR/external/external.c
+<sync>
+<exit>