Skip to content

Commit df89d54

Browse files
bohdan-harniukbohdan-harniuk
authored
Merge pull request #1230 from makzef/1224-compatibility-issues
1224: Fixed compatibility issues by updating icon constants
2 parents 6ea5de7 + b51c8ff commit df89d54

File tree

6 files changed

+59
-50
lines changed

6 files changed

+59
-50
lines changed

‎src/com/magento/idea/magento2plugin/completion/provider/LayoutBlockCompletionContributor.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,37 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.completion.provider;
67

78
import com.intellij.codeInsight.completion.CompletionParameters;
89
import com.intellij.codeInsight.completion.CompletionProvider;
910
import com.intellij.codeInsight.completion.CompletionResultSet;
1011
import com.intellij.codeInsight.lookup.LookupElementBuilder;
12+
import com.intellij.icons.AllIcons;
1113
import com.intellij.psi.PsiElement;
1214
import com.intellij.util.ProcessingContext;
13-
import com.jetbrains.php.PhpIcons;
1415
import com.magento.idea.magento2plugin.indexes.LayoutIndex;
1516
import com.magento.idea.magento2plugin.stubs.indexes.BlockNameIndex;
16-
import org.jetbrains.annotations.NotNull;
17-
1817
import java.util.Collection;
18+
import org.jetbrains.annotations.NotNull;
1919

