WIP

Bajdzis · Feb 26, 2021 · b4637a1 · b4637a1
1 parent 9d124fe
commit b4637a1
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 26 deletions.
diff --git a/src/store/dependencies/files/files.ts b/src/store/dependencies/files/files.ts
@@ -6,9 +6,9 @@ import { DirectoriesInfo } from '../../../fileInfo/getSiblingInfo';
 import { getFilesContentAsTemplate } from '../../../fileSystem/getFilesContentAsTemplate';
 import { getRelativePath } from '../../../fileSystem/getRelativePath';
 import { generateFileAction, setDataAction } from '../../../reactViews/apps/chooseFiles/actions/action';
-import { compareTree, filterTree } from '../../../symbolInformation/compareTree';
+import { compareTree, createTemplateInTree, filterTree } from '../../../symbolInformation/compareTree';
 import { getFileSymbols } from '../../../symbolInformation/getFileSymbols';
-import { joinSymbolToString } from '../../../symbolInformation/joinSymbolToString';
+import { joinSymbolToString, treeSymbolToFlattArray } from '../../../symbolInformation/joinSymbolToString';
 import { compareVariableTemplate } from '../../../variableTemplate/compareVariableTemplate';
 import { renderVariableTemplate } from '../../../variableTemplate/renderVariableTemplate';
 import { WebViewReact } from '../webView/webViewReact';
@@ -82,8 +82,8 @@ export class Files {
     }
 
     async getContentBySibling(createdItemUri: vscode.Uri): Promise<string> {
-        // const relativePath = getRelativePath(createdItemUri.fsPath);
-        // const infoAboutNewFile = getInfoAboutPath(relativePath);
+        const relativePath = getRelativePath(createdItemUri.fsPath);
+        const infoAboutNewFile = getInfoAboutPath(relativePath);
         const parentDir = path.dirname(createdItemUri.fsPath);
 
         const fileToSkip = path.basename(createdItemUri.fsPath);
@@ -104,19 +104,23 @@ export class Files {
         const files = contents.map(siblingFile => {
             const filePath = path.join(parentDir, siblingFile);
             const fileUri = vscode.Uri.file(filePath);
+            const infoAboutFilePath = getInfoAboutPath(getRelativePath(filePath));
             console.log( {fileUri} );
-            return getFileSymbols(fileUri);
+            return getFileSymbols(fileUri).then(data => createTemplateInTree([data], [infoAboutFilePath])[0]);
         });
 
-        const filesContent = await Promise.all(files).then(data => {
-
-            return compareTree(data);
+        const filesContent = await Promise.all(files)
+            .then(data => compareTree(data))
+            .then(data => filterTree(data, 0.75))
+            .then(data => treeSymbolToFlattArray(data));
 
-        }).then(data => filterTree(data, 0.75));
+            
 
-        console.log({ filesContent });
+        console.log({ files, filesContent });
 
-        const content = joinSymbolToString(filesContent);
+        const content = joinSymbolToString(filesContent, [infoAboutNewFile]);
+
+
         // const [baseFile, ...otherFiles] = contents;
         // const linesToGenerate: string[] = baseFile
         //     .filter((line) => this.allFilesIncludeThisLine(otherFiles, line));

diff --git a/src/symbolInformation/compareTree.ts b/src/symbolInformation/compareTree.ts
@@ -1,3 +1,6 @@
+import { PathInfo } from '../fileInfo/getInfoAboutPath';
+import { compareVariableTemplate } from '../variableTemplate/compareVariableTemplate';
+import { createVariableTemplate } from '../variableTemplate/createVariableTemplate';
 import { FileSymbol } from './getFileSymbols';
 
 
@@ -7,11 +10,59 @@ export interface FileSymbolCompare {
     children: FileSymbolCompare[];
 }
 
-function compareFileSymbol (elem1:FileSymbol, elem2:FileSymbol) {
+
+function haveSameKind (elem1:FileSymbol, elem2:FileSymbol) {
+    return elem1.kind === elem2.kind ;
+}
+
+function haveSameValue (elem1:FileSymbol, elem2:FileSymbol) {
+
     if(elem1.children.length > 0 &&  elem2.children.length > 0) {
-        return elem1.kind === elem2.kind;
+        return true;
     }
-    return elem1.kind === elem2.kind && elem1.value === elem2.value;
+    return compareVariableTemplate(elem1.value, elem2.value);
+}
+
+// function haveSameFirstChildren (elem1:FileSymbol, elem2:FileSymbol) {
+
+//     if(elem1.children.length === 0 && elem2.children.length === 0) {
+//         return true;
+//     }
+
+//     if(elem1.children.length > 0 && elem2.children.length > 0) {
+//         return haveSameKind(elem1.children[0], elem2.children[0]) && haveSameValue(elem1.children[0], elem2.children[0]);
+//     }
+
+//     return false;
+// }
+
+// function haveSameLastChildren (elem1:FileSymbol, elem2:FileSymbol) {
+
+//     if(elem1.children.length === 0 && elem2.children.length === 0) {
+//         return true;
+//     }
+
+//     if(elem1.children.length > 0 && elem2.children.length > 0) {
+//         return haveSameKind(elem1.children[elem1.children.length-1], elem2.children[elem2.children.length-1]) && haveSameValue(elem1.children[elem1.children.length-1], elem2.children[elem2.children.length-1]);
+//     }
+
+//     return false;
+// }
+
+
+function compareFileSymbol (elem1:FileSymbol, elem2:FileSymbol) {
+    if(!haveSameKind(elem1, elem2)){
+        return false;
+    }
+
+    // if(!haveSameFirstChildren(elem1, elem2)){
+    //     return false;
+    // }
+
+    // if(!haveSameLastChildren(elem1, elem2)){
+    //     return false;
+    // }
+    return haveSameValue(elem1, elem2);
 }
 
 export function compareTree(trees: FileSymbol[], isSameElement = compareFileSymbol, numberOfFiles = trees.length): FileSymbolCompare[] {
@@ -53,3 +104,13 @@ export function filterTree(trees: FileSymbolCompare[], minPercentValue = 0.8): F
         children: filterTree(tree.children, minPercentValue)
     }));
 }
