From c5e251cd254b918f9cb3f090e024d159d240ef70 Mon Sep 17 00:00:00 2001
From: Maxim Mossienko <Maxim.Mossienko@jetbrains.com>
Date: Tue, 8 Feb 2005 22:07:12 +0300
Subject: [PATCH] NPE fix

---
 .../intellij/codeInsight/highlighting/BraceMatchingUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java b/source/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java
index af8081b639f9..7f0a6b6d8c9b 100644
--- a/source/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java
+++ b/source/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java
@@ -243,7 +243,7 @@ public class BraceMatchingUtil {
     }
 
     public IElementType getTokenType(char ch, HighlighterIterator iterator) {
-      final IElementType tokenType = iterator.getTokenType();
+      final IElementType tokenType = (!iterator.atEnd())?iterator.getTokenType():null;
 
       if(tokenType instanceof IJavaElementType) {
         if (ch == '}') return JavaTokenType.RBRACE;