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

fix invalid PSI access in debugger (EA-72005 - assert: EmptySubstitutorImpl.put)

Browse Source
This commit is contained in:
peter
2015-11-26 15:56:29 +01:00
parent 38783bd991
commit 0a155bda70
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/JVMNameUtil.java
+1 -1
View File
@@ -365,7 +365,7 @@ public class JVMNameUtil {
return null;
}
final PsiElement element = position.getElementAt();
return (element != null) ? PsiTreeUtil.getParentOfType(element, PsiClass.class, false) : null;
return element != null && element.isValid() ? PsiTreeUtil.getParentOfType(element, PsiClass.class, false) : null;
}
@Nullable
java/java-psi-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java
+3 -2
View File
@@ -17,6 +17,7 @@ package com.intellij.psi.impl;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
@@ -45,8 +46,8 @@ public final class EmptySubstitutorImpl extends EmptySubstitutor {
@NotNull
@Override
public PsiSubstitutor put(@NotNull PsiTypeParameter classParameter, PsiType mapping){
if (mapping != null && !mapping.isValid()) {
LOG.error("Invalid type in substitutor: " + mapping);
if (mapping != null) {
PsiUtil.ensureValidType(mapping);
}
return new PsiSubstitutorImpl(classParameter, mapping);
}