fix target selection

Author: Lana243

server/src/building/TargetBuildDatabase.cpp

@@ -4,12 +4,17 @@
 #include "utils/GrpcUtils.h"
 #include "utils/GenerationUtils.h"
 
-TargetBuildDatabase::TargetBuildDatabase(BuildDatabase *baseBuildDatabase, const std::string &targetOrSourcePath) :
+TargetBuildDatabase::TargetBuildDatabase(BuildDatabase *baseBuildDatabase, const std::string &targetOrSourcePath,
+                                         const std::optional<fs::path> &sourceFile) :
         BuildDatabase(baseBuildDatabase) {
     if (Paths::isSourceFile(targetOrSourcePath)) {
         target = baseBuildDatabase->getRootForSource(targetOrSourcePath);
     } else if (targetOrSourcePath == GrpcUtils::UTBOT_AUTO_TARGET_PATH || targetOrSourcePath.empty()) {
-        target = baseBuildDatabase->getRootForFirstSource();
+        if (sourceFile.has_value()) {
+            target = baseBuildDatabase->getRootForSource(sourceFile.value());
+        } else {
+            target = baseBuildDatabase->getRootForFirstSource();
+        }
     } else {
         auto new_target = GenerationUtils::findTarget(baseBuildDatabase->getAllTargets(), targetOrSourcePath);
         if (new_target.has_value()) {
@@ -19,6 +24,7 @@ TargetBuildDatabase::TargetBuildDatabase(BuildDatabase *baseBuildDatabase, const
         }
     }
 
+    LOG_S(INFO) << StringUtils::stringFormat("Chosen target: %s", target);
     isAutoTarget = target == GrpcUtils::UTBOT_AUTO_TARGET_PATH;
 
     {

server/src/building/TargetBuildDatabase.h

@@ -10,7 +10,8 @@ class TargetBuildDatabase : public BuildDatabase {
     bool isAutoTarget;
 
 public:
-    TargetBuildDatabase(BuildDatabase *baseBuildDatabase, const std::string &targetOrSourcePath);
+    TargetBuildDatabase(BuildDatabase *baseBuildDatabase, const std::string &targetOrSourcePath,
+                        const std::optional<fs::path> &sourceFile = std::nullopt);
 
     bool hasAutoTarget() const;
 

server/src/testgens/FileTestGen.cpp

@@ -5,7 +5,7 @@
 FileTestGen::FileTestGen(const testsgen::FileRequest &request,
                          ProgressWriter *progressWriter,
                          bool testMode)
-        : ProjectTestGen(request.projectrequest(), progressWriter, testMode, false),
+        : ProjectTestGen(request.projectrequest(), progressWriter, testMode, false, fs::weakly_canonical(request.filepath())),
           filepath(fs::weakly_canonical(request.filepath())) {
     testingMethodsSourcePaths = {filepath};
     setInitializedTestsMap();

server/src/testgens/LineTestGen.cpp

@@ -3,7 +3,7 @@
 LineTestGen::LineTestGen(const testsgen::LineRequest &request,
                          ProgressWriter *progressWriter,
                          bool testMode, bool forHeader)
-        : ProjectTestGen(request.projectrequest(), progressWriter, testMode, false) {
+        : ProjectTestGen(request.projectrequest(), progressWriter, testMode, false, fs::weakly_canonical(request.sourceinfo().filepath())) {
     filePath = fs::weakly_canonical(request.sourceinfo().filepath());
     line = request.sourceinfo().line();
     std::optional<fs::path> sourcePath = Paths::headerPathToSourcePath(filePath);

server/src/testgens/ProjectTestGen.cpp

@@ -8,15 +8,16 @@
 ProjectTestGen::ProjectTestGen(const testsgen::ProjectRequest &request,
                                ProgressWriter *progressWriter,
                                bool testMode,
-                               bool autoDetect)
+                               bool autoDetect,
+                               const std::optional<fs::path> &sourceFile)
         : BaseTestGen(request.projectcontext(),
                       request.settingscontext(),
                       progressWriter,
                       testMode), request(&request) {
     fs::create_directories(projectContext.testDirPath);
     compileCommandsJsonPath = CompilationUtils::substituteRemotePathToCompileCommandsJsonPath(projectContext);
     projectBuildDatabase = std::make_shared<ProjectBuildDatabase>(compileCommandsJsonPath, serverBuildDir, projectContext);
-    targetBuildDatabase = std::make_shared<TargetBuildDatabase>(projectBuildDatabase.get(), request.targetpath());
+    targetBuildDatabase = std::make_shared<TargetBuildDatabase>(projectBuildDatabase.get(), request.targetpath(), sourceFile);
     if (autoDetect) {
         autoDetectSourcePathsIfNotEmpty();
     } else {

server/src/testgens/ProjectTestGen.h

@@ -10,7 +10,8 @@ class ProjectTestGen : public BaseTestGen {
     ProjectTestGen(const testsgen::ProjectRequest &request,
                    ProgressWriter *progressWriter,
                    bool testMode,
-                   bool autoDetect = true);
+                   bool autoDetect = true,
+                   const std::optional<fs::path> &sourceFile = std::nullopt);
 
     ~ProjectTestGen() override = default;