1135: Minor code style fixes

Author: bohdan-harniuk

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 4.4.1
 
+### Fixed
+
+- Fixed wrong director(y|ies) generation for GraphQL resolver class [#1192](https://github.com/magento/magento2-phpstorm-plugin/pull/1192)
+- Fixed IndexOutOfBoundsException: CreateResolverClassQuickFix.applyFix(CreateResolverClassQuickFix.java:43) [#1192](https://github.com/magento/magento2-phpstorm-plugin/pull/1192)
+
 ## 4.4.0
 
 ### Added

resources/magento2/inspection.properties

@@ -15,7 +15,7 @@ inspection.plugin.duplicateInSameFile=The plugin name already used in this file.
 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.plugin.disabledPluginDoesNotExist=This plugin does not exist to be disabled.
 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.notExist=Resolver class do not exist
+inspection.graphql.resolver.notExist=The GraphQL resolver class do not exist
 inspection.graphql.resolver.fix.family=Implement Resolver interface
 inspection.graphql.resolver.fix.title=Select one of the following interface
 inspection.graphql.schema.resolver.fix.family=Create GraphQL Resolver
@@ -40,5 +40,5 @@ inspection.warning.method.does.not.exist=The method "{0}" does not exist in the
 inspection.warning.method.should.have.public.access=The method "{0}" should have public access
 inspection.warning.method.should.have.public.access.fix=Change the method access
 inspection.warning.class.invalidFormat=The class "{0}" has invalid format
-inspection.error.class.tooShortFormat=The target resolver class format is incorrect.\nThe fully qualified name "{0}" should contain at least 3 parts.
-inspection.error.class.tooShortFormatTitle=Resolver class format is incorrect
+inspection.error.graphqlResolverClass.tooShortFormat=The target GraphQL resolver class format is incorrect.\nThe fully qualified name "{0}" should contain at least 3 parts.
+inspection.error.graphqlResolverClass.tooShortFormatTitle=The GraphQL resolver class format is incorrect

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

@@ -33,6 +33,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ModuleGraphQlResolverClassGenerator extends FileGenerator {
+
     private final GraphQlResolverFileData graphQlResolverFileData;
     private final Project project;
     private final ValidatorBundle validatorBundle;
@@ -131,16 +132,15 @@ private PhpClass createGraphQlResolverClass(final String actionName) {
         if (parentDirectory == null) {
             return null;
         }
-
         final String graphQlResolverDirectory = graphQlResolverFileData
                 .getGraphQlResolverDirectory();
+
         if (!graphQlResolverDirectory.isBlank()) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectories(
                     parentDirectory,
                     graphQlResolverDirectory
             );
         }
-
         final Properties attributes = getAttributes();
         final PsiFile graphQlResolverFile = fileFromTemplateGenerator.generate(
                 GraphQlResolverPhp.getInstance(

src/com/magento/idea/magento2plugin/inspections/graphqls/SchemaResolverInspection.java

@@ -25,29 +25,29 @@ public class SchemaResolverInspection extends LocalInspectionTool {
 
     private final InspectionBundle inspectionBundle = new InspectionBundle();
 
-    @NotNull
     @Override
-    public GraphQLVisitor buildVisitor(
-            @NotNull final ProblemsHolder holder,
+    public @NotNull GraphQLVisitor buildVisitor(
+            final @NotNull ProblemsHolder holder,
             final boolean isOnTheFly
     ) {
         return new GraphQLVisitor() {
             @Override
-            public void visitValue(@NotNull final GraphQLValue element) {
+            public void visitValue(final @NotNull GraphQLValue element) {
                 final String getVisitedElementValue = element.getText();
                 final PsiElement parentElementValue = element.getParent();
+
                 if (getVisitedElementValue == null
                         || !(parentElementValue instanceof GraphQLNamedElement)) {
                     return;
                 }
-
                 final String attributeName = ((GraphQLNamedElement) parentElementValue).getName();
+
                 if (!GraphQlResolver.CLASS_ARGUMENT.equals(attributeName)) {
                     return;
                 }
-
                 final String resolverFQN
                         = GraphQlUtil.resolverStringToPhpFQN(getVisitedElementValue);
+
                 if (!resolverFQN.matches(RegExUtil.PhpRegex.FQN)) {
                     holder.registerProblem(
                             element,
@@ -57,10 +57,8 @@ public void visitValue(@NotNull final GraphQLValue element) {
                             ),
                             ProblemHighlightType.WARNING
                     );
-
                     return;
                 }
-
                 final GetPhpClassByFQN getPhpClassByFQN
                         = GetPhpClassByFQN.getInstance(holder.getProject());
                 final PhpClass resolverClass = getPhpClassByFQN.execute(resolverFQN);

src/com/magento/idea/magento2plugin/inspections/graphqls/fix/CreateResolverClassQuickFix.java

@@ -49,11 +49,15 @@ public void applyFix(
         if (fqnPartsList.size() < CLASSPATH_MIN_DEPTH) {
             JOptionPane.showMessageDialog(
                     null,
-                    inspectionBundle.message("inspection.error.class.tooShortFormat", resolverFqn),
-                    inspectionBundle.message("inspection.error.class.tooShortFormatTitle"),
+                    inspectionBundle.message(
+                            "inspection.error.graphqlResolverClass.tooShortFormat",
+                            resolverFqn
+                    ),
+                    inspectionBundle.message(
+                            "inspection.error.graphqlResolverClass.tooShortFormatTitle"
+                    ),
                     JOptionPane.ERROR_MESSAGE
             );
-
             return;
         }