From 60f087a7cdcc58ab965f4e91ac10cdad84e1f18e Mon Sep 17 00:00:00 2001
From: anstarovoyt <andrey.starovoyt@jetbrains.com>
Date: Thu, 8 Nov 2018 15:00:11 +0300
Subject: [PATCH] psi viewer fix possible npe

---
 .../psiView/formattingblocks/BlockViewerPsiBasedTree.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/formattingblocks/BlockViewerPsiBasedTree.java b/platform/lang-impl/src/com/intellij/internal/psiView/formattingblocks/BlockViewerPsiBasedTree.java
index 320dbfab9949..84e67014b068 100644
--- a/platform/lang-impl/src/com/intellij/internal/psiView/formattingblocks/BlockViewerPsiBasedTree.java
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/formattingblocks/BlockViewerPsiBasedTree.java
@@ -257,7 +257,10 @@ public class BlockViewerPsiBasedTree implements ViewerPsiBasedTree {
       return null;
     }
 
-    BlockTreeNode node = (BlockTreeNode)getRoot().getUserObject();
+    DefaultMutableTreeNode root = getRoot();
+    if (root == null) return null;
+    
+    BlockTreeNode node = (BlockTreeNode)root.getUserObject();
     main_loop:
     while (true) {
       if (node.getBlock().getTextRange().equals(range)) {
@@ -316,6 +319,7 @@ public class BlockViewerPsiBasedTree implements ViewerPsiBasedTree {
     }
   }
 
+  @Nullable
   private DefaultMutableTreeNode getRoot() {
     return (DefaultMutableTreeNode)myBlockTree.getModel().getRoot();
   }