refactoring after review 4

Author: Vladislav Kalugin

server/src/building/BuildDatabase.cpp

@@ -59,20 +59,17 @@ fs::path BuildDatabase::createExplicitObjectFileCompilationCommand(const std::sh
 }
 
 void BuildDatabase::createClangCompileCommandsJson() {
-    CollectionUtils::MapFileTo<std::pair<nlohmann::json, std::shared_ptr<ObjectFileInfo>>> fileCompileCommands;
-    for (const auto &[compileCommand, objectInfo]: compileCommands_temp) {
-        const fs::path &sourcePath = objectInfo->getSourcePath();
-        if (CollectionUtils::contains(fileCompileCommands, sourcePath)) {
-            LOG_S(WARNING) << "Multiple compile commands for file \"" << sourcePath
-                           << "\" use command for \"" << objectInfo->getOutputFile() << "\"";
-        } else if (CollectionUtils::contains(objectFileInfos, objectInfo->getOutputFile())) {
-            fileCompileCommands[sourcePath] = {compileCommand, objectInfo};
-        }
+    CollectionUtils::MapFileTo<nlohmann::json> fileCompileCommands;
+    for (const auto &[sourcePath, objectInfos]: sourceFileInfos) {
+        const std::shared_ptr<ObjectFileInfo> &objectInfo = objectInfos.front();
+        fileCompileCommands[sourcePath] = {{"directory", objectInfo->command.getDirectory()},
+                                           {"command",   objectInfo->command.toString()},
+                                           {"file",      objectInfo->command.getSourcePath()}};
     }
 
     nlohmann::json compileCommandsSingleFilesJson;
     for (const auto &compileCommand: fileCompileCommands) {
-        compileCommandsSingleFilesJson.push_back(compileCommand.second.first);
+        compileCommandsSingleFilesJson.push_back(compileCommand.second);
     }
 
     fs::path clangCompileCommandsJsonPath = CompilationUtils::getClangCompileCommandsJsonPath(buildCommandsJsonPath);
@@ -334,6 +331,11 @@ BuildDatabase::getClientCompilationUnitInfo(const fs::path &filepath) const {
     throw CompilationDatabaseException("File is not a compilation unit or an object file: " + filepath.string());
 }
 
+
+[[nodiscard]] bool BuildDatabase::hasUnitInfo(const fs::path &filepath) const {
+    return CollectionUtils::contains(sourceFileInfos, filepath) || CollectionUtils::contains(objectFileInfos, filepath);
+}
+
 std::shared_ptr<const BuildDatabase::TargetInfo> BuildDatabase::getClientLinkUnitInfo(const fs::path &filepath) const {
     if (Paths::isSourceFile(filepath)) {
         auto compilationInfo = getClientCompilationUnitInfo(filepath);
@@ -543,7 +545,3 @@ CollectionUtils::FileSet BuildDatabase::getSourceFilesForTarget(const fs::path &
 std::shared_ptr<BuildDatabase::TargetInfo> BuildDatabase::getTargetInfo(const fs::path &_target) {
     return targetInfos[_target];
 }
-
-std::vector<std::pair<nlohmann::json, std::shared_ptr<BuildDatabase::ObjectFileInfo>>> BuildDatabase::getCompileCommands_temp() {
-    return compileCommands_temp;
-}

server/src/building/BuildDatabase.h

@@ -158,6 +158,14 @@ class BuildDatabase {
      */
     [[nodiscard]] std::shared_ptr<const ObjectFileInfo> getClientCompilationUnitInfo(const fs::path &filepath) const;
 
+    /**
+     * @brief Returns true if BuildDatabase contains information for current source file or object file
+     *
+     * @param filepath Path to source file or object file
+     * @return true if contains current source file or object file
+     */
+    [[nodiscard]] bool hasUnitInfo(const fs::path &filepath) const;
+
     /**
      * @brief Returns link command information for current executable or library
      *
@@ -220,9 +228,6 @@ class BuildDatabase {
 
     std::shared_ptr<TargetInfo> getTargetInfo(const fs::path &_target);
 
-    //TODO change
-    std::vector<std::pair<nlohmann::json, std::shared_ptr<ObjectFileInfo>>> getCompileCommands_temp();
-
     virtual bool hasAutoTarget() const = 0;
 
     virtual fs::path getTargetPath() const = 0;
@@ -240,9 +245,6 @@ class BuildDatabase {
     CollectionUtils::MapFileTo<std::shared_ptr<TargetInfo>> targetInfos;
     CollectionUtils::MapFileTo<std::vector<fs::path>> objectFileTargets;
 
-    //TODO change
-    std::vector<std::pair<nlohmann::json, std::shared_ptr<ObjectFileInfo>>> compileCommands_temp;
-
     BuildDatabase(
             fs::path serverBuildDir,
             fs::path buildCommandsJsonPath,

server/src/building/ProjectBuildDatabse.cpp

@@ -118,7 +118,6 @@ void ProjectBuildDatabase::initObjects(const nlohmann::json &compileCommandsJson
         } else {
             objectFileInfos[outputFile] = objectInfo;
         }
-        compileCommands_temp.emplace_back(compileCommand, objectInfo);
         const fs::path &sourcePath = objectInfo->getSourcePath();
         sourceFileInfos[sourcePath].emplace_back(objectInfo);
     }

server/src/building/TargetBuildDatabase.cpp

@@ -30,7 +30,6 @@ TargetBuildDatabase::TargetBuildDatabase(BuildDatabase *baseBuildDatabase,
         }
     }
 
-    compileCommands_temp = baseBuildDatabase->getCompileCommands_temp();
     createClangCompileCommandsJson();
 }
 

server/src/testgens/BaseTestGen.cpp

@@ -81,15 +81,11 @@ std::shared_ptr<TargetBuildDatabase> BaseTestGen::getTargetBuildDatabase() {
 std::shared_ptr<const BuildDatabase::ObjectFileInfo>
 BaseTestGen::getClientCompilationUnitInfo(const fs::path &path, bool fullProject) const {
     std::shared_ptr<const BuildDatabase::ObjectFileInfo> objectFileInfo;
-    try {
+    if (targetBuildDatabase->hasUnitInfo(path) || !fullProject) {
         objectFileInfo = targetBuildDatabase->getClientCompilationUnitInfo(path);
-    } catch (CompilationDatabaseException &e) {
-        if (fullProject) {
-            objectFileInfo = projectBuildDatabase->getClientCompilationUnitInfo(path);
-            LOG_S(WARNING) << "Can't find in target: " << path;
-        } else {
-            throw CompilationDatabaseException(e.what());
-        }
+    } else {
+        objectFileInfo = projectBuildDatabase->getClientCompilationUnitInfo(path);
+        LOG_S(WARNING) << "Can't find in target: " << path;
     }
     return objectFileInfo;
 }