Merge branch '5.4.0-develop' into fix-bug-ConfigurasiManager

Author: GiraldoNainggolan

CHANGELOG.md

@@ -8,7 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ### Fixed
 
-- Fixed compatibility with PhpStorm/IntelliJ 2025.* [#2495](https://github.com/magento/magento2-phpstorm-plugin/pull/2495)
+- Compatibility with PhpStorm/IntelliJ 2025.* [#2495](https://github.com/magento/magento2-phpstorm-plugin/pull/2495)
+- "Copy Path/Reference" does not show the preview value [#2497](https://github.com/magento/magento2-phpstorm-plugin/pull/2497)
+- Must not start write action from within read action in the other thread [#2498](https://github.com/magento/magento2-phpstorm-plugin/pull/2498)
+- URN map generation during indexing [#2499](https://github.com/magento/magento2-phpstorm-plugin/pull/2499)
 
 ## 2025.0.0
 

src/main/java/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java

@@ -6,8 +6,6 @@
 package com.magento.idea.magento2plugin.actions;
 
 import com.intellij.ide.actions.CopyPathProvider;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -27,8 +25,7 @@ public class CopyMagentoPath extends CopyPathProvider {
     public static final String PHTML_EXTENSION = "phtml";
     public static final String JS_EXTENSION = "js";
     public static final String CSS_EXTENSION = "css";
-    private final List<String> acceptedTypes
-            = Arrays.asList(PHTML_EXTENSION, JS_EXTENSION, CSS_EXTENSION);
+    public static final String HTML_EXTENSION = "html";
     private static final List<String> SUPPORTED_IMAGE_EXTENSIONS
             = new ArrayList<>(Arrays.asList(ImageIO.getReaderFormatNames()));
     public static final String SEPARATOR = "::";
@@ -57,20 +54,6 @@ public CopyMagentoPath() {
         SUPPORTED_IMAGE_EXTENSIONS.add("svg");
     }
 
-    @Override
-    public void update(@NotNull final AnActionEvent event) {
-        final VirtualFile virtualFile = event.getData(PlatformDataKeys.VIRTUAL_FILE);
-        if (isNotValidFile(virtualFile)) {
-            event.getPresentation().setVisible(false);
-        }
-    }
-
-    private boolean isNotValidFile(final VirtualFile virtualFile) {
-        return virtualFile != null && virtualFile.isDirectory()
-                || virtualFile != null && !acceptedTypes.contains(virtualFile.getExtension())
-                && !SUPPORTED_IMAGE_EXTENSIONS.contains(virtualFile.getExtension());
-    }
-
     @Override
     public @Nullable String getPathToElement(
             final @NotNull Project project,
@@ -94,30 +77,61 @@ private boolean isNotValidFile(final VirtualFile virtualFile) {
         final StringBuilder fullPath = new StringBuilder(virtualFile.getPath());
 
         index = -1;
-        String[] paths;
+        final String[] paths;
 
         if (PHTML_EXTENSION.equals(virtualFile.getExtension())) {
             paths = templatePaths;
-        } else if (JS_EXTENSION.equals(virtualFile.getExtension())
-                || CSS_EXTENSION.equals(virtualFile.getExtension())
-                || SUPPORTED_IMAGE_EXTENSIONS.contains(virtualFile.getExtension())) {
+        } else if (isMagentoFile(virtualFile)) {
             paths = webPaths;
         } else {
-            return fullPath.toString();
+            return "";
         }
 
         try {
-            final int endIndex = getIndexOf(paths, fullPath, paths[++index]);
-            final int offset = paths[index].length();
-
-            fullPath.replace(0, endIndex + offset, "");
-
-            return moduleName + SEPARATOR + fullPath;
+            return getResultPath(virtualFile, paths, fullPath, moduleName);
         } catch (ArrayIndexOutOfBoundsException exception) {
-            return fullPath.toString();
+            return "";
         }
     }
 
+    /**
+     * Determines if the provided file is supported by Magento Path.
+     *
+     * @param virtualFile the virtual file to be checked
+     * @return bool
+     */
+    private static boolean isMagentoFile(@NotNull final VirtualFile virtualFile) {
+        return JS_EXTENSION.equals(virtualFile.getExtension())
+                || CSS_EXTENSION.equals(virtualFile.getExtension())
+                || HTML_EXTENSION.equals(virtualFile.getExtension())
+                || SUPPORTED_IMAGE_EXTENSIONS.contains(virtualFile.getExtension());
+    }
+
+    /**
+     * Constructs a result.
+     *
+     * @param virtualFile the virtual file being processed
+     * @param paths an array of potential path segments to be checked
+     * @param fullPath the full path of the virtual file as a mutable string builder
+     * @param moduleName the name of the module associated with the file
+     * @return the constructed result path
+     */
+    private @NotNull String getResultPath(
+            @NotNull final VirtualFile virtualFile,
+            final String[] paths,
+            final StringBuilder fullPath,
+            final String moduleName
+    ) {
+        final int endIndex = getIndexOf(paths, fullPath, paths[++index]);
+        final int offset = paths[index].length();
+
+        fullPath.replace(0, endIndex + offset, "");
+
+        return PHTML_EXTENSION.equals(virtualFile.getExtension())
+                ? moduleName + SEPARATOR + fullPath
+                : moduleName + "/" + fullPath.substring(0, fullPath.lastIndexOf("."));
+    }
+
     /**
      * Get index where web|template path starts in the fullPath.
      *

src/main/java/com/magento/idea/magento2plugin/inspections/php/fix/PhpModuleNameQuickFix.java

@@ -7,6 +7,7 @@
 
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
@@ -38,7 +39,9 @@ public void applyFix(
     ) {
         final StringLiteralExpression expression =
                 (StringLiteralExpression) descriptor.getPsiElement();
-        applyFix(expression);
+        if (ApplicationManager.getApplication().isDispatchThread()) {
+            applyFix(expression);
+        }
     }
 
     private void applyFix(final StringLiteralExpression expression) {

src/main/java/com/magento/idea/magento2plugin/project/RegenerateUrnMapListener.java

@@ -10,6 +10,7 @@
 import com.intellij.notification.NotificationGroupManager;
 import com.intellij.notification.NotificationType;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
@@ -46,17 +47,31 @@ public RegenerateUrnMapListener(final @NotNull Project project) {
      * @param event MouseEvent
      */
     @Override
+    @SuppressWarnings("PMD.UseNotifyAllInsteadOfNotify")
     public void mouseClicked(final MouseEvent event) {
-        final ExternalResourceManager manager =
-                ExternalResourceManager.getInstance();
-        final PsiManager psiManager = PsiManager.getInstance(project);
-        final MagentoComponentManager componentManager =
-                MagentoComponentManager.getInstance(project);
+        if (DumbService.getInstance(project).isDumb()) {
+            NotificationGroupManager.getInstance()
+                    .getNotificationGroup("Magento Notifications")
+                    .createNotification(
+                            "URN map generation unavailable",
+                            "Indexing is in progress."
+                                    + " Please wait for it to complete"
+                                    + " before running URN mapping generation.",
+                            NotificationType.WARNING
+                    )
+                    .notify(project);
+            return;
+        }
 
         ApplicationManager.getApplication().runWriteAction(
                 new Runnable() {
                     @Override
                     public void run() {
+                        final PsiManager psiManager = PsiManager.getInstance(project);
+                        final MagentoComponentManager componentManager =
+                                MagentoComponentManager.getInstance(project);
+                        final ExternalResourceManager manager =
+                                ExternalResourceManager.getInstance();
                         final Collection<VirtualFile> xsdFiles
                                 = FilenameIndex.getAllFilesByExt(project, "xsd");
                         final Collection<MagentoComponent> components

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

@@ -151,8 +151,8 @@
 
         <action id="CopyMagentoPath"
                 class="com.magento.idea.magento2plugin.actions.CopyMagentoPath"
-                text="Magento Path"
-                description="Copies Magento's path of file depending on file type">
+                text="Magento Asset"
+                description="Copies Magento-formatted file asset path depending on file type">
             <add-to-group group-id="CopyFileReference" anchor="last"/>
         </action>
         <group id="UctReindexMenu">