MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

OrderEntryFix does multiple root changes interleaved with findClass calls, enable slow resolve to handle that

Browse Source
This commit is contained in:
peter
2015-04-07 18:23:00 +02:00
parent cdcbea3233
commit 6f97db6bb8
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java
+23 -11
View File
@@ -124,17 +124,21 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
if (isJunit4) {
final VirtualFile location = PsiUtilCore.getVirtualFile(reference.getElement());
boolean inTests = location != null && ModuleRootManager.getInstance(currentModule).getFileIndex().isInTestSourceContent(location);
DumbService.getInstance(project).setAlternativeResolveEnabled(true);
try {
addJUnit4Library(inTests, currentModule);
final GlobalSearchScope scope = GlobalSearchScope.moduleWithLibrariesScope(currentModule);
final PsiClass aClass = JavaPsiFacade.getInstance(project).findClass(className, scope);
if (aClass != null && editor != null && !DumbService.isDumb(project)) {
if (aClass != null && editor != null) {
new AddImportAction(project, reference, editor, aClass).execute();
}
}
catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
finally {
DumbService.getInstance(project).setAlternativeResolveEnabled(false);
}
} else {
addBundledJarToRoots(project, editor, currentModule, reference, className, JavaSdkUtil.getJunit3JarPath());
}
@@ -249,10 +253,15 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
}
@Override
public void invoke(@NotNull Project project, @Nullable Editor editor, PsiFile file) {
public void invoke(@NotNull final Project project, @Nullable final Editor editor, PsiFile file) {
OrderEntryUtil.addLibraryToRoots(libraryEntry, currentModule);
if (editor != null && !DumbService.isDumb(project)) {
new AddImportAction(project, reference, editor, aClass).execute();
if (editor != null) {
DumbService.getInstance(project).withAlternativeResolveEnabled(new Runnable() {
@Override
public void run() {
new AddImportAction(project, reference, editor, aClass).execute();
}
});
}
}
};
@@ -323,14 +332,17 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
@NonNls final String className,
@NonNls final String libVirtFile) {
addJarToRoots(libVirtFile, currentModule, reference != null ? reference.getElement() : null);
if (DumbService.isDumb(project)) return;
GlobalSearchScope scope = GlobalSearchScope.moduleWithLibrariesScope(currentModule);
PsiClass aClass = JavaPsiFacade.getInstance(project).findClass(className, scope);
if (aClass != null && editor != null && reference != null) {
new AddImportAction(project, reference, editor, aClass).execute();
}
DumbService.getInstance(project).withAlternativeResolveEnabled(new Runnable() {
@Override
public void run() {
GlobalSearchScope scope = GlobalSearchScope.moduleWithLibrariesScope(currentModule);
PsiClass aClass = JavaPsiFacade.getInstance(project).findClass(className, scope);
if (aClass != null && editor != null && reference != null) {
new AddImportAction(project, reference, editor, aClass).execute();
}
}
});
}
public static void addJarToRoots(String libPath, final Module module, @Nullable PsiElement location) {