diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java index 6e1f5e5de..6f66a8e08 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java @@ -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; @@ -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) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/junit/UseOfObsoleteAssertInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/junit/UseOfObsoleteAssertInspection.java index 7ad2008a8..b6484eab0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/junit/UseOfObsoleteAssertInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/junit/UseOfObsoleteAssertInspection.java @@ -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; @@ -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; } @@ -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(); diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/file/PsiPackageImplementationHelperImpl.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/file/PsiPackageImplementationHelperImpl.java index e29e22a20..b8b31a607 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/file/PsiPackageImplementationHelperImpl.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/file/PsiPackageImplementationHelperImpl.java @@ -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; @@ -73,6 +73,7 @@ public void navigate(PsiJavaPackage psiPackage, boolean requestFocus) { }); } + @RequiredReadAction private static PsiDirectory[] suggestMostAppropriateDirectories(PsiJavaPackage psiPackage) { Project project = psiPackage.getProject(); PsiDirectory[] directories = null; @@ -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)); } diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java index a073ab302..9e0b0e4cd 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java @@ -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.*; @@ -82,7 +81,7 @@ public Collection computeDefaultContexts() { systemItems.addAll(getRoots(forModule, true)); } } else { - systemItems.addAll(getRoots(ModuleUtil.findModuleForPsiElement(getElement()), true)); + systemItems.addAll(getRoots(getElement().getModule(), true)); } return systemItems; } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java index 35717041c..11b398ed8 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java @@ -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; @@ -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); } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java index 6774d0237..5c7478895 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java @@ -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; @@ -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; @@ -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(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/util/xml/ui/PsiClassControl.java b/plugin/src/main/java/com/intellij/java/impl/util/xml/ui/PsiClassControl.java index c83bf53d0..bea646bc5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/util/xml/ui/PsiClassControl.java +++ b/plugin/src/main/java/com/intellij/java/impl/util/xml/ui/PsiClassControl.java @@ -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; @@ -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); } diff --git a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java index b90d058a0..ba2248bf0 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java @@ -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 */ @@ -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)); } }); }