From 10d7f78b70dc4e2142d522c94ef71b89085e3650 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 28 Nov 2023 08:22:08 +0100 Subject: [PATCH] [java] move to test root: NPE (EA-943438) GitOrigin-RevId: e625fa12c785eb70ee7360e40bb2e8c16794a38b --- .../src/com/intellij/codeInspection/MoveToTestRootFix.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/java-impl/src/com/intellij/codeInspection/MoveToTestRootFix.java b/java/java-impl/src/com/intellij/codeInspection/MoveToTestRootFix.java index 1d9b9e7645ca..016b3f57a2b2 100644 --- a/java/java-impl/src/com/intellij/codeInspection/MoveToTestRootFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/MoveToTestRootFix.java @@ -68,6 +68,7 @@ public class MoveToTestRootFix extends LocalQuickFixAndIntentionActionOnPsiEleme ModuleRootManager rootManager = ModuleRootManager.getInstance(module); ModuleFileIndex fileIndex = rootManager.getFileIndex(); if (!fileIndex.isInSourceContent(virtualFile)) return false; + if (JavaDirectoryService.getInstance().getPackage(file.getContainingDirectory()) == null) return false; return getTestRoots(rootManager).findFirst().isPresent(); } @@ -107,6 +108,7 @@ public class MoveToTestRootFix extends LocalQuickFixAndIntentionActionOnPsiEleme if (sourceRoot == null) return; PsiPackage targetPackage = JavaDirectoryService.getInstance().getPackage(myFile.getContainingDirectory()); + if (targetPackage == null) return; PackageWrapper wrapper = PackageWrapper.create(targetPackage);