From 478efc69bae5c6714b4027c244b283cb8133ec2a Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 5 Dec 2011 21:57:05 +0100 Subject: [PATCH] EA-30976 - NPE: TemplateState$9.run [peter] (cherry picked from commit b79e43bebd7a8f56a3f17ff563640062baa9afb7) --- .../com/intellij/codeInsight/template/impl/TemplateState.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java index fa35cb2c005f..a9291d29f85f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java @@ -803,6 +803,7 @@ public class TemplateState implements Disposable { } public void gotoEnd(boolean brokenOff) { + if (myTemplate == null) return; calcResults(false); doReformat(null); finishTemplateEditing(brokenOff); @@ -815,6 +816,7 @@ public class TemplateState implements Disposable { private void finishTemplateEditing(boolean brokenOff) { if (myTemplate == null) return; + LookupManager.getInstance(myProject).hideActiveLookup(); int endSegmentNumber = myTemplate.getEndSegmentNumber();