From 38bd4dbcf795233951731202229d1ade59be68d0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 2 Feb 2012 15:00:47 +0400 Subject: [PATCH] Fixed NPE in JetFoldingBuilder --- idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java b/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java index c09fc0e52ce..d44a3c8345c 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java +++ b/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java @@ -38,7 +38,7 @@ public class JetFoldingBuilder extends FoldingBuilderEx implements DumbAware { ASTNode next = node.getTreeNext(); if (next != null) { ASTNode nextNext = next.getTreeNext(); - if (nextNext.getElementType() == JetTokens.IDE_TEMPLATE_END) { + if (nextNext != null && nextNext.getElementType() == JetTokens.IDE_TEMPLATE_END) { TextRange range = new TextRange(node.getStartOffset(), nextNext.getStartOffset() + nextNext.getTextLength()); descriptors.add(new FoldingDescriptor(next, range, null, Collections.emptySet(), true)); }