From db740a2bb8d209809a1cbeb443cceb26b82ac53d Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Mon, 19 Jul 2010 13:54:18 +0400 Subject: [PATCH] assertion message --- .../intellij/codeInsight/template/impl/TemplateState.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 720fb1d6a01d..10aaab15bc90 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 @@ -70,6 +70,7 @@ public class TemplateState implements Disposable { private Editor myEditor; private TemplateImpl myTemplate; + private TemplateImpl myPrevTemplate; private TemplateSegments mySegments = null; private Map myPredefinedVariableValues; @@ -219,6 +220,7 @@ public class TemplateState implements Disposable { mySegments = null; } myTemplateRange = null; + myPrevTemplate = myTemplate; myTemplate = null; releaseEditor(); myTabStopHighlighters.clear(); @@ -271,6 +273,7 @@ public class TemplateState implements Disposable { myTemplateIndented = false; myCurrentVariableNumber = -1; mySegments = new TemplateSegments(myEditor); + myPrevTemplate = myTemplate; myTemplate = template; //myArgument = argument; myPredefinedVariableValues = predefinedVarValues; @@ -378,7 +381,7 @@ public class TemplateState implements Disposable { private void afterChangedUpdate() { if (isFinished()) return; - LOG.assertTrue(myTemplate != null); + LOG.assertTrue(myTemplate != null, myPrevTemplate != null ? myPrevTemplate.getKey() : "prev template is null"); if (myDocumentChanged) { if (myDocumentChangesTerminateTemplate || mySegments.isInvalid()) { final int oldIndex = myCurrentVariableNumber;