Skip to content

Replacing consulo.ide.impl.idea.openapi.module.ModuleUtil with consulo.language.util.ModuleUtilCore #295

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
VISTALL merged 1 commit into from
Apr 19, 2026
Merged

Replacing consulo.ide.impl.idea.openapi.module.ModuleUtil with consulo.language.util.ModuleUtilCore #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions ...impl/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.intellij.java.impl.codeInspection.unnecessaryModuleDependency;

import consulo.annotation.access.RequiredReadAction;
import consulo.language.editor.inspection.reference.RefElement;
import consulo.language.editor.inspection.reference.RefGraphAnnotator;
import consulo.language.editor.inspection.reference.RefManager;
import consulo.language.editor.inspection.reference.RefModule;
import consulo.language.psi.PsiElement;
import consulo.module.Module;
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
import consulo.util.dataholder.Key;
import consulo.language.psi.PsiElement;

import java.util.HashSet;
import java.util.Set;
Expand All @@ -26,12 +26,13 @@ public UnnecessaryModuleDependencyAnnotator(RefManager manager) {
}

@Override
@RequiredReadAction
public void onMarkReferenced(RefElement refWhat, RefElement refFrom, boolean referencedFromClassInitializer) {
PsiElement onElement = refWhat.getElement();
PsiElement fromElement = refFrom.getElement();
if (onElement != null && fromElement!= null){
Module onModule = ModuleUtil.findModuleForPsiElement(onElement);
Module fromModule = ModuleUtil.findModuleForPsiElement(fromElement);
Module onModule = onElement.getModule();
Module fromModule = fromElement.getModule();
if (onModule != null && fromModule != null && onModule != fromModule){
RefModule refModule = myManager.getRefModule(fromModule);
if (refModule != null) {
Expand Down
8 changes: 4 additions & 4 deletions plugin/src/main/java/com/intellij/java/impl/ig/junit/UseOfObsoleteAssertInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.localize.InspectionGadgetsLocalize;
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
import consulo.annotation.access.RequiredReadAction;
import consulo.language.editor.inspection.ProblemDescriptor;
import consulo.language.psi.PsiElement;
import consulo.language.psi.PsiFile;
Expand Down Expand Up @@ -57,11 +57,11 @@ public BaseInspectionVisitor buildVisitor() {
}

private static class UseOfObsoleteAssertVisitor extends BaseInspectionVisitor {

@Override
@RequiredReadAction
public void visitMethodCallExpression(PsiMethodCallExpression expression) {
Project project = expression.getProject();
Module module = ModuleUtil.findModuleForPsiElement(expression);
Module module = expression.getModule();
if (module == null) {
return;
}
Expand All @@ -71,7 +71,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
return;
}
PsiMethod psiMethod = expression.resolveMethod();
if (psiMethod == null || !psiMethod.hasModifierProperty(PsiModifier.STATIC)) {
if (psiMethod == null || !psiMethod.isStatic()) {
return;
}
PsiClass containingClass = psiMethod.getContainingClass();
Expand Down
5 changes: 3 additions & 2 deletions ...rc/main/java/com/intellij/java/impl/psi/impl/file/PsiPackageImplementationHelperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
import com.intellij.java.language.impl.psi.NonClasspathClassFinder;
import com.intellij.java.language.impl.psi.impl.file.PsiPackageImplementationHelper;
import com.intellij.java.language.psi.PsiJavaPackage;
import consulo.annotation.access.RequiredReadAction;
import consulo.annotation.component.ServiceImpl;
import consulo.codeEditor.Editor;
import consulo.document.Document;
import consulo.fileEditor.FileEditorManager;
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
import consulo.language.psi.PsiDirectory;
import consulo.language.psi.PsiDocumentManager;
import consulo.language.psi.PsiFile;
Expand Down Expand Up @@ -73,6 +73,7 @@ public void navigate(PsiJavaPackage psiPackage, boolean requestFocus) {
});
}

@RequiredReadAction
private static PsiDirectory[] suggestMostAppropriateDirectories(PsiJavaPackage psiPackage) {
Comment on lines +76 to 77
Copy link

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

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

suggestMostAppropriateDirectories() is now annotated @RequiredReadAction, but its immediate caller in this class (navigate()’s ToolWindow.activate callback) isn’t obviously under a read lock. To avoid read-access violations when touching PSI here, wrap the call in ReadAction.compute/run (or drop the annotation if it’s guaranteed to be called under a read action).

Copilot uses AI. Check for mistakes.
Project project = psiPackage.getProject();
PsiDirectory[] directories = null;
Expand All @@ -81,7 +82,7 @@ private static PsiDirectory[] suggestMostAppropriateDirectories(PsiJavaPackage p
Document document = editor.getDocument();
PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
if (psiFile != null) {
Module module = ModuleUtil.findModuleForPsiElement(psiFile);
Module module = psiFile.getModule();
if (module != null) {
directories = psiPackage.getDirectories(GlobalSearchScope.moduleWithDependenciesScope(module));
}
Expand Down
11 changes: 5 additions & 6 deletions ...java/impl/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@
import com.intellij.java.language.psi.PsiJavaFile;
import com.intellij.java.language.psi.PsiJavaPackage;
import com.intellij.java.language.psi.PsiLiteralExpression;
import consulo.module.Module;
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
import consulo.module.content.ModuleRootManager;
import consulo.util.lang.function.Condition;
import consulo.document.util.TextRange;
import consulo.virtualFileSystem.VirtualFile;
import consulo.language.psi.*;
import consulo.language.psi.path.FileReference;
import consulo.language.psi.path.FileReferenceSet;
import consulo.language.util.ProcessingContext;
import consulo.module.Module;
import consulo.module.content.ModuleRootManager;
import consulo.util.lang.function.Condition;
import consulo.virtualFileSystem.VirtualFile;

import java.util.*;

Expand Down Expand Up @@ -82,7 +81,7 @@ public Collection<PsiFileSystemItem> computeDefaultContexts() {
systemItems.addAll(getRoots(forModule, true));
}
} else {
systemItems.addAll(getRoots(ModuleUtil.findModuleForPsiElement(getElement()), true));
systemItems.addAll(getRoots(getElement().getModule(), true));
}
return systemItems;
}
Expand Down
3 changes: 1 addition & 2 deletions ...lij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import com.intellij.java.language.util.VisibilityUtil;
import consulo.annotation.access.RequiredReadAction;
import consulo.annotation.access.RequiredWriteAction;
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
import consulo.java.localize.JavaRefactoringLocalize;
import consulo.language.codeStyle.CodeStyleManager;
import consulo.language.editor.refactoring.localize.RefactoringLocalize;
Expand Down Expand Up @@ -340,7 +339,7 @@ private PsiClass buildClass() {
directory = myMoveDestination.getTargetDirectory(containingDirectory);
}
else {
Module module = ModuleUtil.findModuleForPsiElement(containingFile);
Module module = containingFile.getModule();
directory = PackageUtil.findOrCreateDirectoryForPackage(module, packageName, containingDirectory, true, true);
Copy link

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

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

containingFile.getModule() can be null (other call sites in the refactoring codebase typically assert module != null before using it). Passing a null module into PackageUtil.findOrCreateDirectoryForPackage(...) will NPE (module.getProject() inside). Consider asserting non-null (if guaranteed in this refactoring) or handling the null case explicitly before calling PackageUtil.

Suggested change
directory = PackageUtil.findOrCreateDirectoryForPackage(module, packageName, containingDirectory, true, true);
directory = module != null ? PackageUtil.findOrCreateDirectoryForPackage(module, packageName, containingDirectory, true, true) : null;

Copilot uses AI. Check for mistakes.
}

Expand Down
5 changes: 2 additions & 3 deletions .../intellij/java/impl/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import consulo.document.event.DocumentAdapter;
import consulo.document.event.DocumentEvent;
import consulo.ide.impl.idea.ide.util.DirectoryChooser;
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
import consulo.language.editor.ui.awt.EditorComboBox;
import consulo.language.psi.PsiDirectory;
import consulo.language.psi.PsiManager;
Expand All @@ -34,8 +33,8 @@
import consulo.ui.ex.awtUnsafe.TargetAWT;
import consulo.util.lang.Comparing;
import consulo.virtualFileSystem.VirtualFile;

import org.jspecify.annotations.Nullable;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
Expand Down Expand Up @@ -88,7 +87,7 @@ protected String getElementText(Object element) {
if (element == NULL_WRAPPER) return LEAVE_IN_SAME_SOURCE_ROOT;
if (element instanceof DirectoryChooser.ItemWrapper) {
VirtualFile virtualFile = ((DirectoryChooser.ItemWrapper) element).getDirectory().getVirtualFile();
Module module = ModuleUtil.findModuleForFile(virtualFile, project);
Module module = ModuleUtilCore.findModuleForFile(virtualFile, project);
if (module != null) {
return module.getName();
}
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/main/java/com/intellij/java/impl/util/xml/ui/PsiClassControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
import com.intellij.java.language.util.TreeClassChooser;
import com.intellij.java.language.util.TreeClassChooserFactory;
import consulo.document.Document;
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
import consulo.language.editor.intention.IntentionFilterOwner;
import consulo.language.editor.ui.awt.EditorTextField;
import consulo.language.editor.ui.awt.ReferenceEditorWithBrowseButton;
import consulo.language.psi.PsiDocumentManager;
import consulo.language.psi.scope.GlobalSearchScope;
import consulo.language.util.ModuleUtilCore;
import consulo.project.Project;
import consulo.ui.ex.localize.UILocalize;
import consulo.xml.dom.DomElement;
Expand Down Expand Up @@ -67,7 +67,7 @@ protected PsiClassPanel createMainComponent(PsiClassPanel boundedComponent, Proj
PsiCodeFragmentImpl fragment = (PsiCodeFragmentImpl) PsiDocumentManager.getInstance(project).getPsiFile(document);
assert fragment != null;
fragment.setIntentionActionsFilter(IntentionFilterOwner.IntentionActionsFilter.EVERYTHING_AVAILABLE);
fragment.putUserData(ModuleUtil.KEY_MODULE, getDomWrapper().getExistingDomElement().getModule());
fragment.putUserData(ModuleUtilCore.KEY_MODULE, getDomWrapper().getExistingDomElement().getModule());
return initReferenceEditorWithBrowseButton(boundedComponent, editor, this);
}

Expand Down
24 changes: 12 additions & 12 deletions plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
package com.intellij.psi.impl.cache.impl;

import static org.junit.Assert.assertEquals;

import java.io.File;
import java.io.IOException;

import com.intellij.java.language.psi.PsiClass;
import com.intellij.testFramework.PsiTestCase;
import com.intellij.testFramework.PsiTestUtil;
import consulo.application.ApplicationManager;
import consulo.language.psi.PsiFile;
import consulo.language.util.ModuleUtilCore;
import consulo.logging.Logger;
import consulo.module.Module;
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
import consulo.util.io.FileUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import consulo.virtualFileSystem.VirtualFile;
import com.intellij.java.language.psi.PsiClass;
import consulo.language.psi.PsiFile;
import com.intellij.testFramework.PsiTestCase;
import com.intellij.testFramework.PsiTestUtil;
import consulo.virtualFileSystem.util.VirtualFileUtil;

import java.io.File;
import java.io.IOException;

import static org.junit.Assert.assertEquals;

/**
* @author max
*/
Expand Down Expand Up @@ -80,13 +80,13 @@ public void run()
assertEquals(psiFile, psiClass.getContainingFile());

VirtualFile file = psiFile.getVirtualFile();
assertEquals(myModule, ModuleUtil.findModuleForFile(file, myProject));
assertEquals(myModule, ModuleUtilCore.findModuleForFile(file, myProject));

Module anotherModule = createModule("another");

PsiTestUtil.addSourceRoot(anotherModule, mySrcDir1);

assertEquals(anotherModule, ModuleUtil.findModuleForFile(file, myProject));
assertEquals(anotherModule, ModuleUtilCore.findModuleForFile(file, myProject));
}
});
}
Expand Down
Loading