Replace THashMap and THashSet with HashMap and HashSet, update deprecated APIs, and improve code readability in indexing, inspections, and completion providers.

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/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/generation/PluginGenerateMethodHandlerBase.java

@@ -17,7 +17,6 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.util.containers.ContainerUtil;
 import com.jetbrains.php.codeInsight.PhpCodeInsightUtil;
 import com.jetbrains.php.lang.actions.PhpNamedElementNode;
 import com.jetbrains.php.lang.lexer.PhpTokenTypes;
@@ -41,8 +40,9 @@
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import com.magento.idea.magento2plugin.util.magento.plugin.GetTargetClassNamesByPluginClassName;
 import com.magento.idea.magento2plugin.util.magento.plugin.IsPluginAllowedForMethodUtil;
-import gnu.trove.THashSet;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -126,7 +126,7 @@ public void invoke(
         final CodeStyleSettings codeStyleSettings = new CodeStyleSettings(pluginPhpFile);
         codeStyleSettings.adjustBeforeWrite();
         ApplicationManager.getApplication().runWriteAction(() -> {
-            final Set<CharSequence> insertedMethodsNames = new THashSet();
+            final Set<CharSequence> insertedMethodsNames = new HashSet<>();
             final PhpClassReferenceResolver resolver = new PhpClassReferenceResolver();
             final StringBuffer textBuf = new StringBuffer();
             final PhpPsiElement scope = PhpCodeInsightUtil.findScopeForUseOperator(pluginClass);
@@ -315,7 +315,7 @@ protected boolean pluginAlreadyHasMethod(
     public static Collection<PhpNamedElementNode> fixOrderToBeAsOriginalFiles(
             final PhpNamedElementNode... selected
     ) {
-        final List<PhpNamedElementNode> newSelected = ContainerUtil.newArrayList(selected);
+        final List<PhpNamedElementNode> newSelected = new ArrayList<>(List.of(selected));
         newSelected.sort((o1, o2) -> {
             final PsiElement psiElement = o1.getPsiElement();
             final PsiElement psiElement2 = o2.getPsiElement();

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewCLICommandDialog.java

@@ -145,7 +145,7 @@ public String getCLICommandDescription() {
     public String getDIXmlItemName() {
         final String diItemName = this.toSnakeCase.convert(this.getCLICommandClassName());
 
-        return this.moduleName.toLowerCase(new Locale("en","EN"))
+        return this.moduleName.toLowerCase(Locale.ROOT)
                 + "_"
                 + diItemName;
     }

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/PhpNamespaceNameRule.java

@@ -15,7 +15,7 @@ public class PhpNamespaceNameRule implements ValidationRule {
 
     @Override
     public boolean check(final @NotNull String value) {
-        return PhpNameUtil.isValidNamespaceName(value);
+        return PhpNameUtil.isValidNamespaceFullName(value);
     }
 
     public static ValidationRule getInstance() {

src/main/java/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java

@@ -39,8 +39,8 @@
 import com.magento.idea.magento2plugin.magento.packages.MagentoPhpClass;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
-import gnu.trove.THashSet;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
@@ -157,7 +157,7 @@ public PsiFile generate(final String actionName) {
                 return;
             }
 
-            final Set<CharSequence> insertedMethodsNames = new THashSet();
+            final Set<CharSequence> insertedMethodsNames = new HashSet<>();
             final PhpClassReferenceResolver resolver = new PhpClassReferenceResolver();
             final StringBuffer textBuf = new StringBuffer();
 

src/main/java/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java

@@ -163,9 +163,9 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                 .appendProperty("BUTTONS", data.getButtons().isEmpty() ? "" : "true")
                 .appendProperty("ROUTE", data.getRoute())
                 .appendProperty("SUBMIT_CONTROLLER",
-                        data.getSubmitControllerName().toLowerCase(new Locale("en","EN")))
+                        data.getSubmitControllerName().toLowerCase(Locale.ROOT))
                 .appendProperty("SUBMIT_ACTION",
-                        data.getSubmitActionName().toLowerCase(new Locale("en","EN")))
+                        data.getSubmitActionName().toLowerCase(Locale.ROOT))
                 .appendProperty("DATA_PROVIDER",
                         new UiComponentDataProviderFile(
                                 data.getModuleName(),

src/main/java/com/magento/idea/magento2plugin/actions/generation/references/PhpClassReferenceResolver.java

@@ -20,7 +20,7 @@
 import com.jetbrains.php.lang.psi.elements.Statement;
 import com.jetbrains.php.lang.psi.resolve.types.PhpType;
 import com.jetbrains.php.refactoring.PhpAliasImporter;
-import gnu.trove.THashMap;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -125,7 +125,7 @@ private Map<String, String> importWithConflictResolve(
             final @NotNull PhpPsiElement scopeHolder
     ) {
         final Map<String, String> aliases = PhpCodeInsightUtil.getAliasesInScope(scopeHolder);
-        final Map<String, String> referencesToReplace = new THashMap<>();
+        final Map<String, String> referencesToReplace = new HashMap<>();
         final boolean autoImport = PhpCodeInsightUtil.isAutoImportEnabled(scopeHolder);
 
         for (final String name : this.myCandidatesToImportStorage.getNames()) {