From f876aea8eeb064834da19dc4ff175bf548a9af91 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 20 Jan 2017 13:24:47 +0100
Subject: [PATCH] avoid NPE for leaf AST nodes in CompositeFoldingBuilder
 (IDEA-CR-17560)

---
 .../lang/folding/CompositeFoldingBuilder.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java b/platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java
index 4fdc9bf64a06..cbfb20bb7f87 100644
--- a/platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java
+++ b/platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java
@@ -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