From 57dbea92a95859ce16b646369d8914b679403793 Mon Sep 17 00:00:00 2001 From: Serhii Akulov Date: Fri, 17 Jun 2022 17:04:50 +0300 Subject: [PATCH 1/2] 1113: Fixed not null parameter --- .../actions/comparator/CompareTemplateAction.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java b/src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java index 715cbf101..ec08ca89b 100644 --- a/src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java +++ b/src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java @@ -83,6 +83,9 @@ public void update(final @NotNull AnActionEvent event) { } final String originalModuleName = getOriginalModuleName(project, psiFile); + if (originalModuleName == null) { + return; + } final PsiDirectory originalModuleDirectory = new ModuleIndex(project).getModuleDirectoryByModuleName(originalModuleName); From 7a5d78fdfc82c7bce0859a709c65b1e15ada9040 Mon Sep 17 00:00:00 2001 From: Serhii Akulov Date: Fri, 17 Jun 2022 19:14:31 +0300 Subject: [PATCH 2/2] 1113: Fixed PMD --- .../actions/comparator/CompareTemplateAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java b/src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java index ec08ca89b..e61f22631 100644 --- a/src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java +++ b/src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java @@ -49,8 +49,8 @@ public CompareTemplateAction() { * * @param event AnActionEvent */ - @SuppressWarnings("PMD.NPathComplexity") @Override + @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"}) public void update(final @NotNull AnActionEvent event) { setStatus(event, false); final Project project = event.getData(PlatformDataKeys.PROJECT);