Skip to content

Commit fac1c4e

Browse files
unv-unvunv-unv
committed
Replacing consulo.ide.impl.idea.openapi.module.ModuleUtil with consulo.language.util.ModuleUtilCore.
1 parent eaa237b commit fac1c4e

8 files changed

Lines changed: 34 additions & 35 deletions

File tree

‎plugin/src/main/java/com/intellij/java/impl/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.intellij.java.impl.codeInspection.unnecessaryModuleDependency;
22

3+
import consulo.annotation.access.RequiredReadAction;
34
import consulo.language.editor.inspection.reference.RefElement;
45
import consulo.language.editor.inspection.reference.RefGraphAnnotator;
56
import consulo.language.editor.inspection.reference.RefManager;
67
import consulo.language.editor.inspection.reference.RefModule;
8+
import consulo.language.psi.PsiElement;
79
import consulo.module.Module;
8-
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
910
import consulo.util.dataholder.Key;
10-
import consulo.language.psi.PsiElement;
1111

1212
import java.util.HashSet;
1313
import java.util.Set;
@@ -26,12 +26,13 @@ public UnnecessaryModuleDependencyAnnotator(RefManager manager) {
2626
}
2727

2828
@Override
29+
@RequiredReadAction
2930
public void onMarkReferenced(RefElement refWhat, RefElement refFrom, boolean referencedFromClassInitializer) {
3031
PsiElement onElement = refWhat.getElement();
3132
PsiElement fromElement = refFrom.getElement();
3233
if (onElement != null && fromElement!= null){
33-
Module onModule = ModuleUtil.findModuleForPsiElement(onElement);
34-
Module fromModule = ModuleUtil.findModuleForPsiElement(fromElement);
34+
Module onModule = onElement.getModule();
35+
Module fromModule = fromElement.getModule();
3536
if (onModule != null && fromModule != null && onModule != fromModule){
3637
RefModule refModule = myManager.getRefModule(fromModule);
3738
if (refModule != null) {

‎plugin/src/main/java/com/intellij/java/impl/ig/junit/UseOfObsoleteAssertInspection.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.siyeh.ig.BaseInspectionVisitor;
2222
import com.siyeh.ig.InspectionGadgetsFix;
2323
import com.siyeh.localize.InspectionGadgetsLocalize;
24-
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
24+
import consulo.annotation.access.RequiredReadAction;
2525
import consulo.language.editor.inspection.ProblemDescriptor;
2626
import consulo.language.psi.PsiElement;
2727
import consulo.language.psi.PsiFile;
@@ -57,11 +57,11 @@ public BaseInspectionVisitor buildVisitor() {
5757
}
5858

5959
private static class UseOfObsoleteAssertVisitor extends BaseInspectionVisitor {
60-
6160
@Override
61+
@RequiredReadAction
6262
public void visitMethodCallExpression(PsiMethodCallExpression expression) {
6363
Project project = expression.getProject();
64-
Module module = ModuleUtil.findModuleForPsiElement(expression);
64+
Module module = expression.getModule();
6565
if (module == null) {
6666
return;
6767
}
@@ -71,7 +71,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
7171
return;
7272
}
7373
PsiMethod psiMethod = expression.resolveMethod();
74-
if (psiMethod == null || !psiMethod.hasModifierProperty(PsiModifier.STATIC)) {
74+
if (psiMethod == null || !psiMethod.isStatic()) {
7575
return;
7676
}
7777
PsiClass containingClass = psiMethod.getContainingClass();

‎plugin/src/main/java/com/intellij/java/impl/psi/impl/file/PsiPackageImplementationHelperImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import com.intellij.java.language.impl.psi.NonClasspathClassFinder;
1919
import com.intellij.java.language.impl.psi.impl.file.PsiPackageImplementationHelper;
2020
import com.intellij.java.language.psi.PsiJavaPackage;
21+
import consulo.annotation.access.RequiredReadAction;
2122
import consulo.annotation.component.ServiceImpl;
2223
import consulo.codeEditor.Editor;
2324
import consulo.document.Document;
2425
import consulo.fileEditor.FileEditorManager;
25-
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
2626
import consulo.language.psi.PsiDirectory;
2727
import consulo.language.psi.PsiDocumentManager;
2828
import consulo.language.psi.PsiFile;
@@ -73,6 +73,7 @@ public void navigate(PsiJavaPackage psiPackage, boolean requestFocus) {
7373
});
7474
}
7575

76+
@RequiredReadAction
7677
private static PsiDirectory[] suggestMostAppropriateDirectories(PsiJavaPackage psiPackage) {
7778
Project project = psiPackage.getProject();
7879
PsiDirectory[] directories = null;
@@ -81,7 +82,7 @@ private static PsiDirectory[] suggestMostAppropriateDirectories(PsiJavaPackage p
8182
Document document = editor.getDocument();
8283
PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
8384
if (psiFile != null) {
84-
Module module = ModuleUtil.findModuleForPsiElement(psiFile);
85+
Module module = psiFile.getModule();
8586
if (module != null) {
8687
directories = psiPackage.getDirectories(GlobalSearchScope.moduleWithDependenciesScope(module));
8788
}

‎plugin/src/main/java/com/intellij/java/impl/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@
1919
import com.intellij.java.language.psi.PsiJavaFile;
2020
import com.intellij.java.language.psi.PsiJavaPackage;
2121
import com.intellij.java.language.psi.PsiLiteralExpression;
22-
import consulo.module.Module;
23-
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
24-
import consulo.module.content.ModuleRootManager;
25-
import consulo.util.lang.function.Condition;
2622
import consulo.document.util.TextRange;
27-
import consulo.virtualFileSystem.VirtualFile;
2823
import consulo.language.psi.*;
2924
import consulo.language.psi.path.FileReference;
3025
import consulo.language.psi.path.FileReferenceSet;
3126
import consulo.language.util.ProcessingContext;
27+
import consulo.module.Module;
28+
import consulo.module.content.ModuleRootManager;
29+
import consulo.util.lang.function.Condition;
30+
import consulo.virtualFileSystem.VirtualFile;
3231

3332
import java.util.*;
3433

@@ -82,7 +81,7 @@ public Collection<PsiFileSystemItem> computeDefaultContexts() {
8281
systemItems.addAll(getRoots(forModule, true));
8382
}
8483
} else {
85-
systemItems.addAll(getRoots(ModuleUtil.findModuleForPsiElement(getElement()), true));
84+
systemItems.addAll(getRoots(getElement().getModule(), true));
8685
}
8786
return systemItems;
8887
}

‎plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import com.intellij.java.language.util.VisibilityUtil;
3737
import consulo.annotation.access.RequiredReadAction;
3838
import consulo.annotation.access.RequiredWriteAction;
39-
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
4039
import consulo.java.localize.JavaRefactoringLocalize;
4140
import consulo.language.codeStyle.CodeStyleManager;
4241
import consulo.language.editor.refactoring.localize.RefactoringLocalize;
@@ -340,7 +339,7 @@ private PsiClass buildClass() {
340339
directory = myMoveDestination.getTargetDirectory(containingDirectory);
341340
}
342341
else {
343-
Module module = ModuleUtil.findModuleForPsiElement(containingFile);
342+
Module module = containingFile.getModule();
344343
directory = PackageUtil.findOrCreateDirectoryForPackage(module, packageName, containingDirectory, true, true);
345344
}
346345

‎plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import consulo.document.event.DocumentAdapter;
2121
import consulo.document.event.DocumentEvent;
2222
import consulo.ide.impl.idea.ide.util.DirectoryChooser;
23-
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
2423
import consulo.language.editor.ui.awt.EditorComboBox;
2524
import consulo.language.psi.PsiDirectory;
2625
import consulo.language.psi.PsiManager;
@@ -34,8 +33,8 @@
3433
import consulo.ui.ex.awtUnsafe.TargetAWT;
3534
import consulo.util.lang.Comparing;
3635
import consulo.virtualFileSystem.VirtualFile;
37-
3836
import org.jspecify.annotations.Nullable;
37+
3938
import javax.swing.*;
4039
import java.awt.*;
4140
import java.awt.event.ActionEvent;
@@ -88,7 +87,7 @@ protected String getElementText(Object element) {
8887
if (element == NULL_WRAPPER) return LEAVE_IN_SAME_SOURCE_ROOT;
8988
if (element instanceof DirectoryChooser.ItemWrapper) {
9089
VirtualFile virtualFile = ((DirectoryChooser.ItemWrapper) element).getDirectory().getVirtualFile();
91-
Module module = ModuleUtil.findModuleForFile(virtualFile, project);
90+
Module module = ModuleUtilCore.findModuleForFile(virtualFile, project);
9291
if (module != null) {
9392
return module.getName();
9493
}

‎plugin/src/main/java/com/intellij/java/impl/util/xml/ui/PsiClassControl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import com.intellij.java.language.util.TreeClassChooser;
2525
import com.intellij.java.language.util.TreeClassChooserFactory;
2626
import consulo.document.Document;
27-
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
2827
import consulo.language.editor.intention.IntentionFilterOwner;
2928
import consulo.language.editor.ui.awt.EditorTextField;
3029
import consulo.language.editor.ui.awt.ReferenceEditorWithBrowseButton;
3130
import consulo.language.psi.PsiDocumentManager;
3231
import consulo.language.psi.scope.GlobalSearchScope;
32+
import consulo.language.util.ModuleUtilCore;
3333
import consulo.project.Project;
3434
import consulo.ui.ex.localize.UILocalize;
3535
import consulo.xml.dom.DomElement;
@@ -67,7 +67,7 @@ protected PsiClassPanel createMainComponent(PsiClassPanel boundedComponent, Proj
6767
PsiCodeFragmentImpl fragment = (PsiCodeFragmentImpl) PsiDocumentManager.getInstance(project).getPsiFile(document);
6868
assert fragment != null;
6969
fragment.setIntentionActionsFilter(IntentionFilterOwner.IntentionActionsFilter.EVERYTHING_AVAILABLE);
70-
fragment.putUserData(ModuleUtil.KEY_MODULE, getDomWrapper().getExistingDomElement().getModule());
70+
fragment.putUserData(ModuleUtilCore.KEY_MODULE, getDomWrapper().getExistingDomElement().getModule());
7171
return initReferenceEditorWithBrowseButton(boundedComponent, editor, this);
7272
}
7373

‎plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package com.intellij.psi.impl.cache.impl;
22

3-
import static org.junit.Assert.assertEquals;
4-
5-
import java.io.File;
6-
import java.io.IOException;
7-
3+
import com.intellij.java.language.psi.PsiClass;
4+
import com.intellij.testFramework.PsiTestCase;
5+
import com.intellij.testFramework.PsiTestUtil;
86
import consulo.application.ApplicationManager;
7+
import consulo.language.psi.PsiFile;
8+
import consulo.language.util.ModuleUtilCore;
99
import consulo.logging.Logger;
1010
import consulo.module.Module;
11-
import consulo.ide.impl.idea.openapi.module.ModuleUtil;
1211
import consulo.util.io.FileUtil;
1312
import consulo.virtualFileSystem.LocalFileSystem;
1413
import consulo.virtualFileSystem.VirtualFile;
15-
import com.intellij.java.language.psi.PsiClass;
16-
import consulo.language.psi.PsiFile;
17-
import com.intellij.testFramework.PsiTestCase;
18-
import com.intellij.testFramework.PsiTestUtil;
1914
import consulo.virtualFileSystem.util.VirtualFileUtil;
2015

16+
import java.io.File;
17+
import java.io.IOException;
18+
19+
import static org.junit.Assert.assertEquals;
20+
2121
/**
2222
* @author max
2323
*/
@@ -80,13 +80,13 @@ public void run()
8080
assertEquals(psiFile, psiClass.getContainingFile());
8181

8282
VirtualFile file = psiFile.getVirtualFile();
83-
assertEquals(myModule, ModuleUtil.findModuleForFile(file, myProject));
83+
assertEquals(myModule, ModuleUtilCore.findModuleForFile(file, myProject));
8484

8585
Module anotherModule = createModule("another");
8686

8787
PsiTestUtil.addSourceRoot(anotherModule, mySrcDir1);
8888

89-
assertEquals(anotherModule, ModuleUtil.findModuleForFile(file, myProject));
89+
assertEquals(anotherModule, ModuleUtilCore.findModuleForFile(file, myProject));
9090
}
9191
});
9292
}

0 commit comments

Comments
 (0)