Skip to content

Fixed incorrect duplication warning for disabled plugin in di.xml #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 9, 2021
Merged

Fixed incorrect duplication warning for disabled plugin in di.xml #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea4a1f6
Fixed incorrect duplication warning for disabled plugin in di.xml
Apr 9, 2021
01c4d62
Clean up
Apr 9, 2021
ede1d08
Clean up in observer declaration
Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions src/com/magento/idea/magento2plugin/inspections/xml/ObserverDeclarationInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just cleanup

problemsHolder.registerProblem(
observerNameAttribute.getValueElement(),
inspectionBundle.message(
"inspection.observer.disabledObserverDoesNotExist"
),
errorSeverity
);
} else {
continue;
}
}

for (final HashMap<String, String> moduleEntry:
Expand Down
17 changes: 10 additions & 7 deletions src/com/magento/idea/magento2plugin/inspections/xml/PluginDeclarationInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

affected lines

problemsHolder.registerProblem(
pluginTypeNameAttribute.getValueElement(),
inspectionBundle.message(
"inspection.plugin.disabledPluginDoesNotExist"
),
errorSeverity
);
),
errorSeverity
);
} else {
continue;
}
}

for (final Pair<String, String> moduleEntry: modulesWithSamePluginName) {
Expand Down