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

avoid NPE for leaf AST nodes in CompositeFoldingBuilder (IDEA-CR-17560)

Browse Source
This commit is contained in:
peter
2017-01-20 13:46:49 +01:00
parent 724cf5410a
commit f876aea8ee
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java
+16 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.lang.ASTNode;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.PossiblyDumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
@@ -90,7 +91,21 @@ public class CompositeFoldingBuilder extends FoldingBuilderEx implements Possibl
}
private static boolean mayUseBuilder(@NotNull ASTNode node, @Nullable FoldingBuilder builder) {
return builder != null && (DumbService.isDumbAware(builder) || !DumbService.isDumb(node.getPsi().getProject()));
if (builder == null) return false;
if (DumbService.isDumbAware(builder)) return true;
Project project = getProjectByNode(node);
return project == null || !DumbService.isDumb(project);
}
@Nullable
private static Project getProjectByNode(@NotNull ASTNode node) {
PsiElement psi = node.getPsi();
if (psi == null) {
ASTNode parent = node.getTreeParent();
psi = parent == null ? null : parent.getPsi();
}
return psi == null ? null : psi.getProject();
}
@Override