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

Revert: make analysis-impl independent of jvm world (follow-up) (IDEA-CR-27218)

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-11-24 13:36:49 +03:00
parent c4804ea189
commit acc637e3e4
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
+11 -18
View File
@@ -28,9 +28,6 @@ import gnu.trove.THashMap;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.uast.UClass;
import org.jetbrains.uast.UMethod;
import org.jetbrains.uast.UastContextKt;
import javax.swing.*;
import java.util.Arrays;
@@ -48,11 +45,11 @@ public class RefJavaManagerImpl extends RefJavaManager {
.and(Conditions.instanceOf(PsiFile.class, PsiClass.class, PsiMethod.class, PsiField.class, PsiJavaModule.class), Conditions.notInstanceOf(PsiTypeParameter.class));
private static final Logger LOG = Logger.getInstance(RefJavaManagerImpl.class);
private final UMethod myAppMainPattern;
private final UMethod myAppPremainPattern;
private final UMethod myAppAgentmainPattern;
private final UClass myApplet;
private final UClass myServlet;
private final PsiMethod myAppMainPattern;
private final PsiMethod myAppPremainPattern;
private final PsiMethod myAppAgentmainPattern;
private final PsiClass myApplet;
private final PsiClass myServlet;
private volatile RefPackage myCachedDefaultPackage; // cached value. benign race
private Map<String, RefPackage> myPackages; // guarded by this
private final RefManagerImpl myRefManager;
@@ -64,16 +61,12 @@ public class RefJavaManagerImpl extends RefJavaManager {
final Project project = manager.getProject();
final PsiManager psiManager = PsiManager.getInstance(project);
PsiElementFactory factory = JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory();
myAppMainPattern = (UMethod)UastContextKt.toUElement(factory.createMethodFromText("void main(String[] args);", null));
myAppPremainPattern = (UMethod)UastContextKt
.toUElement(factory.createMethodFromText("void premain(String[] args, java.lang.instrument.Instrumentation i);", null));
myAppAgentmainPattern = (UMethod)UastContextKt
.toUElement(factory.createMethodFromText("void agentmain(String[] args, java.lang.instrument.Instrumentation i);", null));
myAppMainPattern = factory.createMethodFromText("void main(String[] args);", null);
myAppPremainPattern = factory.createMethodFromText("void premain(String[] args, java.lang.instrument.Instrumentation i);", null);
myAppAgentmainPattern = factory.createMethodFromText("void agentmain(String[] args, java.lang.instrument.Instrumentation i);", null);
myApplet = (UClass)UastContextKt
.toUElement(JavaPsiFacade.getInstance(project).findClass("java.applet.Applet", GlobalSearchScope.allScope(project)));
myServlet = (UClass)UastContextKt
.toUElement(JavaPsiFacade.getInstance(project).findClass("javax.servlet.Servlet", GlobalSearchScope.allScope(project)));
myApplet = JavaPsiFacade.getInstance(project).findClass("java.applet.Applet", GlobalSearchScope.allScope(project));
myServlet = JavaPsiFacade.getInstance(project).findClass("javax.servlet.Servlet", GlobalSearchScope.allScope(project));
}
@Override
@@ -388,7 +381,7 @@ public class RefJavaManagerImpl extends RefJavaManager {
@Override
public boolean shouldProcessExternalFile(@NotNull PsiFile file) {
return file instanceof PsiClassOwner;
return false;
}
@NotNull