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

EA-87911 - IAE: DebuggerUtils.findClass

Browse Source
This commit is contained in:
Egor.Ushakov
2016-09-06 14:20:58 +03:00
parent 80f61b68eb
commit 4edc44db65
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java
+22 -18
View File
@@ -38,6 +38,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.util.ProgressIndicatorUtils;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiJavaParserFacadeImpl;
import com.intellij.psi.search.GlobalSearchScope;
@@ -53,6 +54,7 @@ import com.sun.jdi.Value;
import com.sun.jdi.connect.spi.TransportService;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
@@ -146,26 +148,28 @@ public class DebuggerUtilsImpl extends DebuggerUtilsEx{
}
@NotNull
public static Pair<PsiClass, PsiType> getPsiClassAndType(String className, Project project) {
PsiClass contextClass;
PsiType contextType;
PsiPrimitiveType primitiveType = PsiJavaParserFacadeImpl.getPrimitiveType(className);
if (primitiveType != null) {
contextClass = JavaPsiFacade.getInstance(project).findClass(primitiveType.getBoxedTypeName(), GlobalSearchScope.allScope(project));
contextType = primitiveType;
}
else {
contextClass = findClass(className, project, GlobalSearchScope.allScope(project));
public static Pair<PsiClass, PsiType> getPsiClassAndType(@Nullable String className, Project project) {
PsiClass contextClass = null;
PsiType contextType = null;
if (!StringUtil.isEmpty(className)) {
PsiPrimitiveType primitiveType = PsiJavaParserFacadeImpl.getPrimitiveType(className);
if (primitiveType != null) {
contextClass = JavaPsiFacade.getInstance(project).findClass(primitiveType.getBoxedTypeName(), GlobalSearchScope.allScope(project));
contextType = primitiveType;
}
else {
contextClass = findClass(className, project, GlobalSearchScope.allScope(project));
if (contextClass != null) {
contextClass = (PsiClass)contextClass.getNavigationElement();
}
if (contextClass instanceof PsiCompiledElement) {
contextClass = (PsiClass)((PsiCompiledElement)contextClass).getMirror();
}
contextType = getType(className, project);
}
if (contextClass != null) {
contextClass = (PsiClass)contextClass.getNavigationElement();
contextClass.putUserData(PSI_TYPE_KEY, contextType);
}
if (contextClass instanceof PsiCompiledElement) {
contextClass = (PsiClass)((PsiCompiledElement)contextClass).getMirror();
}
contextType = getType(className, project);
}
if (contextClass != null) {
contextClass.putUserData(PSI_TYPE_KEY, contextType);
}
return Pair.create(contextClass, contextType);
}