Merge pull request #485 from magento/fixed-null-pointer-copy-path

Fixed null pointer on the copy path action
magento · Feb 12, 2021 · 8fc2a8a · 8fc2a8a
2 parents 39381dc + c8c3611
commit 8fc2a8a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 3.1.1
 
+### Fixed
+
+- Fixed null pointer exception on the copy path action
+
 ## 3.1.0
 
 ### Added

diff --git a/src/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java b/src/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java
@@ -12,6 +12,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import org.jetbrains.annotations.NotNull;
@@ -30,7 +31,8 @@ public class CopyMagentoPath extends CopyPathProvider {
     @Override
     public void update(@NotNull final AnActionEvent event) {
         final VirtualFile virtualFile = event.getData(PlatformDataKeys.VIRTUAL_FILE);
-        if (virtualFile != null && virtualFile.isDirectory()) {
+        if (virtualFile != null && virtualFile.isDirectory()
+                || virtualFile != null && !PHTML.equals(virtualFile.getExtension())) {
             event.getPresentation().setVisible(false);
         }
     }
@@ -42,11 +44,22 @@ public String getPathToElement(
             @Nullable final VirtualFile virtualFile,
             @Nullable final Editor editor
     ) {
-        final PsiDirectory directory
-                = PsiManager.getInstance(project).findFile(virtualFile).getContainingDirectory();
+        if (virtualFile == null) {
+            return null;
+        }
+        final PsiFile file
+                = PsiManager.getInstance(project).findFile(virtualFile);
+        if (file == null) {
+            return null;
+        }
+        final PsiDirectory directory = file.getContainingDirectory();
+        final String moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
+        if (moduleName == null) {
+            return null;
+        }
         final StringBuilder fullPath = new StringBuilder(virtualFile.getPath());
         final StringBuilder magentoPath
-                = new StringBuilder(GetModuleNameByDirectoryUtil.execute(directory, project));
+                = new StringBuilder(moduleName);
         String path = fullPath.toString();
 
         if (PHTML.equals(virtualFile.getExtension())) {