Merge pull request #2641 from vitaliyboykocontributor/deprecated-stuff-cleanup

Replace `THashMap` and `THashSet` with `HashMap` and `HashSet`, updat…

Author: VitaliyBoyko

.gitignore

@@ -38,4 +38,5 @@ out
 build
 .intellijPlatform/*
 video/*
-intellij-test-project
+intellij-test-project
+.ai

src/main/java/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java

@@ -12,6 +12,7 @@
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -35,8 +36,6 @@ public class CompareTemplateAction extends AnAction {
     public static final String ACTION_DESCRIPTION = "The Magento 2 overridden template comparing";
 
     private static final String PHTML_EXTENSION = "phtml";
-    protected VirtualFile selectedFile;
-    protected VirtualFile originalFile;
 
     /**
      * Compare template action constructor.
@@ -54,90 +53,89 @@ public CompareTemplateAction() {
     @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
     public void update(final @NotNull AnActionEvent event) {
         setStatus(event, false);
-        final Project project = event.getData(PlatformDataKeys.PROJECT);
+        if (resolveComparisonFiles(event) != null) {
+            this.setStatus(event, true);
+        }
+    }
 
-        if (project == null) {
+    @Override
+    public void actionPerformed(final @NotNull AnActionEvent event) {
+        final Project project = event.getProject();
+        final Pair<VirtualFile, VirtualFile> comparisonFiles = resolveComparisonFiles(event);
+
+        if (project == null || comparisonFiles == null) {
             return;
         }
+        final DiffRequestChain chain = DiffRequestChainUtil.createMutableChain(
+                project,
+                comparisonFiles.getFirst(),
+                comparisonFiles.getSecond()
+        );
 
-        if (!Settings.isEnabled(project)) {
+        if (chain == null) {
             return;
         }
+        DiffManager.getInstance().showDiff(
+                project,
+                chain,
+                DiffDialogHints.DEFAULT
+        );
+    }
+
+    private @Nullable String getOriginalModuleName(
+            final @NotNull Project project,
+            final @NotNull PsiFile psiFile
+    ) {
+        final PsiDirectory directory = psiFile.getContainingDirectory();
+
+        return GetModuleNameByDirectoryUtil.execute(directory, project);
+    }
+
+    private @Nullable Pair<VirtualFile, VirtualFile> resolveComparisonFiles(
+            final @NotNull AnActionEvent event
+    ) {
+        final Project project = event.getData(PlatformDataKeys.PROJECT);
+
+        if (project == null || !Settings.isEnabled(project)) {
+            return null;
+        }
         final PsiFile psiFile = event.getData(PlatformDataKeys.PSI_FILE);
 
         if (psiFile == null) {
-            return;
+            return null;
         }
         final VirtualFile targetFileCandidate = psiFile.getVirtualFile();
 
-        if (targetFileCandidate == null) {
-            return;
-        }
-
-        if (!PHTML_EXTENSION.equals(targetFileCandidate.getExtension())) {
-            return;
+        if (targetFileCandidate == null || !PHTML_EXTENSION.equals(targetFileCandidate.getExtension())) {
+            return null;
         }
         final Areas area = AreaResolverUtil.getForFileInCustomTheme(targetFileCandidate);
 
         if (area == null) {
-            return;
+            return null;
         }
         final String originalModuleName = getOriginalModuleName(project, psiFile);
 
         if (originalModuleName == null) {
-            return;
+            return null;
         }
         final PsiDirectory originalModuleDirectory =
                 new ModuleIndex(project).getModuleDirectoryByModuleName(originalModuleName);
 
         if (originalModuleDirectory == null) {
-            return;
+            return null;
         }
         final String originalFilePath = originalModuleDirectory.getVirtualFile().getPath()
                 + "/view/"
                 + area
                 + StringUtils.substringAfter(targetFileCandidate.getPath(), originalModuleName);
+        final VirtualFile originalFile = VfsUtil.findFile(Path.of(originalFilePath), false);
 
-        final VirtualFile origFileCandidate = VfsUtil.findFile(Path.of(originalFilePath), false);
-
-        if (origFileCandidate == null) {
-            return;
-        }
-        selectedFile = targetFileCandidate;
-        originalFile = origFileCandidate;
-        this.setStatus(event, true);
-    }
-
-    @Override
-    public void actionPerformed(final @NotNull AnActionEvent event) {
-        final Project project = event.getProject();
-
-        if (project == null || selectedFile == null || originalFile == null) {
-            return;
-        }
-        final DiffRequestChain chain = DiffRequestChainUtil.createMutableChain(
-                project,
-                selectedFile,
-                originalFile
-        );
-
-        if (chain == null) {
-            return;
+        if (originalFile == null) {
+            return null;
         }
-        DiffManager.getInstance().showDiff(
-                project,
-                chain,
-                DiffDialogHints.DEFAULT
-        );
-    }
-
-    private @Nullable String getOriginalModuleName(
-            final @NotNull Project project,
-            final @NotNull PsiFile psiFile
-    ) {
-        final PsiDirectory directory = psiFile.getContainingDirectory();
 
-        return GetModuleNameByDirectoryUtil.execute(directory, project);
+        return Pair.create(targetFileCandidate, originalFile);
     }
 
     private void setStatus(final AnActionEvent event, final boolean status) {

src/main/java/com/magento/idea/magento2plugin/actions/comparator/util/DiffRequestChainUtil.java

@@ -7,7 +7,6 @@
 
 import com.intellij.diff.DiffContentFactory;
 import com.intellij.diff.DiffRequestFactory;
-import com.intellij.diff.actions.BlankDiffWindowUtil;
 import com.intellij.diff.actions.impl.MutableDiffRequestChain;
 import com.intellij.diff.contents.DiffContent;
 import com.intellij.diff.contents.DocumentContent;
@@ -43,12 +42,12 @@ private DiffRequestChainUtil() {}
             return null;
         }
 
-        final MutableDiffRequestChain chain = BlankDiffWindowUtil.createBlankDiffRequestChain(
+        final MutableDiffRequestChain chain = new MutableDiffRequestChain(
                 (DocumentContent) targetContent,
                 (DocumentContent) baseContent,
-                null
+                project
         );
-        chain.setWindowTitle(DiffRequestFactory.getInstance().getTitle(targetFile, baseFile));
+        chain.setWindowTitle(DiffRequestFactory.getInstance().getTitleForComparison(targetFile, baseFile));
 
         return chain;
     }

src/main/java/com/magento/idea/magento2plugin/actions/content/root/MarkDirectoryAsMagentoContentRot.java

@@ -22,8 +22,8 @@
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.util.magento.MagentoPathUrlUtil;
+import java.net.URI;
 import java.net.MalformedURLException;
-import java.net.URL;
 import org.jetbrains.annotations.NotNull;
 
 public class MarkDirectoryAsMagentoContentRot extends MarkRootActionBase {
@@ -51,8 +51,8 @@ protected void modifyRoots(
                 settings.getMagentoFolders().removeIf(folder -> {
                     final VirtualFile file;
                     try {
-                        file = VfsUtil.findFileByURL(new URL(folder));
-                    } catch (MalformedURLException e) {
+                        file = VfsUtil.findFileByURL(URI.create(folder).toURL());
+                    } catch (IllegalArgumentException | MalformedURLException e) {
                         return false;
                     }
                     return file == null || !file.exists();

src/main/java/com/magento/idea/magento2plugin/actions/content/root/UnmarkDirectoryAsMagentoContentRot.java

@@ -20,8 +20,8 @@
 import com.intellij.psi.PsiElement;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.util.magento.MagentoPathUrlUtil;
+import java.net.URI;
 import java.net.MalformedURLException;
-import java.net.URL;
 import org.jetbrains.annotations.NotNull;
 
 public class UnmarkDirectoryAsMagentoContentRot extends MarkRootActionBase {
@@ -39,8 +39,8 @@ protected void modifyRoots(
                 settings.getMagentoFolders().removeIf(folder -> {
                     final VirtualFile file;
                     try {
-                        file = VfsUtil.findFileByURL(new URL(folder));
-                    } catch (MalformedURLException e) {
+                        file = VfsUtil.findFileByURL(URI.create(folder).toURL());
+                    } catch (IllegalArgumentException | MalformedURLException e) {
                         return false;
                     }
                     return file == null || !file.exists();

src/main/java/com/magento/idea/magento2plugin/actions/context/CustomGeneratorContextAction.java

@@ -21,10 +21,6 @@
 
 public abstract class CustomGeneratorContextAction extends AnAction {
 
-    private @Nullable GetMagentoModuleUtil.MagentoModuleData moduleData;
-    private @Nullable PsiDirectory directory;
-    private @Nullable PsiFile file;
-
     /**
      * Abstract context action with custom generation constructor.
      *
@@ -41,48 +37,14 @@ public CustomGeneratorContextAction(
     @Override
     public void update(final @NotNull AnActionEvent event) {
         setIsAvailableForEvent(event, false);
-        final Project project = event.getProject();
-
-        if (project == null || !Settings.isEnabled(project)) {
-            return;
-        }
-        final PsiDirectory targetDirectory = GetTargetElementUtil.getDirFromEvent(event);
-
-        if (targetDirectory == null) {
-            return;
-        }
-        final GetMagentoModuleUtil.MagentoModuleData magentoModuleData = GetMagentoModuleUtil
-                .getByContext(targetDirectory, project);
-        final PsiFile targetFile = GetTargetElementUtil.getFileFromEvent(event);
+        final ActionContext context = resolveActionContext(event);
 
-        if (magentoModuleData == null
-                || magentoModuleData.getName() == null
-                || !isVisible(magentoModuleData, targetDirectory, targetFile)) {
+        if (context == null || context.moduleData.getName() == null) {
             return;
         }
-        directory = targetDirectory;
-        file = targetFile;
-        moduleData = magentoModuleData;
         setIsAvailableForEvent(event, true);
     }
 
-    /**
-     * Get clicked on module data object.
-     *
-     * @return GetMagentoModuleUtil.MagentoModuleData
-     */
-    public @Nullable GetMagentoModuleUtil.MagentoModuleData getModuleData() {
-        return moduleData;
-    }
-
-    public @Nullable PsiDirectory getDirectory() {
-        return directory;
-    }
-
-    public @Nullable PsiFile getFile() {
-        return file;
-    }
-
     @Override
     public @NotNull ActionUpdateThread getActionUpdateThread() {
         return ActionUpdateThread.BGT;
@@ -104,6 +66,28 @@ protected abstract boolean isVisible(
             final PsiFile targetFile
     );
 
+    protected @Nullable ActionContext resolveActionContext(final @NotNull AnActionEvent event) {
+        final Project project = event.getProject();
+
+        if (project == null || !Settings.isEnabled(project)) {
+            return null;
+        }
+        final PsiDirectory targetDirectory = GetTargetElementUtil.getDirFromEvent(event);
+
+        if (targetDirectory == null) {
+            return null;
+        }
+        final GetMagentoModuleUtil.MagentoModuleData moduleData = GetMagentoModuleUtil
+                .getByContext(targetDirectory, project);
+        final PsiFile targetFile = GetTargetElementUtil.getFileFromEvent(event);
+
+        if (moduleData == null || !isVisible(moduleData, targetDirectory, targetFile)) {
+            return null;
+        }
+
+        return new ActionContext(moduleData, targetDirectory, targetFile);
+    }
+
     /**
      * Set is action available for event.
      *
@@ -117,4 +101,32 @@ private void setIsAvailableForEvent(
         event.getPresentation().setVisible(isAvailable);
         event.getPresentation().setEnabled(isAvailable);
     }
+
+    protected static final class ActionContext {
+        private final GetMagentoModuleUtil.MagentoModuleData moduleData;
+        private final PsiDirectory directory;
+        private final PsiFile file;
+
+        private ActionContext(
+                final @NotNull GetMagentoModuleUtil.MagentoModuleData moduleData,
+                final @NotNull PsiDirectory directory,
+                final @Nullable PsiFile file
+        ) {
+            this.moduleData = moduleData;
+            this.directory = directory;
+            this.file = file;
+        }
+
+        public @NotNull GetMagentoModuleUtil.MagentoModuleData getModuleData() {
+            return moduleData;
+        }
+
+        public @NotNull PsiDirectory getDirectory() {
+            return directory;
+        }
+
+        public @Nullable PsiFile getFile() {
+            return file;
+        }
+    }
 }

src/main/java/com/magento/idea/magento2plugin/actions/context/md/NewReadmeMdAction.java

@@ -30,11 +30,12 @@ public NewReadmeMdAction() {
 
     @Override
     public void actionPerformed(final @NotNull AnActionEvent event) {
-        final GetMagentoModuleUtil.MagentoModuleData moduleData = getModuleData();
+        final ActionContext context = resolveActionContext(event);
 
-        if (event.getProject() == null || moduleData == null || getDirectory() == null) {
+        if (event.getProject() == null || context == null) {
             return;
         }
+        final GetMagentoModuleUtil.MagentoModuleData moduleData = context.getModuleData();
         final String[] templateData = moduleData.getName().split(Package.vendorModuleNameSeparator);
 
         if (templateData.length != 2) { //NOPMD
@@ -44,7 +45,7 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
                 new ModuleReadmeMdData(
                         templateData[0],
                         templateData[1],
-                        getDirectory()
+                        context.getDirectory()
                 ),
                 event.getProject()
         );