Merge branch '4.0.0-develop' into updated-plugin-logo

Author: Vitaliy

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

@@ -121,25 +121,21 @@ public void visitFile(final PsiFile file) {
                                         file
                                 );
 
-                        if (observerDisabledAttribute != null
-                                && observerDisabledAttribute.getValue() != null
-                                && observerDisabledAttribute.getValue().equals("true")
-                                && modulesWithSameObserverName.isEmpty()
-                        ) {
-                            problemsHolder.registerProblem(
-                                    observerNameAttribute.getValueElement(),
-                                    inspectionBundle.message(
-                                            "inspection.observer.disabledObserverDoesNotExist"
-                                    ),
-                                    errorSeverity
-                            );
-                        }
-
                         if (observerDisabledAttribute != null
                                 && observerDisabledAttribute.getValue() != null
                                 && observerDisabledAttribute.getValue().equals("true")
                         ) {
+                            if (modulesWithSameObserverName.isEmpty()) {
+                                    problemsHolder.registerProblem(
+                                            observerNameAttribute.getValueElement(),
+                                            inspectionBundle.message(
+                                                "inspection.observer.disabledObserverDoesNotExist"
+                                            ),
+                                            errorSeverity
+                                    );
+                            } else {
                                 continue;
+                            }
                         }
 
                         for (final HashMap<String, String> moduleEntry:

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

@@ -118,15 +118,18 @@ public void visitFile(final PsiFile file) {
                         if (pluginTypeDisabledAttribute != null
                                 && pluginTypeDisabledAttribute.getValue() != null
                                 && pluginTypeDisabledAttribute.getValue().equals("true")
-                                && modulesWithSamePluginName.isEmpty()
                         ) {
-                            problemsHolder.registerProblem(
-                                    pluginTypeNameAttribute.getValueElement(),
-                                    inspectionBundle.message(
+                            if (modulesWithSamePluginName.isEmpty()) {
+                                problemsHolder.registerProblem(
+                                        pluginTypeNameAttribute.getValueElement(),
+                                        inspectionBundle.message(
                                             "inspection.plugin.disabledPluginDoesNotExist"
-                                    ),
-                                    errorSeverity
-                            );
+                                        ),
+                                        errorSeverity
+                                );
+                            } else {
+                                continue;
+                            }
                         }
 
                         for (final Pair<String, String> moduleEntry: modulesWithSamePluginName) {