Skip to content

Commit fd6e7b0

Browse files
dkvashninbaylenaorobei
authored andcommitted
Integrated indexes with plugin enabler
(cherry picked from commit fc9ba49)
1 parent 9497122 commit fd6e7b0

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

src/com/magento/idea/magento2plugin/SettingsForm.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public String getHelpTopic() {
5555
@Nullable
5656
@Override
5757
public JComponent createComponent() {
58-
onOff();
5958
buttonReindex.addMouseListener(
6059
new MouseAdapter() {
6160
@Override
@@ -67,24 +66,15 @@ public void mouseClicked(MouseEvent e) {
6766
}
6867
);
6968

70-
pluginEnabled.addItemListener(new ItemListener() {
71-
@Override
72-
public void itemStateChanged(ItemEvent e) {
73-
onOff();
74-
}
75-
});
69+
buttonReindex.setEnabled(getSettings().pluginEnabled);
70+
regenerateUrnMapButton.setEnabled(getSettings().pluginEnabled);
7671

7772
regenerateUrnMapButton.addMouseListener(
7873
new RegenerateUrnMapListener(project)
7974
);
8075
return (JComponent) panel1;
8176
}
8277

83-
private void onOff() {
84-
buttonReindex.setEnabled(pluginEnabled.isSelected());
85-
regenerateUrnMapButton.setEnabled(pluginEnabled.isSelected());
86-
}
87-
8878
@Override
8979
public boolean isModified() {
9080
return !pluginEnabled.isSelected() == getSettings().pluginEnabled;

src/com/magento/idea/magento2plugin/xml/di/index/TypeConfigurationFileBasedIndex.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.intellij.util.io.KeyDescriptor;
1616
import com.jetbrains.php.lang.PhpLangUtil;
1717
import com.jetbrains.php.lang.psi.elements.PhpClass;
18+
import com.magento.idea.magento2plugin.Settings;
1819
import com.magento.idea.magento2plugin.xml.di.XmlHelper;
1920
import com.magento.idea.magento2plugin.xml.index.LineMarkerXmlTagDecorator;
2021
import com.magento.idea.magento2plugin.xml.index.StringSetDataExternalizer;
@@ -41,9 +42,6 @@ public class TypeConfigurationFileBasedIndex extends ScalarIndexExtension<String
4142
@Nullable
4243
public static List<XmlTag> getClassConfigurations(PhpClass phpClass) {
4344
String classFqn = phpClass.getPresentableFQN();
44-
if (classFqn == null) {
45-
return null;
46-
}
4745

4846
Collection<VirtualFile> containingFiles = FileBasedIndex
4947
.getInstance()
@@ -126,6 +124,10 @@ public Map<String, Void> map(@NotNull FileContent fileContent) {
126124
Map<String, Void> map = new HashMap<>();
127125

128126
PsiFile psiFile = fileContent.getPsiFile();
127+
if (!Settings.isEnabled(psiFile.getProject())) {
128+
return map;
129+
}
130+
129131
XmlDocumentImpl document = PsiTreeUtil.getChildOfType(psiFile, XmlDocumentImpl.class);
130132
if(document == null) {
131133
return map;

src/com/magento/idea/magento2plugin/xml/layout/index/LayoutDataIndexer.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.intellij.util.indexing.DataIndexer;
88
import com.intellij.util.indexing.FileContent;
99
import com.jetbrains.php.lang.PhpLangUtil;
10+
import com.magento.idea.magento2plugin.Settings;
1011
import org.jetbrains.annotations.NotNull;
1112

1213
import java.util.HashMap;
@@ -30,6 +31,10 @@ public Map<String, Void> map(@NotNull FileContent fileContent) {
3031
Map<String, Void> map = new HashMap<>();
3132

3233
PsiFile psiFile = fileContent.getPsiFile();
34+
if (!Settings.isEnabled(psiFile.getProject())) {
35+
return map;
36+
}
37+
3338
XmlDocumentImpl document = PsiTreeUtil.getChildOfType(psiFile, XmlDocumentImpl.class);
3439
if(document == null) {
3540
return map;

src/com/magento/idea/magento2plugin/xml/observer/index/EventsDeclarationsFileBasedIndex.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.jetbrains.php.lang.psi.PhpFile;
1717
import com.jetbrains.php.lang.psi.elements.MethodReference;
1818
import com.jetbrains.php.lang.psi.elements.ParameterList;
19+
import com.magento.idea.magento2plugin.Settings;
1920
import com.magento.idea.magento2plugin.xml.observer.PhpPatternsHelper;
2021
import org.jetbrains.annotations.NotNull;
2122

@@ -47,6 +48,10 @@ public Map<String, Void> map(@NotNull FileContent fileContent) {
4748
Map<String, Void> map = new HashMap<>();
4849
PhpFile phpFile = (PhpFile)fileContent.getPsiFile();
4950

51+
if (!Settings.isEnabled(phpFile.getProject())) {
52+
return map;
53+
}
54+
5055
List<String> results = new ArrayList<String>();
5156
recursiveFill(results, phpFile);
5257
for (String result: results) {

src/com/magento/idea/magento2plugin/xml/webapi/index/WebApiTypesFileBasedIndex.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.jetbrains.php.lang.PhpLangUtil;
1616
import com.jetbrains.php.lang.psi.elements.Method;
1717
import com.jetbrains.php.lang.psi.elements.PhpClass;
18+
import com.magento.idea.magento2plugin.Settings;
1819
import com.magento.idea.magento2plugin.xml.index.LineMarkerXmlTagDecorator;
1920
import org.jetbrains.annotations.NonNls;
2021
import org.jetbrains.annotations.NotNull;
@@ -47,6 +48,10 @@ public Map<String, Void> map(@NotNull FileContent fileContent) {
4748
Map<String, Void> map = new HashMap<>();
4849

4950
PsiFile psiFile = fileContent.getPsiFile();
51+
if (!Settings.isEnabled(psiFile.getProject())) {
52+
return map;
53+
}
54+
5055
XmlDocumentImpl document = PsiTreeUtil.getChildOfType(psiFile, XmlDocumentImpl.class);
5156
if (document == null) {
5257
return map;

0 commit comments

Comments
 (0)