Merge pull request #504 from anzin/fix-bug-invalid-check-setup-version

Fixed bug invalid check setup_version

Author: Vitaliy

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 ### Fixed
 
 - Class completion doesn't display interfaces
+- Fixed invalid check 'setup_version' in the etc/module.xml
 
 ## 3.1.2
 

src/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspection.java

@@ -8,6 +8,7 @@
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.XmlSuppressableInspectionTool;
+import com.intellij.patterns.XmlAttributeValuePattern;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiFile;
@@ -54,24 +55,26 @@ public void visitXmlAttributeValue(final XmlAttributeValue value) {
                     return;
                 }
 
-                final String expectedName
-                        = GetEditableModuleNameByRootFileUtil.execute(etcDirectory);
-                final String actualName = value.getValue();
-                if (actualName.equals(expectedName)) {
-                    return;
+                final String attributeName = XmlAttributeValuePattern.getLocalName(value);
+                if (attributeName != null && attributeName.equals(ModuleXml.MODULE_ATTR_NAME)) {
+                    final String expectedName
+                            = GetEditableModuleNameByRootFileUtil.execute(etcDirectory);
+                    final String actualName = value.getValue();
+                    if (actualName.equals(expectedName)) {
+                        return;
+                    }
+                    final InspectionBundle inspectionBundle = new InspectionBundle();
+                    problemsHolder.registerProblem(
+                            value,
+                            inspectionBundle.message(
+                                    "inspection.moduleDeclaration.warning.wrongModuleName",
+                                    actualName,
+                                    expectedName
+                            ),
+                            ProblemHighlightType.ERROR,
+                            new XmlModuleNameQuickFix(expectedName)
+                    );
                 }
-
-                final InspectionBundle inspectionBundle = new InspectionBundle();
-                problemsHolder.registerProblem(
-                        value,
-                        inspectionBundle.message(
-                                "inspection.moduleDeclaration.warning.wrongModuleName",
-                                actualName,
-                                expectedName
-                        ),
-                        ProblemHighlightType.ERROR,
-                        new XmlModuleNameQuickFix(expectedName)
-                );
             }
         };
     }

testData/inspections/xml/ModuleDeclarationInModuleXmlInspection/setupVersionNotErrorMessageInEditableModule/app/code/Test/TestModule/etc/module.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Test_TestModule" setup_version="1.0.0" />
+</config>

tests/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspectionTest.java

@@ -13,6 +13,7 @@ public class ModuleDeclarationInModuleXmlInspectionTest
     private static final String MESSAGE_ID =
             "inspection.moduleDeclaration.warning.wrongModuleName";
     private static final String WRONG_MODULE_NAME = "Wrong_ModuleName";
+    private static final String SETUP_VERSION_ATTRIBUTE_VALUE = "1.0.0";
 
     @Override
     public void setUp() throws Exception {
@@ -46,6 +47,27 @@ public void testWrongDeclarationInEditableModule() {
         assertHasHighlighting(errorMessage);
     }
 
+    /**
+     * Inspection do not highlight wrong module name warning for setup version attribute.
+     */
+    public void testSetupVersionNotErrorMessageInEditableModule() {
+        final Settings settings = Settings.getInstance(myFixture.getProject());
+        settings.magentoPath =
+                "/src/xml/ModuleDeclarationInModuleXmlInspection/"
+                        + "setupVersionNotErrorMessageInEditableModule";
+        myFixture.configureByFile(
+                getFixturePath("app/code/Test/TestModule/etc/" + ModuleXml.FILE_NAME)
+        );
+
+        final String errorMessage =  inspectionBundle.message(
+                MESSAGE_ID,
+                SETUP_VERSION_ATTRIBUTE_VALUE,
+                "Test_TestModule"
+        );
+
+        assertHasNoHighlighting(errorMessage);
+    }
+
     /**
      * Inspection skips sub tags.
      */