feature: mage-os support

magento · Jul 7, 2024 · 06a08e8 · 06a08e8
1 parent ad86638
commit 06a08e8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/com/magento/idea/magento2plugin/magento/packages/Package.java b/src/com/magento/idea/magento2plugin/magento/packages/Package.java
@@ -19,4 +19,5 @@ public class Package { //NOPMD
     public static String vendorModuleNameSeparator = "_";
     public static String fqnSeparator = "\\";
     public static String composerType = "project";
+    public static String mageOsFrameworkRootComposer = "vendor/mage-os/framework";
 }
diff --git a/src/com/magento/idea/magento2plugin/magento/packages/code/MagentoVersion.java b/src/com/magento/idea/magento2plugin/magento/packages/code/MagentoVersion.java
@@ -7,12 +7,14 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 
 public enum MagentoVersion {
 
     ENTERPRISE_EDITION("magento/product-enterprise-edition", 1, "Adobe Commerce"),
-    COMMUNITY_EDITION("magento/product-community-edition", 2, "Magento Open Source");
+    COMMUNITY_EDITION("magento/product-community-edition", 2, "Magento Open Source"),
+    MAGEOS_COMMUNITY_EDITION("mage-os/product-community-edition", 3, "Mage-OS Community Edition");
 
     private final String name;
     private final int priority;
@@ -52,9 +54,7 @@ public static List<MagentoVersion> getVersions() {
         final List<MagentoVersion> versions = new ArrayList<>(
                 Arrays.asList(MagentoVersion.values())
         );
-        versions.sort(
-                (version1, version2) -> version1.getPriority() > version2.getPriority() ? 1 : 0
-        );
+        versions.sort(Comparator.comparingInt(MagentoVersion::getPriority));
 
         return versions;
     }

diff --git a/src/com/magento/idea/magento2plugin/project/util/GetMagentoVersionUtil.java b/src/com/magento/idea/magento2plugin/project/util/GetMagentoVersionUtil.java
@@ -73,6 +73,10 @@ private GetMagentoVersionUtil() {
                 if (MagentoVersion.ENTERPRISE_EDITION.getName().equals(name)) {
                     break;
                 }
+
+                if (MagentoVersion.MAGEOS_COMMUNITY_EDITION.getName().equals(name)) {
+                    break;
+                }
             }
         }
 

diff --git a/src/com/magento/idea/magento2plugin/util/magento/MagentoBasePathUtil.java b/src/com/magento/idea/magento2plugin/util/magento/MagentoBasePathUtil.java
@@ -37,6 +37,9 @@ public static boolean isMagentoFolderValid(final String path) {
             ) != null || VfsUtil.findRelativeFile(
                     file,
                     Package.frameworkRootGit.split(Package.V_FILE_SEPARATOR)
+            ) != null || VfsUtil.findRelativeFile(
+                    file,
+                    Package.mageOsFrameworkRootComposer.split(Package.V_FILE_SEPARATOR)
             ) != null;
         }