+
+
+export function createTemplateInTree(trees: FileSymbol[], infoAboutFile: PathInfo[]): FileSymbol[] {
+
+    return trees.map(tree => ({
+        ...tree,
+        value: createVariableTemplate(tree.value, infoAboutFile),
+        children: createTemplateInTree(tree.children, infoAboutFile)
+    }));
+}
diff --git a/src/symbolInformation/joinSymbolToString.ts b/src/symbolInformation/joinSymbolToString.ts
@@ -1,31 +1,26 @@
+import { PathInfo } from '../fileInfo/getInfoAboutPath';
+import { renderVariableTemplate } from '../variableTemplate/renderVariableTemplate';
 import { FileSymbolCompare } from './compareTree';
 
-
-
-
-export function joinSymbolToFlattArray(symbols: FileSymbolCompare[]): FileSymbolCompare[] {
+export function treeSymbolToFlattArray(symbols: FileSymbolCompare[]): FileSymbolCompare[] {
     if(symbols.every(symbol => symbol.children.length === 0)) {
         return symbols;
     }
 
     const flatten: FileSymbolCompare[] = [];
     symbols.forEach(symbol => {
-
-
         if(symbol.children.length !== 0 ) {
-
             flatten.push(...symbol.children);
-        }else {
-
+        } else {
             flatten.push(symbol);
         }
     });
 
-    return joinSymbolToFlattArray(flatten);
+    return treeSymbolToFlattArray(flatten);
 }
 
-export function joinSymbolToString(trees: FileSymbolCompare[]): string {
-    return joinSymbolToFlattArray(trees).map(item => item.items[0].text).join('');
+export function joinSymbolToString(trees: FileSymbolCompare[], infoAboutFile: PathInfo[]): string {
+    return trees.map(item => renderVariableTemplate(item.items[0].text, infoAboutFile )).join('');
 }