1 files changed, 7 insertions, 2 deletions
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/LiveTemplateBuilder.java b/platform/lang-impl/src/com/intellij/codeInsight/template/LiveTemplateBuilder.java
index 512bfa1b27fb..9678ef213f45 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/LiveTemplateBuilder.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/LiveTemplateBuilder.java
@@ -247,8 +247,13 @@ public class LiveTemplateBuilder {
         else {
           newVarName = varName;
         }
-        Variable var =
-          new Variable(newVarName, template.getExpressionStringAt(i), template.getDefaultValueStringAt(i), template.isAlwaysStopAt(i));
+        Variable var = new Variable(newVarName, template.getExpressionStringAt(i), template.getDefaultValueStringAt(i), template.isAlwaysStopAt(i));
+        if (mySegmentLimit >= 0 && myVariables.size() >= mySegmentLimit) {
+          if (mySegmentLimit > 0) {
+            LOGGER.warn("Template with more than " + mySegmentLimit + " segments had been build. Text: " + myText);
+          }
+          break;
+        }
         myVariables.add(var);
         myVarNames.add(newVarName);
       }