Merge pull request #2606 from vitaliyboykocontributor/2602-java.lang.IllegalArgumentException

Handle null PsiDirectory input in GetModuleNameByDirectoryUtil.

Author: VitaliyBoyko

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
+## 2025.2.2
+
+### Fixed
+
+- Null PsiDirectory input in GetModuleNameByDirectoryUtil [#2606](https://github.com/magento/magento2-phpstorm-plugin/pull/2606)
+
 ## 2025.2.1
 
 ### Fixed

gradle.properties

@@ -1,7 +1,7 @@
 pluginGroup = com.magento.idea.magento2plugin
 pluginName = Magento PhpStorm
 pluginRepositoryUrl = https://github.com/magento/magento2-phpstorm-plugin
-pluginVersion = 2025.2.1
+pluginVersion = 2025.2.2
 pluginSinceBuild = 250.*
 pluginUntilBuild = 258.*
 platformType = PS

src/main/java/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectoryUtil.java

@@ -32,9 +32,13 @@ private GetModuleNameByDirectoryUtil() {}
      * @return String
      */
     public static @Nullable String execute(
-            final @NotNull PsiDirectory psiDirectory,
+            final @Nullable PsiDirectory psiDirectory,
             final @NotNull Project project
     ) {
+        // Gracefully handle null directory inputs from callers
+        if (psiDirectory == null) {
+            return null;
+        }
         // Check if directory is theme directory and return module name from directory path if yes
         final String path = psiDirectory.getVirtualFile().getPath();
         final Pattern pattern = Pattern.compile(RegExUtil.CustomTheme.MODULE_NAME);

src/main/resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin require-restart="true">
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>2025.2.1</version>
+    <version>2025.2.2</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[