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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/BuiltInProposal.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/BuiltInProposal.java
index f66e38e..8fa33ab 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/BuiltInProposal.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/BuiltInProposal.java
@@ -35,10 +35,10 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
   //  private final Image fImage_builtin;
 
   private final IRegion fRegion;
-//  private IRegion fSelectedRegion; // initialized by apply()
+  //  private IRegion fSelectedRegion; // initialized by apply()
 
   private final String fBuiltinFunctionName;
-//  private final ITextViewer fViewer;
+  //  private final ITextViewer fViewer;
 
   /**
    * Creates a template proposal with a template and its context.
@@ -51,7 +51,7 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
     fBuiltinFunctionName = functionName;
     fFunction = function;
     fContext = context;
-//    fViewer = viewer;
+    //    fViewer = viewer;
     fRegion = region;
   }
 
@@ -68,7 +68,7 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
 
       // insert template string
       //  String templateString = fTemplate; // fTemplateBuffer.getString();	
-      document.replace(start, end - start, fBuiltinFunctionName);
+      document.replace(start, end - start, fBuiltinFunctionName + "()");
 
       // translate positions
       LinkedPositionManager manager = new LinkedPositionManager(document);
@@ -87,7 +87,7 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
       //			}
 
       LinkedPositionUI editor = new LinkedPositionUI(fViewer, manager);
-      editor.setFinalCaretOffset(fBuiltinFunctionName.length() + start);
+      editor.setFinalCaretOffset(fBuiltinFunctionName.length() + start + 1);
       //   editor.setFinalCaretOffset(getCaretOffset(fTemplateBuffer) + start);
       editor.enter();
 
@@ -107,7 +107,7 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
    * @see ICompletionProposal#getAdditionalProposalInfo()
    */
   public String getAdditionalProposalInfo() {
-    return textToHTML(fFunction.getUsage() + "\n\n" + fFunction.getDescription()); // fTemplateBuffer.getString());
+    return textToHTML(fFunction.getDescription()); // fTemplateBuffer.getString());
   }
 
   /*
@@ -121,7 +121,7 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
    * @see ICompletionProposal#getDisplayString()
    */
   public String getDisplayString() {
-    return fBuiltinFunctionName + TemplateMessages.getString("TemplateProposal.delimiter") + fBuiltinFunctionName; // $NON-NLS-1$ //$NON-NLS-1$
+    return fBuiltinFunctionName + TemplateMessages.getString("TemplateProposal.delimiter") + fFunction.getUsage(); // $NON-NLS-1$ //$NON-NLS-1$
     //		return fTemplate.getName() + ObfuscatorMessages.getString("TemplateProposal.delimiter") + fTemplate.getDescription(); // $NON-NLS-1$ //$NON-NLS-1$
   }