From d444c027f44ea469e81dfb3eaf3188c95d96ce4c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 11 Jun 2012 14:39:44 +0200
Subject: [PATCH] EA-36079 - NPE:
 PsiViewerDialog$EditorListener.selectionChanged

---
 .../src/com/intellij/internal/psiView/PsiViewerDialog.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
index cfb74dc28a0a..2d2e929b8967 100644
--- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
@@ -1247,9 +1247,9 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp
       ViewerTreeStructure treeStructure = (ViewerTreeStructure)myPsiTreeBuilder.getTreeStructure();
       if (treeStructure == null) return;
       final PsiElement rootElement = treeStructure.getRootPsiElement();
+      if (rootElement == null) return;
       final SelectionModel selection = myEditor.getSelectionModel();
-      PsiElement rootPsiElement = treeStructure.getRootPsiElement();
-      final TextRange textRange = rootPsiElement.getTextRange();
+      final TextRange textRange = rootElement.getTextRange();
       int baseOffset = textRange != null ? textRange.getStartOffset() : 0;
       final int start = selection.getSelectionStart()+baseOffset;
       final int end = selection.getSelectionEnd()+baseOffset - 1;