From b51c8ff48d1b9564fe42cfbfaf139673d47003ca Mon Sep 17 00:00:00 2001
From: makzef <m.pletiuk@atwix.com>
Date: Thu, 13 Oct 2022 17:44:58 +0300
Subject: [PATCH] 1224: Fixed compatibility issues by updating icon constants
---
.../LayoutBlockCompletionContributor.java | 21 ++++++++-------
.../LayoutContainerCompletionContributor.java | 21 ++++++++-------
.../LayoutUpdateCompletionContributor.java | 23 ++++++++--------
.../UiComponentCompletionProvider.java | 4 +--
.../VirtualTypeCompletionProvider.java | 26 +++++++++++--------
.../php/MagentoTemplatesFactory.java | 14 +++++-----
6 files changed, 59 insertions(+), 50 deletions(-)
diff --git a/src/com/magento/idea/magento2plugin/completion/provider/LayoutBlockCompletionContributor.java b/src/com/magento/idea/magento2plugin/completion/provider/LayoutBlockCompletionContributor.java
index c01d64e1e..22be04952 100644
--- a/src/com/magento/idea/magento2plugin/completion/provider/LayoutBlockCompletionContributor.java
+++ b/src/com/magento/idea/magento2plugin/completion/provider/LayoutBlockCompletionContributor.java
@@ -2,36 +2,37 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
package com.magento.idea.magento2plugin.completion.provider;
import com.intellij.codeInsight.completion.CompletionParameters;
import com.intellij.codeInsight.completion.CompletionProvider;
import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.icons.AllIcons;
import com.intellij.psi.PsiElement;
import com.intellij.util.ProcessingContext;
-import com.jetbrains.php.PhpIcons;
import com.magento.idea.magento2plugin.indexes.LayoutIndex;
import com.magento.idea.magento2plugin.stubs.indexes.BlockNameIndex;
-import org.jetbrains.annotations.NotNull;
-
import java.util.Collection;
+import org.jetbrains.annotations.NotNull;
public class LayoutBlockCompletionContributor extends CompletionProvider<CompletionParameters> {
@Override
- protected void addCompletions(@NotNull CompletionParameters parameters,
- ProcessingContext context,
- @NotNull CompletionResultSet result) {
- PsiElement position = parameters.getPosition().getOriginalElement();
+ protected void addCompletions(final @NotNull CompletionParameters parameters,
+ final ProcessingContext context,
+ final @NotNull CompletionResultSet result) {
+ final PsiElement position = parameters.getPosition().getOriginalElement();
if (position == null) {
return;
}
- Collection<String> keys = LayoutIndex.getAllKeys(BlockNameIndex.KEY, position.getProject());
- for (String key: keys) {
+ final Collection<String> keys
+ = LayoutIndex.getAllKeys(BlockNameIndex.KEY, position.getProject());
+ for (final String key: keys) {
result.addElement(
- LookupElementBuilder.create(key).withIcon(PhpIcons.XML_TAG_ICON)
+ LookupElementBuilder.create(key).withIcon(AllIcons.Nodes.Tag)
);
}
}
diff --git a/src/com/magento/idea/magento2plugin/completion/provider/LayoutContainerCompletionContributor.java b/src/com/magento/idea/magento2plugin/completion/provider/LayoutContainerCompletionContributor.java
index 3c6d6cf03..c127e968f 100644
--- a/src/com/magento/idea/magento2plugin/completion/provider/LayoutContainerCompletionContributor.java
+++ b/src/com/magento/idea/magento2plugin/completion/provider/LayoutContainerCompletionContributor.java
@@ -2,36 +2,37 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
package com.magento.idea.magento2plugin.completion.provider;
import com.intellij.codeInsight.completion.CompletionParameters;
import com.intellij.codeInsight.completion.CompletionProvider;
import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.icons.AllIcons;
import com.intellij.psi.PsiElement;
import com.intellij.util.ProcessingContext;
-import com.jetbrains.php.PhpIcons;
import com.magento.idea.magento2plugin.indexes.LayoutIndex;
import com.magento.idea.magento2plugin.stubs.indexes.ContainerNameIndex;
-import org.jetbrains.annotations.NotNull;
-
import java.util.Collection;
+import org.jetbrains.annotations.NotNull;
public class LayoutContainerCompletionContributor extends CompletionProvider<CompletionParameters> {
@Override
- protected void addCompletions(@NotNull CompletionParameters parameters,
- ProcessingContext context,
- @NotNull CompletionResultSet result) {
- PsiElement position = parameters.getPosition().getOriginalElement();
+ protected void addCompletions(final @NotNull CompletionParameters parameters,
+ final ProcessingContext context,
+ final @NotNull CompletionResultSet result) {
+ final PsiElement position = parameters.getPosition().getOriginalElement();
if (position == null) {
return;
}
- Collection<String> keys = LayoutIndex.getAllKeys(ContainerNameIndex.KEY, position.getProject());
- for (String key: keys) {
+ final Collection<String> keys
+ = LayoutIndex.getAllKeys(ContainerNameIndex.KEY, position.getProject());
+ for (final String key: keys) {
result.addElement(
- LookupElementBuilder.create(key).withIcon(PhpIcons.XML_TAG_ICON)
+ LookupElementBuilder.create(key).withIcon(AllIcons.Nodes.Tag)
);
}
}
diff --git a/src/com/magento/idea/magento2plugin/completion/provider/LayoutUpdateCompletionContributor.java b/src/com/magento/idea/magento2plugin/completion/provider/LayoutUpdateCompletionContributor.java
index 071bdd3df..359534316 100644
--- a/src/com/magento/idea/magento2plugin/completion/provider/LayoutUpdateCompletionContributor.java
+++ b/src/com/magento/idea/magento2plugin/completion/provider/LayoutUpdateCompletionContributor.java
@@ -2,39 +2,40 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
package com.magento.idea.magento2plugin.completion.provider;
import com.intellij.codeInsight.completion.CompletionParameters;
import com.intellij.codeInsight.completion.CompletionProvider;
import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.icons.AllIcons;
import com.intellij.psi.PsiElement;
import com.intellij.psi.xml.XmlFile;
import com.intellij.util.ProcessingContext;
-import com.jetbrains.php.PhpIcons;
import com.magento.idea.magento2plugin.indexes.LayoutIndex;
+import java.util.List;
import org.jetbrains.annotations.NotNull;
-import java.util.List;
public class LayoutUpdateCompletionContributor extends CompletionProvider<CompletionParameters> {
@Override
- protected void addCompletions(@NotNull CompletionParameters parameters,
- ProcessingContext context,
- @NotNull CompletionResultSet result) {
- PsiElement position = parameters.getPosition().getOriginalElement();
+ protected void addCompletions(final @NotNull CompletionParameters parameters,
+ final ProcessingContext context,
+ final @NotNull CompletionResultSet result) {
+ final PsiElement position = parameters.getPosition().getOriginalElement();
if (position == null) {
return;
}
- List<XmlFile> targets = LayoutIndex.getLayoutFiles(position.getProject());
- if (targets.size() > 0) {
- for (XmlFile file : targets) {
+ final List<XmlFile> targets = LayoutIndex.getLayoutFiles(position.getProject());
+ if (!targets.isEmpty()) {
+ for (final XmlFile file : targets) {
result.addElement(
- LookupElementBuilder
+ LookupElementBuilder
.create(file.getVirtualFile().getNameWithoutExtension())
- .withIcon(PhpIcons.XML_TAG_ICON)
+ .withIcon(AllIcons.Nodes.Tag)
);
}
}
diff --git a/src/com/magento/idea/magento2plugin/completion/provider/UiComponentCompletionProvider.java b/src/com/magento/idea/magento2plugin/completion/provider/UiComponentCompletionProvider.java
index 0091aae2b..cf80246df 100644
--- a/src/com/magento/idea/magento2plugin/completion/provider/UiComponentCompletionProvider.java
+++ b/src/com/magento/idea/magento2plugin/completion/provider/UiComponentCompletionProvider.java
@@ -9,10 +9,10 @@
import com.intellij.codeInsight.completion.CompletionProvider;
import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.icons.AllIcons;
import com.intellij.psi.PsiElement;
import com.intellij.psi.xml.XmlFile;
import com.intellij.util.ProcessingContext;
-import com.jetbrains.php.PhpIcons;
import com.magento.idea.magento2plugin.indexes.UIComponentIndex;
import java.util.List;
import org.jetbrains.annotations.NotNull;
@@ -34,7 +34,7 @@ protected void addCompletions(@NotNull final CompletionParameters parameters,
for (final XmlFile file : targets) {
result.addElement(LookupElementBuilder
.create(file.getVirtualFile().getNameWithoutExtension())
- .withIcon(PhpIcons.XML_TAG_ICON)
+ .withIcon(AllIcons.Nodes.Tag)
);
}
}
diff --git a/src/com/magento/idea/magento2plugin/completion/provider/VirtualTypeCompletionProvider.java b/src/com/magento/idea/magento2plugin/completion/provider/VirtualTypeCompletionProvider.java
index 1f16cf285..0e96a9f14 100644
--- a/src/com/magento/idea/magento2plugin/completion/provider/VirtualTypeCompletionProvider.java
+++ b/src/com/magento/idea/magento2plugin/completion/provider/VirtualTypeCompletionProvider.java
@@ -2,6 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
package com.magento.idea.magento2plugin.completion.provider;
import com.intellij.codeInsight.completion.CompletionParameters;
@@ -9,35 +10,38 @@
import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.completion.PlainPrefixMatcher;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.icons.AllIcons;
import com.intellij.psi.PsiElement;
import com.intellij.util.ProcessingContext;
-import com.jetbrains.php.PhpIcons;
import com.magento.idea.magento2plugin.indexes.DiIndex;
+import java.util.Collection;
import org.jetbrains.annotations.NotNull;
-import java.util.Collection;
public class VirtualTypeCompletionProvider extends CompletionProvider<CompletionParameters> {
@Override
- protected void addCompletions(@NotNull CompletionParameters parameters,
- ProcessingContext context,
- @NotNull CompletionResultSet result) {
- PsiElement position = parameters.getPosition().getOriginalElement();
+ protected void addCompletions(final @NotNull CompletionParameters parameters,
+ final ProcessingContext context,
+ final @NotNull CompletionResultSet result) {
+ final PsiElement position = parameters.getPosition().getOriginalElement();
if (position == null) {
return;
}
- String prefix = result.getPrefixMatcher().getPrefix();
+ final String prefix = result.getPrefixMatcher().getPrefix();
- DiIndex index = DiIndex.getInstance(position.getProject());
- Collection<String> elements = index.getAllVirtualTypeElementNames(new PlainPrefixMatcher(prefix), position.getResolveScope());
+ final DiIndex index = DiIndex.getInstance(position.getProject());
+ final Collection<String> elements = index.getAllVirtualTypeElementNames(
+ new PlainPrefixMatcher(prefix),
+ position.getResolveScope()
+ );
- for (String elementName:elements) {
+ for (final String elementName:elements) {
result.addElement(
LookupElementBuilder
.create(elementName)
- .withIcon(PhpIcons.CLASS_ICON)
+ .withIcon(AllIcons.Nodes.Class)
);
}
}
diff --git a/src/com/magento/idea/magento2plugin/generation/php/MagentoTemplatesFactory.java b/src/com/magento/idea/magento2plugin/generation/php/MagentoTemplatesFactory.java
index 83ab09dec..b9476e54f 100644
--- a/src/com/magento/idea/magento2plugin/generation/php/MagentoTemplatesFactory.java
+++ b/src/com/magento/idea/magento2plugin/generation/php/MagentoTemplatesFactory.java
@@ -2,6 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
package com.magento.idea.magento2plugin.generation.php;
import com.intellij.ide.util.projectWizard.WizardContext;
@@ -9,25 +10,26 @@
import com.intellij.platform.ProjectTemplatesFactory;
import com.jetbrains.php.config.generation.PhpEmptyTemplatesFactory;
import icons.PhpIcons;
+import javax.swing.Icon;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import javax.swing.Icon;
public class MagentoTemplatesFactory extends ProjectTemplatesFactory {
- public MagentoTemplatesFactory() {
- }
@NotNull
public String[] getGroups() {
return new String[]{PhpEmptyTemplatesFactory.PHP_PROJECT_TEMPLATE_GROUP};
}
- public Icon getGroupIcon(String group) {
- return PhpIcons.Php_icon;
+ public Icon getGroupIcon(final String group) {
+ return PhpIcons.PhpIcon;
}
@NotNull
- public ProjectTemplate[] createTemplates(@Nullable String group, WizardContext context) {
+ public ProjectTemplate[] createTemplates(
+ final @Nullable String group,
+ final WizardContext context
+ ) {
return new ProjectTemplate[]{new MagentoModuleGenerator()};
}
}