Merge multiple compiled XML containers

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/XmlServiceParser.java

@@ -1,5 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.dic;
 
+import fr.adrienbrault.idea.symfony2plugin.dic.container.ServiceInterface;
 import fr.adrienbrault.idea.symfony2plugin.util.service.AbstractServiceParser;
 import org.jetbrains.annotations.NotNull;
 import org.xml.sax.SAXException;
@@ -9,6 +10,8 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import java.io.InputStream;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -25,7 +28,13 @@ public String getXPathFilter() {
 
     public void parser(InputStream file, VirtualFile sourceFile, Project project) {
         try {
-            this.serviceMap = new ServiceMapParser().parse(file);
+            ServiceMap parsedServiceMap = new ServiceMapParser().parse(file);
+            Map<String, ServiceInterface> services = new LinkedHashMap<>();
+
+            this.serviceMap.getServices().forEach(service -> services.put(service.getId(), service));
+            parsedServiceMap.getServices().forEach(service -> services.put(service.getId(), service));
+
+            this.serviceMap = new ServiceMap(services.values());
         } catch (SAXException | IOException | ParserConfigurationException ignored) {
         }
     }
@@ -34,4 +43,4 @@ public void parser(InputStream file, VirtualFile sourceFile, Project project) {
     public ServiceMap getServiceMap() {
         return serviceMap;
     }
-}
+}

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java

@@ -14,6 +14,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -54,7 +56,7 @@ private static <T extends ServiceParserInterface> T buildParser(@NotNull Project
         }
 
         Collection<VirtualFile> settingsServiceFiles = Symfony2ProjectComponent.getContainerFiles(project);
-        for (VirtualFile vf : settingsServiceFiles) {
+        for (VirtualFile vf : new ArrayList<>(settingsServiceFiles).stream().sorted(Comparator.comparing(VirtualFile::getPath)).toList()) {
             if (vf == null || !vf.exists()) {
                 continue;
             }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlServiceParserTest.java

@@ -0,0 +1,36 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.dic;
+
+import com.intellij.openapi.vfs.VirtualFile;
+import fr.adrienbrault.idea.symfony2plugin.dic.XmlServiceParser;
+import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+
+import java.io.InputStream;
+
+public class XmlServiceParserTest extends SymfonyLightCodeInsightFixtureTestCase {
+
+    public void testParserMergesMultipleCompiledContainers() throws Exception {
+        VirtualFile installerContainer = myFixture.addFileToProject(
+            "var/cache/dev/Project_Core_Installer_InstallerKernelDevDebugContainer.xml",
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?><container><service id=\"installer.service\" class=\"App\\\\Installer\\\\InstallerService\"/></container>"
+        ).getVirtualFile();
+
+        VirtualFile kernelContainer = myFixture.addFileToProject(
+            "var/cache/dev_hf90b29260a1c6356fa4264a02dec50e9/Project_Core_KernelDevDebugContainer.xml",
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?><container><service id=\"kernel.service\" class=\"App\\\\Kernel\\\\KernelService\"/></container>"
+        ).getVirtualFile();
+
+        XmlServiceParser parser = new XmlServiceParser();
+
+        try (InputStream inputStream = installerContainer.getInputStream()) {
+            parser.parser(inputStream, installerContainer, getProject());
+        }
+
+        try (InputStream inputStream = kernelContainer.getInputStream()) {
+            parser.parser(inputStream, kernelContainer, getProject());
+        }
+
+        assertTrue(parser.getServiceMap().getIds().contains("installer.service"));
+        assertTrue(parser.getServiceMap().getIds().contains("kernel.service"));
+        assertEquals(2, parser.getServiceMap().getServices().size());
+    }
+}