2020
public class LayoutBlockCompletionContributor extends CompletionProvider<CompletionParameters> {
2121

2222
@Override
23-
protected void addCompletions(@NotNull CompletionParameters parameters,
24-
ProcessingContext context,
25-
@NotNull CompletionResultSet result) {
26-
PsiElement position = parameters.getPosition().getOriginalElement();
23+
protected void addCompletions(final @NotNull CompletionParameters parameters,
24+
final ProcessingContext context,
25+
final @NotNull CompletionResultSet result) {
26+
final PsiElement position = parameters.getPosition().getOriginalElement();
2727
if (position == null) {
2828
return;
2929
}
3030

31-
Collection<String> keys = LayoutIndex.getAllKeys(BlockNameIndex.KEY, position.getProject());
32-
for (String key: keys) {
31+
final Collection<String> keys
32+
= LayoutIndex.getAllKeys(BlockNameIndex.KEY, position.getProject());
33+
for (final String key: keys) {
3334
result.addElement(
34-
LookupElementBuilder.create(key).withIcon(PhpIcons.XML_TAG_ICON)
35+
LookupElementBuilder.create(key).withIcon(AllIcons.Nodes.Tag)
3536
);
3637
}
3738
}

‎src/com/magento/idea/magento2plugin/completion/provider/LayoutContainerCompletionContributor.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,37 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.completion.provider;
67

78
import com.intellij.codeInsight.completion.CompletionParameters;
89
import com.intellij.codeInsight.completion.CompletionProvider;
910
import com.intellij.codeInsight.completion.CompletionResultSet;
1011
import com.intellij.codeInsight.lookup.LookupElementBuilder;
12+
import com.intellij.icons.AllIcons;
1113
import com.intellij.psi.PsiElement;
1214
import com.intellij.util.ProcessingContext;
13-
import com.jetbrains.php.PhpIcons;
1415
import com.magento.idea.magento2plugin.indexes.LayoutIndex;
1516
import com.magento.idea.magento2plugin.stubs.indexes.ContainerNameIndex;
16-
import org.jetbrains.annotations.NotNull;
17-
1817
import java.util.Collection;
18+
import org.jetbrains.annotations.NotNull;
1919

2020
public class LayoutContainerCompletionContributor extends CompletionProvider<CompletionParameters> {
2121

2222
@Override
23-
protected void addCompletions(@NotNull CompletionParameters parameters,
24-
ProcessingContext context,
25-
@NotNull CompletionResultSet result) {
26-
PsiElement position = parameters.getPosition().getOriginalElement();
23+
protected void addCompletions(final @NotNull CompletionParameters parameters,
24+
final ProcessingContext context,
25+
final @NotNull CompletionResultSet result) {
26+
final PsiElement position = parameters.getPosition().getOriginalElement();
2727
if (position == null) {
2828
return;
2929
}
3030

31-
Collection<String> keys = LayoutIndex.getAllKeys(ContainerNameIndex.KEY, position.getProject());
32-
for (String key: keys) {
31+
final Collection<String> keys
32+
= LayoutIndex.getAllKeys(ContainerNameIndex.KEY, position.getProject());
33+
for (final String key: keys) {
3334
result.addElement(
34-
LookupElementBuilder.create(key).withIcon(PhpIcons.XML_TAG_ICON)
35+
LookupElementBuilder.create(key).withIcon(AllIcons.Nodes.Tag)
3536
);
3637
}
3738
}

‎src/com/magento/idea/magento2plugin/completion/provider/LayoutUpdateCompletionContributor.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,40 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.completion.provider;
67

78
import com.intellij.codeInsight.completion.CompletionParameters;
89
import com.intellij.codeInsight.completion.CompletionProvider;
910
import com.intellij.codeInsight.completion.CompletionResultSet;
1011
import com.intellij.codeInsight.lookup.LookupElementBuilder;
12+
import com.intellij.icons.AllIcons;
1113
import com.intellij.psi.PsiElement;
1214
import com.intellij.psi.xml.XmlFile;
1315
import com.intellij.util.ProcessingContext;
14-
import com.jetbrains.php.PhpIcons;
1516
import com.magento.idea.magento2plugin.indexes.LayoutIndex;
17+
import java.util.List;
1618
import org.jetbrains.annotations.NotNull;
1719

18-
import java.util.List;
1920

2021
public class LayoutUpdateCompletionContributor extends CompletionProvider<CompletionParameters> {
2122

2223
@Override
23-
protected void addCompletions(@NotNull CompletionParameters parameters,
24-
ProcessingContext context,
25-
@NotNull CompletionResultSet result) {
26-
PsiElement position = parameters.getPosition().getOriginalElement();
24+
protected void addCompletions(final @NotNull CompletionParameters parameters,
25+
final ProcessingContext context,
26+
final @NotNull CompletionResultSet result) {
27+
final PsiElement position = parameters.getPosition().getOriginalElement();
2728
if (position == null) {
2829
return;
2930
}
3031

31-
List<XmlFile> targets = LayoutIndex.getLayoutFiles(position.getProject());
32-
if (targets.size() > 0) {
33-
for (XmlFile file : targets) {
32+
final List<XmlFile> targets = LayoutIndex.getLayoutFiles(position.getProject());
33+
if (!targets.isEmpty()) {
34+
for (final XmlFile file : targets) {
3435
result.addElement(
35-
LookupElementBuilder
36+
LookupElementBuilder
3637
.create(file.getVirtualFile().getNameWithoutExtension())
37-
.withIcon(PhpIcons.XML_TAG_ICON)
38+
.withIcon(AllIcons.Nodes.Tag)
3839
);
3940
}
4041
}

‎src/com/magento/idea/magento2plugin/completion/provider/UiComponentCompletionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import com.intellij.codeInsight.completion.CompletionProvider;
1010
import com.intellij.codeInsight.completion.CompletionResultSet;
1111
import com.intellij.codeInsight.lookup.LookupElementBuilder;
12+
import com.intellij.icons.AllIcons;
1213
import com.intellij.psi.PsiElement;
1314
import com.intellij.psi.xml.XmlFile;
1415
import com.intellij.util.ProcessingContext;
15-
import com.jetbrains.php.PhpIcons;
1616
import com.magento.idea.magento2plugin.indexes.UIComponentIndex;
1717
import java.util.List;
1818
import org.jetbrains.annotations.NotNull;
@@ -34,7 +34,7 @@ protected void addCompletions(@NotNull final CompletionParameters parameters,
3434
for (final XmlFile file : targets) {
3535
result.addElement(LookupElementBuilder
3636
.create(file.getVirtualFile().getNameWithoutExtension())
37-
.withIcon(PhpIcons.XML_TAG_ICON)
37+
.withIcon(AllIcons.Nodes.Tag)
3838
);
3939
}
4040
}

‎src/com/magento/idea/magento2plugin/completion/provider/VirtualTypeCompletionProvider.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,46 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.completion.provider;
67

78
import com.intellij.codeInsight.completion.CompletionParameters;
89
import com.intellij.codeInsight.completion.CompletionProvider;
910
import com.intellij.codeInsight.completion.CompletionResultSet;
1011
import com.intellij.codeInsight.completion.PlainPrefixMatcher;
1112
import com.intellij.codeInsight.lookup.LookupElementBuilder;
13+
import com.intellij.icons.AllIcons;
1214
import com.intellij.psi.PsiElement;
1315
import com.intellij.util.ProcessingContext;
14-
import com.jetbrains.php.PhpIcons;
1516
import com.magento.idea.magento2plugin.indexes.DiIndex;
17+
import java.util.Collection;
1618
import org.jetbrains.annotations.NotNull;
1719

18-
import java.util.Collection;
1920

2021
public class VirtualTypeCompletionProvider extends CompletionProvider<CompletionParameters> {
2122

2223
@Override
23-
protected void addCompletions(@NotNull CompletionParameters parameters,
24-
ProcessingContext context,
25-
@NotNull CompletionResultSet result) {
26-
PsiElement position = parameters.getPosition().getOriginalElement();
24+
protected void addCompletions(final @NotNull CompletionParameters parameters,
25+
final ProcessingContext context,
26+
final @NotNull CompletionResultSet result) {
27+
final PsiElement position = parameters.getPosition().getOriginalElement();
2728
if (position == null) {
2829
return;
2930
}
3031

31-
String prefix = result.getPrefixMatcher().getPrefix();
32+
final String prefix = result.getPrefixMatcher().getPrefix();
3233

33-
DiIndex index = DiIndex.getInstance(position.getProject());
34-
Collection<String> elements = index.getAllVirtualTypeElementNames(new PlainPrefixMatcher(prefix), position.getResolveScope());
34+
final DiIndex index = DiIndex.getInstance(position.getProject());
35+
final Collection<String> elements = index.getAllVirtualTypeElementNames(
36+
new PlainPrefixMatcher(prefix),
37+
position.getResolveScope()
38+
);
3539

36-
for (String elementName:elements) {
40+
for (final String elementName:elements) {
3741
result.addElement(
3842
LookupElementBuilder
3943
.create(elementName)
40-
.withIcon(PhpIcons.CLASS_ICON)
44+
.withIcon(AllIcons.Nodes.Class)
4145
);
4246
}
4347
}

‎src/com/magento/idea/magento2plugin/generation/php/MagentoTemplatesFactory.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,34 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.generation.php;
67

78
import com.intellij.ide.util.projectWizard.WizardContext;
89
import com.intellij.platform.ProjectTemplate;
910
import com.intellij.platform.ProjectTemplatesFactory;
1011
import com.jetbrains.php.config.generation.PhpEmptyTemplatesFactory;
1112
import icons.PhpIcons;
13+
import javax.swing.Icon;
1214
import org.jetbrains.annotations.NotNull;
1315
import org.jetbrains.annotations.Nullable;
14-
import javax.swing.Icon;
1516

1617
public class MagentoTemplatesFactory extends ProjectTemplatesFactory {
17-
public MagentoTemplatesFactory() {
18-
}
1918

2019
@NotNull
2120
public String[] getGroups() {
2221
return new String[]{PhpEmptyTemplatesFactory.PHP_PROJECT_TEMPLATE_GROUP};
2322
}
2423

25-
public Icon getGroupIcon(String group) {
26-
return PhpIcons.Php_icon;
24+
public Icon getGroupIcon(final String group) {
25+
return PhpIcons.PhpIcon;
2726
}
2827

2928
@NotNull
30-
public ProjectTemplate[] createTemplates(@Nullable String group, WizardContext context) {
29+
public ProjectTemplate[] createTemplates(
30+
final @Nullable String group,
31+
final WizardContext context
32+
) {
3133
return new ProjectTemplate[]{new MagentoModuleGenerator()};
3234
}
3335
}

0 commit comments

Comments
 (0)