Merge pull request #121 from vasilii-b/mftf-conditional-support

Add the possibility to enable/disable the MFTF support for the project

Author: Vitaliy

src/com/magento/idea/magento2plugin/project/Settings.java

@@ -19,6 +19,7 @@
 public class Settings implements PersistentStateComponent<Settings> {
     public boolean pluginEnabled = false;
     public String defaultLicenseName = "Proprietary";
+    public boolean mftfSupportEnabled = false;
 
     @Nullable
     @Override
@@ -42,4 +43,8 @@ public static boolean isEnabled(@NotNull Project project) {
     public static String getDefaultLicenseName(@NotNull Project project) {
         return getInstance(project).defaultLicenseName;
     }
+
+    public static boolean isMftfSupportEnabled(@NotNull Project project) {
+        return getInstance(project).mftfSupportEnabled;
+    }
 }

src/com/magento/idea/magento2plugin/project/SettingsForm.form

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.magento.idea.magento2plugin.project.SettingsForm">
-  <grid id="27dc6" binding="panel1" default-binding="true" layout-manager="GridLayoutManager" row-count="2" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="panel1" default-binding="true" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="570" height="671"/>
@@ -22,7 +22,7 @@
         <colspec value="left:4dlu:noGrow"/>
         <colspec value="fill:d:grow"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -101,6 +101,14 @@
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
+      <component id="9231f" class="javax.swing.JCheckBox" binding="mftfSupportEnabled">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Enable MFTF Support"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>

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

@@ -42,6 +42,7 @@ public class SettingsForm implements Configurable {
     private JButton regenerateUrnMapButton;
     private JLabel magentoVersion;
     private JTextField moduleDefaultLicenseName;
+    private JCheckBox mftfSupportEnabled;
     private MagentoVersion magentoVersionModel = MagentoVersion.getInstance();
 
     public SettingsForm(@NotNull final Project project) {
@@ -86,6 +87,7 @@ public void mouseClicked(MouseEvent e) {
         }
 
         moduleDefaultLicenseName.setText(getSettings().defaultLicenseName);
+        mftfSupportEnabled.setSelected(getSettings().mftfSupportEnabled);
 
         return (JComponent) panel1;
     }
@@ -99,14 +101,16 @@ private void reindex() {
     public boolean isModified() {
         boolean licenseChanged = !moduleDefaultLicenseName.getText().equals(getSettings().defaultLicenseName);
         boolean statusChanged = !pluginEnabled.isSelected() == getSettings().pluginEnabled;
+        boolean mftfSupportChanged = mftfSupportEnabled.isSelected() != getSettings().mftfSupportEnabled;
 
-        return statusChanged || licenseChanged;
+        return statusChanged || licenseChanged || mftfSupportChanged;
     }
 
     @Override
     public void apply() throws ConfigurationException {
         getSettings().pluginEnabled = pluginEnabled.isSelected();
         getSettings().defaultLicenseName = moduleDefaultLicenseName.getText();
+        getSettings().mftfSupportEnabled = mftfSupportEnabled.isSelected();
         buttonReindex.setEnabled(getSettings().pluginEnabled);
         regenerateUrnMapButton.setEnabled(getSettings().pluginEnabled);
 

src/com/magento/idea/magento2plugin/stubs/indexes/mftf/ActionGroupIndex.java

@@ -1,6 +1,7 @@
 package com.magento.idea.magento2plugin.stubs.indexes.mftf;
 
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlDocument;
@@ -29,8 +30,9 @@ public DataIndexer<String, String, FileContent> getIndexer() {
         return inputData -> {
             Map<String, String> map = new THashMap<>();
             PsiFile psiFile = inputData.getPsiFile();
+            Project project = psiFile.getProject();
 
-            if (!Settings.isEnabled(psiFile.getProject())) {
+            if (!Settings.isEnabled(project) || !Settings.isMftfSupportEnabled(project)) {
                 return map;
             }
 

src/com/magento/idea/magento2plugin/stubs/indexes/mftf/DataIndex.java

@@ -1,6 +1,7 @@
 package com.magento.idea.magento2plugin.stubs.indexes.mftf;
 
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlDocument;
@@ -29,8 +30,9 @@ public DataIndexer<String, String, FileContent> getIndexer() {
         return inputData -> {
             Map<String, String> map = new THashMap<>();
             PsiFile psiFile = inputData.getPsiFile();
+            Project project = psiFile.getProject();
 
-            if (!Settings.isEnabled(psiFile.getProject())) {
+            if (!Settings.isEnabled(project) || !Settings.isMftfSupportEnabled(project)) {
                 return map;
             }
 

src/com/magento/idea/magento2plugin/stubs/indexes/mftf/PageIndex.java

@@ -1,6 +1,7 @@
 package com.magento.idea.magento2plugin.stubs.indexes.mftf;
 
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlDocument;
@@ -29,8 +30,9 @@ public DataIndexer<String, String, FileContent> getIndexer() {
         return inputData -> {
             Map<String, String> map = new THashMap<>();
             PsiFile psiFile = inputData.getPsiFile();
+            Project project = psiFile.getProject();
 
-            if (!Settings.isEnabled(psiFile.getProject())) {
+            if (!Settings.isEnabled(project) || !Settings.isMftfSupportEnabled(project)) {
                 return map;
             }
 

src/com/magento/idea/magento2plugin/stubs/indexes/mftf/SectionIndex.java

@@ -1,6 +1,7 @@
 package com.magento.idea.magento2plugin.stubs.indexes.mftf;
 
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlDocument;
@@ -29,8 +30,9 @@ public DataIndexer<String, String, FileContent> getIndexer() {
         return inputData -> {
             Map<String, String> map = new THashMap<>();
             PsiFile psiFile = inputData.getPsiFile();
+            Project project = psiFile.getProject();
 
-            if (!Settings.isEnabled(psiFile.getProject())) {
+            if (!Settings.isEnabled(project) || !Settings.isMftfSupportEnabled(project)) {
                 return map;
             }
 

src/com/magento/idea/magento2plugin/stubs/indexes/mftf/StepKeyIndex.java

@@ -1,6 +1,7 @@
 package com.magento.idea.magento2plugin.stubs.indexes.mftf;
 
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlDocument;
@@ -29,8 +30,9 @@ public DataIndexer<String, String, FileContent> getIndexer() {
         return inputData -> {
             Map<String, String> map = new THashMap<>();
             PsiFile psiFile = inputData.getPsiFile();
+            Project project = psiFile.getProject();
 
-            if (!Settings.isEnabled(psiFile.getProject())) {
+            if (!Settings.isEnabled(project) || !Settings.isMftfSupportEnabled(project)) {
                 return map;
             }