make wurst.dependencies obsolete

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/LanguageWorker.java

@@ -223,7 +223,8 @@ private Workitem getNextWorkItem() {
     }
 
     private boolean isWurstDependencyFile(PendingChange change) {
-        return change.getFilename().getUriString().endsWith("wurst.dependencies");
+        String uri = change.getFilename().getUriString().replace('\\', '/');
+        return uri.contains("/_build/dependencies/");
     }
 
     private PendingChange removeFirst(Map<WFile, PendingChange> changes) {

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ModelManagerImpl.java

@@ -35,7 +35,7 @@ public class ModelManagerImpl implements ModelManager {
     private final BufferManager bufferManager;
     private volatile @Nullable WurstModel model;
     private final File projectPath;
-    // dependency folders (folders mentioned in wurst.dependencies)
+    // dependency project folders discovered in _build/dependencies
     private final Set<File> dependencies = Sets.newLinkedHashSet();
     // private WurstGui gui = new WurstGuiLogger();
     private final List<Consumer<PublishDiagnosticsParams>> onCompilationResultListeners = new ArrayList<>();
@@ -129,7 +129,7 @@ public void clean() {
     public void buildProject() {
         try {
             WurstGui gui = new WurstGuiLogger();
-            readDependencies(gui);
+            readDependencies();
 
             if (!projectPath.exists()) {
                 throw new RuntimeException("Folder " + projectPath + " does not exist!");
@@ -145,7 +145,7 @@ public void buildProject() {
             resolveImports(gui);
 
             doTypeCheck(gui);
-        } catch (IOException e) {
+        } catch (Exception e) {
             WLogger.severe(e);
             throw new ModelManagerException(e);
         }
@@ -174,14 +174,8 @@ private void processWurstFile(WFile f) {
         replaceCompilationUnit(f);
     }
 
-    private void readDependencies(WurstGui gui) throws IOException {
+    private void readDependencies() {
         dependencies.clear();
-        File depFile = new File(projectPath, "wurst.dependencies");
-        if (!depFile.exists()) {
-            WLogger.info("no dependency file found.");
-            return;
-        }
-        dependencies.addAll(WurstCompilerJassImpl.checkDependencyFile(depFile, gui));
         WurstCompilerJassImpl.addDependenciesFromFolder(projectPath, dependencies);
     }
 

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

@@ -875,7 +875,7 @@ private void runRunmapLikeCompile_Closer(File projectFolder, ModelManagerImpl ma
     public void runmapPurge_keepsProjectWar3MapAndPurgesUnimportedDependency() throws Exception {
         File projectFolder = new File("./temp/testProject_runmap_purge_dep/");
         File wurstFolder = new File(projectFolder, "wurst");
-        File dependencyRoot = new File(projectFolder, "depA");
+        File dependencyRoot = new File(new File(new File(projectFolder, "_build"), "dependencies"), "depA");
         File dependencyWurst = new File(dependencyRoot, "wurst");
         newCleanFolder(wurstFolder);
         newCleanFolder(dependencyWurst);
@@ -897,7 +897,6 @@ public void runmapPurge_keepsProjectWar3MapAndPurgesUnimportedDependency() throw
             "init",
             "    skip"
         ));
-        Files.writeString(new File(projectFolder, "wurst.dependencies").toPath(), dependencyRoot.getAbsolutePath() + "\n");
 
         ModelManagerImpl manager = new ModelManagerImpl(projectFolder, new BufferManager());
         manager.buildProject();
@@ -915,7 +914,7 @@ public void runmapPurge_keepsProjectWar3MapAndPurgesUnimportedDependency() throw
     public void runmapPurge_onlyKeepsWar3MapFromProjectWurstFolder() throws Exception {
         File projectFolder = new File("./temp/testProject_runmap_purge_war3map_scope/");
         File wurstFolder = new File(projectFolder, "wurst");
-        File dependencyRoot = new File(projectFolder, "depB");
+        File dependencyRoot = new File(new File(new File(projectFolder, "_build"), "dependencies"), "depB");
         File dependencyWurst = new File(dependencyRoot, "wurst");
         newCleanFolder(wurstFolder);
         newCleanFolder(dependencyWurst);
@@ -929,7 +928,6 @@ public void runmapPurge_onlyKeepsWar3MapFromProjectWurstFolder() throws Exceptio
         writeFile(fileMain, "package Main\n");
         writeFile(fileProjectWar3Map, "globals\nendglobals\n");
         writeFile(fileDependencyWar3Map, "globals\nendglobals\n");
-        Files.writeString(new File(projectFolder, "wurst.dependencies").toPath(), dependencyRoot.getAbsolutePath() + "\n");
 
         ModelManagerImpl manager = new ModelManagerImpl(projectFolder, new BufferManager());
         manager.buildProject();