get rid of wurst.dependencies

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/WurstCompilerJassImpl.java

@@ -2,7 +2,6 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -41,7 +40,6 @@
 
 import java.io.*;
 import java.lang.ref.WeakReference;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Function;
@@ -148,49 +146,12 @@ public void loadWurstFilesInDir(File dir) {
                 loadWurstFilesInDir(f);
             } else if (Utils.isWurstFile(f)) {
                 loadFile(f);
-            } else if (f.getName().equals("wurst.dependencies")) {
-                dependencies.addAll(checkDependencyFile(f, gui));
             } else if ((!mapFile.isPresent() || runArgs.isNoExtractMapScript()) && f.getName().equals("war3map.j")) {
                 loadFile(f);
             }
         }
     }
 
-    public static ImmutableList<File> checkDependencyFile(File depFile, WurstGui gui) {
-        List<String> lines;
-        try {
-            lines = Files.readLines(depFile, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            e.printStackTrace();
-            throw new Error(e);
-        }
-        LineOffsets offsets = new LineOffsets();
-        int lineNr = 0;
-        int offset = 0;
-        for (String line : lines) {
-            offsets.set(lineNr, offset);
-            lineNr++;
-            offset += line.length() + 1;
-        }
-        offsets.set(lineNr, offset);
-        lineNr = 0;
-        ImmutableList.Builder<File> dependencies = ImmutableList.builder();
-        for (String line : lines) {
-            int lineOffset = offsets.get(lineNr);
-            WPos pos = new WPos(depFile.getAbsolutePath(), offsets, lineOffset + 1, lineOffset + line.length() + 1);
-            File folder = new File(line);
-            if (!folder.exists()) {
-                gui.sendError(new CompileError(pos, "Folder " + line + " not found."));
-            } else if (!folder.isDirectory()) {
-                gui.sendError(new CompileError(pos, line + " is not a folder."));
-            } else {
-                dependencies.add(folder);
-            }
-            lineNr++;
-        }
-        return dependencies.build();
-    }
-
     @Override
     public @Nullable WurstModel parseFiles() {
 
@@ -220,10 +181,6 @@ public static ImmutableList<File> checkDependencyFile(File depFile, WurstGui gui
             } else {
                 WLogger.info("No wurst folder found in " + relativeWurstDir);
             }
-            File dependencyFile = new File(projectFolder, "wurst.dependencies");
-            if (dependencyFile.exists()) {
-                dependencies.addAll(checkDependencyFile(dependencyFile, gui));
-            }
             addDependenciesFromFolder(projectFolder, dependencies);
         }
 
@@ -373,7 +330,7 @@ private void resolveImport(Function<File, CompilationUnit> addCompilationUnit, S
     private CompilationUnit loadLibPackage(Function<File, CompilationUnit> addCompilationUnit, String imp) {
         File file = getLibs().get(imp);
         if (file == null) {
-            gui.sendError(new CompileError(new WPos("", null, 0, 0), "Could not find lib-package " + imp + ". Are you missing your wurst.dependencies file?"));
+            gui.sendError(new CompileError(new WPos("", null, 0, 0), "Could not find lib-package " + imp + ". Is your dependency present in _build/dependencies?"));
             return Ast.CompilationUnit(new CompilationUnitInfo(errorHandler), Ast.JassToplevelDeclarations(), Ast.WPackages());
         } else {
             return addCompilationUnit.apply(file);

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/DependencyFileParserTest.java

@@ -2,66 +2,63 @@
 
 
 import de.peeeq.wurstio.WurstCompilerJassImpl;
-import de.peeeq.wurstio.languageserver.Convert;
-import de.peeeq.wurstio.languageserver.WFile;
 import de.peeeq.wurstio.utils.FileUtils;
-import de.peeeq.wurstscript.RunArgs;
-import de.peeeq.wurstscript.attributes.CompileError;
-import de.peeeq.wurstscript.gui.WurstGui;
-import de.peeeq.wurstscript.gui.WurstGuiLogger;
-import org.eclipse.lsp4j.Diagnostic;
-import org.eclipse.lsp4j.PublishDiagnosticsParams;
 import org.testng.annotations.Test;
 
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.nio.file.Files;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 public class DependencyFileParserTest {
 
     @Test
-    public void testDepFileParsing() throws IOException {
-        File projectFolder = new File("./temp/testDepFileParsing/");
+    public void testAddDependenciesFromBuildFolder() throws IOException {
+        File projectFolder = new File("./temp/testAddDependenciesFromBuildFolder/");
         newCleanFolder(projectFolder);
-        File a = new File(projectFolder, "a");
-        File b = new File(projectFolder, "b");
-        File c = new File(projectFolder, "c");
+        File depsRoot = new File(new File(projectFolder, "_build"), "dependencies");
+        File a = new File(depsRoot, "a");
+        File b = new File(depsRoot, "b");
+        File ignoredFile = new File(depsRoot, "not-a-dir.txt");
 
         a.mkdirs();
-        //b.mkdirs();
-        c.mkdirs();
+        b.mkdirs();
+        Files.writeString(ignoredFile.toPath(), "x");
 
-        File dep = new File(projectFolder, "wurst.dependencies");
-        try (BufferedWriter w = new BufferedWriter(new FileWriter(dep))) {
-            w.write(a.getAbsolutePath() + "\n");
-            w.write(b.getAbsolutePath() + "\n");
-            w.write(c.getAbsolutePath() + "\n");
-        }
+        List<File> dependencies = new ArrayList<>();
+        WurstCompilerJassImpl.addDependenciesFromFolder(projectFolder, dependencies);
 
+        assertEquals(dependencies.size(), 2);
+        assertTrue(containsSameFile(dependencies, a));
+        assertTrue(containsSameFile(dependencies, b));
+    }
 
-        WurstGui gui = new WurstGuiLogger();
-        WurstCompilerJassImpl comp = new WurstCompilerJassImpl(projectFolder, gui, null, new RunArgs());
-        comp.loadWurstFilesInDir(projectFolder);
+    @Test
+    public void testAddDependenciesFromBuildFolderDoesNotDuplicate() throws IOException {
+        File projectFolder = new File("./temp/testAddDependenciesFromBuildFolderDoesNotDuplicate/");
+        newCleanFolder(projectFolder);
+        File depsRoot = new File(new File(projectFolder, "_build"), "dependencies");
+        File a = new File(depsRoot, "a");
+        a.mkdirs();
 
-        assertEquals(gui.getErrorList().size(), 1);
-        CompileError err = gui.getErrorList().get(0);
-        assertEquals(err.getSource().getLine(), 2);
-        assertEquals(err.getSource().getStartColumn(), 1);
-        assertEquals(err.getSource().getEndLine(), 2);
-        assertEquals(err.getSource().getEndColumn(), b.getAbsolutePath().length() + 1);
+        List<File> dependencies = new ArrayList<>();
+        dependencies.add(a);
 
-        PublishDiagnosticsParams diag = Convert.createDiagnostics("", WFile.create(dep), gui.getErrorList());
-        assertEquals(diag.getDiagnostics().size(), 1);
-        Diagnostic d = diag.getDiagnostics().get(0);
-        assertEquals(d.getRange().getStart().getLine(), 1);
-        assertEquals(d.getRange().getStart().getCharacter(), 0);
-        assertEquals(d.getRange().getEnd().getLine(), 1);
-        assertEquals(d.getRange().getEnd().getCharacter(), b.getAbsolutePath().length());
+        WurstCompilerJassImpl.addDependenciesFromFolder(projectFolder, dependencies);
+        assertEquals(dependencies.size(), 1);
+    }
 
+    private boolean containsSameFile(List<File> files, File expected) {
+        for (File f : files) {
+            if (FileUtils.sameFile(f, expected)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private void newCleanFolder(File f) throws IOException {