Fix conflicts

Author: pavel-pythagora

src/helpers/unitTests.js

@@ -352,6 +352,30 @@ function sortFolderTree() {
     }
 }
 
+function sortFolderTree() {
+    // 1. Sort the folderStructureTree
+    folderStructureTree.sort((a, b) => {
+        if (a.absolutePath < b.absolutePath) {
+            return -1;
+        }
+        if (a.absolutePath > b.absolutePath) {
+            return 1;
+        }
+        return 0;
+    });
+
+    // 2. Set prefix according to the position in the directory
+    for (let i = 0; i < folderStructureTree.length; i++) {
+        // Get the current directory path
+        const currentDirPath = path.dirname(folderStructureTree[i].absolutePath);
+        // Check if it's the last file in the directory
+        if (i === folderStructureTree.length - 1 || path.dirname(folderStructureTree[i + 1].absolutePath) !== currentDirPath) {
+            // Update the prefix for the last file in the directory
+            folderStructureTree[i].line = folderStructureTree[i].line.replace("├───", "└───");
+        }
+    }
+}
+
 async function getFunctionsForExport(dirPath, ignoreFilesRewrite) {
     if (ignoreFilesRewrite) {
         isFileToIgnore = ignoreFilesRewrite;

src/utils/files.js

@@ -17,13 +17,12 @@ function getRelativePath(filePath, referenceFolderPath) {
     return relativePath;
 }
 
+
 function getFolderTreeItem(prefix, absolutePath) {
-    const isDirectory = absolutePath.includes(':') ? false : fsSync.statSync(absolutePath).isDirectory();
     return {
         line: `${prefix}${path.basename(absolutePath)}`,
-        absolutePath,
-        isDirectory
-    };
+        absolutePath: absolutePath
+    }
 }
 
 function isPathInside(basePath, targetPath) {