Merge branch '1.0.1-develop' into issue-57-controller-generation

Author: Vitaliy

resources/META-INF/plugin.xml

@@ -108,7 +108,7 @@
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.ActionGroupIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.DataIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.PageIndex" />
-        <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.StepKeyIndex" />
+        <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.TestNameIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.RequireJsIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.MagentoLibJsIndex" />
 

resources/magento2/inspection.properties

@@ -1,2 +1,5 @@
 inspection.plugin.duplicateInSameFile=The plugin name already used in this file. For more details see Inspection Description.
 inspection.plugin.duplicateInOtherPlaces=The plugin name "{0}" for targeted "{1}" class is already used in the module "{2}" ({3} scope). For more details see Inspection Description.
+inspection.graphql.resolver.mustImplement=Class must implements any of the following interfaces: \\Magento\\Framework\\GraphQl\\Query\\ResolverInterface, \\Magento\\Framework\\GraphQl\\Query\\Resolver\\BatchResolverInterface, \\Magento\\Framework\\GraphQl\\Query\\Resolver\\BatchServiceContractResolverInterface
+inspection.graphql.resolver.fix.family=Implement Resolver interface
+inspection.graphql.resolver.fix.title=Select one of the following interface

src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java

@@ -21,7 +21,7 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.List;
 
 public class CreateAPluginDialog extends AbstractDialog {

src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java

@@ -5,24 +5,20 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog;
 
 import com.intellij.openapi.project.Project;
-import com.jetbrains.php.lang.psi.elements.Method;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.actions.generation.CreateAPluginAction;
 import com.magento.idea.magento2plugin.actions.generation.CreateAnObserverAction;
 import com.magento.idea.magento2plugin.actions.generation.data.ObserverEventsXmlData;
 import com.magento.idea.magento2plugin.actions.generation.data.ObserverFileData;
-import com.magento.idea.magento2plugin.actions.generation.dialog.validator.CreateAPluginDialogValidator;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.CreateAnObserverDialogValidator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ObserverClassGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ObserverEventsXmlGenerator;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import org.jetbrains.annotations.NotNull;
-
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.List;
 
 public class CreateAnObserverDialog extends AbstractDialog {

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java

@@ -16,7 +16,7 @@
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 public class NewBlockDialog extends AbstractDialog {
     private final NewBlockValidator validator;

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java

@@ -16,7 +16,7 @@
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 public class NewGraphQlResolverDialog extends AbstractDialog {
     private final NewGraphQlResolverValidator validator;

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewViewModelDialog.java

@@ -16,7 +16,7 @@
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 public class NewViewModelDialog extends AbstractDialog {
     private final NewViewModelValidator validator;

src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java

@@ -21,7 +21,7 @@
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.List;
 
 public class OverrideClassByAPreferenceDialog extends AbstractDialog {

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java

@@ -20,6 +20,7 @@
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Properties;
 
 public class ModuleBlockClassGenerator extends FileGenerator {
@@ -68,7 +69,7 @@ private String getBlockFqn() {
     private PhpFile createBlockClass(String actionName) {
         PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
                 .getModuleDirectoryByModuleName(getBlockModule());
-        String[] blockDirectories = blockFileData.getBlockDirectory().split("/");
+        String[] blockDirectories = blockFileData.getBlockDirectory().split(File.separator);
         for (String blockDirectory: blockDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, blockDirectory);
         }

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java

@@ -28,6 +28,7 @@
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Properties;
 
 public class ModuleGraphQlResolverClassGenerator extends FileGenerator {
@@ -105,7 +106,7 @@ private int getInsertPos(PhpClass graphQlResolverClass) {
     private PhpClass createGraphQlResolverClass(String actionName) {
         PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
                 .getModuleDirectoryByModuleName(graphQlResolverFileData.getGraphQlResolverModule());
-        String[] graphQlResolverDirectories = graphQlResolverFileData.getGraphQlResolverDirectory().split("/");
+        String[] graphQlResolverDirectories = graphQlResolverFileData.getGraphQlResolverDirectory().split(File.separator);
         for (String graphQlResolverDirectory: graphQlResolverDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, graphQlResolverDirectory);
         }