X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/IdentifierEngine.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/IdentifierEngine.java
index de2ce2e..570c0fa 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/IdentifierEngine.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/IdentifierEngine.java
@@ -11,6 +11,7 @@ import net.sourceforge.phpdt.internal.corext.template.php.CompilationUnitContext
 import net.sourceforge.phpdt.internal.corext.template.php.PHPUnitContext;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 import net.sourceforge.phpdt.internal.ui.text.java.IPHPCompletionProposal;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -88,9 +89,14 @@ public class IdentifierEngine {
 
     //		Template[] templates= Templates.getInstance().getTemplates();
     String identifier = null;
+    int maxProposals = PHPeclipsePlugin.MAX_PROPOSALS;
+
     for (int i = 0; i != identifiers.length; i++) {
       identifier = (String) identifiers[i];
       if (context.canEvaluate(identifier)) {
+        if (maxProposals-- < 0) {
+          return;
+        }
         fProposals.add(
           new IdentifierProposal(
             identifier,