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

return non-nearest source position in dumb mode (EA-96692 - INRE: FileBasedIndexImpl.handleDumbMode)

Browse Source
This commit is contained in:
peter
2017-02-16 18:39:52 +01:00
parent 945b60a693
commit 022a7e4400
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/DefaultSourcePositionProvider.java
+15 -10
View File
@@ -27,6 +27,7 @@ import com.intellij.debugger.ui.impl.watch.MethodReturnValueDescriptorImpl;
import com.intellij.debugger.ui.tree.FieldDescriptor;
import com.intellij.debugger.ui.tree.LocalVariableDescriptor;
import com.intellij.debugger.ui.tree.NodeDescriptor;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
@@ -75,10 +76,10 @@ public class DefaultSourcePositionProvider extends SourcePositionProvider {
}
@Nullable
private SourcePosition getSourcePositionForField(@NotNull FieldDescriptor descriptor,
@NotNull Project project,
@NotNull DebuggerContextImpl context,
boolean nearest) {
private static SourcePosition getSourcePositionForField(@NotNull FieldDescriptor descriptor,
@NotNull Project project,
@NotNull DebuggerContextImpl context,
boolean nearest) {
final ReferenceType type = descriptor.getField().declaringType();
final JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
final String fieldName = descriptor.getField().name();
@@ -142,10 +143,10 @@ public class DefaultSourcePositionProvider extends SourcePositionProvider {
}
@Nullable
private SourcePosition getSourcePositionForLocalVariable(String name,
@NotNull Project project,
@NotNull DebuggerContextImpl context,
boolean nearest) {
private static SourcePosition getSourcePositionForLocalVariable(String name,
@NotNull Project project,
@NotNull DebuggerContextImpl context,
boolean nearest) {
PsiElement place = PositionUtil.getContextElement(context);
if (place == null) return null;
@@ -154,8 +155,12 @@ public class DefaultSourcePositionProvider extends SourcePositionProvider {
PsiFile containingFile = psiVariable.getContainingFile();
if(containingFile == null) return null;
if (nearest) {
return DebuggerContextUtil.findNearest(context, psiVariable, containingFile);
try {
if (nearest) {
return DebuggerContextUtil.findNearest(context, psiVariable, containingFile);
}
}
catch (IndexNotReadyException ignore) {
}
return SourcePosition.createFromElement(psiVariable);
}