Created a separated 'externaltools' plugin
[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / php / PHPCompletionProcessor.java
index c8755e0..0ccf4c7 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor.php;
 
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
+import java.io.IOException;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.SortedMap;
 
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IMethod;
-import net.sourceforge.phpdt.core.ISourceRange;
+import net.sourceforge.phpdt.core.IType;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.ToolFactory;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
+import net.sourceforge.phpdt.internal.compiler.DefaultErrorHandlingPolicies;
+import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
+import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError;
+import net.sourceforge.phpdt.internal.compiler.parser.UnitParser;
+import net.sourceforge.phpdt.internal.compiler.parser.VariableInfo;
+import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
+import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.corext.template.php.JavaContext;
 import net.sourceforge.phpdt.internal.corext.template.php.JavaContextType;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
+import net.sourceforge.phpdt.internal.ui.text.PHPCodeReader;
 import net.sourceforge.phpdt.internal.ui.text.java.IPHPCompletionProposal;
 import net.sourceforge.phpdt.internal.ui.text.java.PHPCompletionProposalComparator;
 import net.sourceforge.phpdt.internal.ui.text.template.BuiltInEngine;
 import net.sourceforge.phpdt.internal.ui.text.template.DeclarationEngine;
-import net.sourceforge.phpdt.internal.ui.text.template.IdentifierEngine;
 import net.sourceforge.phpdt.internal.ui.text.template.LocalVariableProposal;
 import net.sourceforge.phpdt.internal.ui.text.template.SQLProposal;
 import net.sourceforge.phpdt.internal.ui.text.template.contentassist.TemplateEngine;
 import net.sourceforge.phpdt.ui.IWorkingCopyManager;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
+import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
 import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
 import net.sourceforge.phpeclipse.ui.IPreferenceConstants;
@@ -68,10 +78,8 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 
-import com.quantum.model.Bookmark;
-import com.quantum.model.BookmarkCollection;
-import com.quantum.model.NotConnectedException;
-import com.quantum.util.connection.ConnectionUtil;
+//import com.quantum.ExternalInterface;
+// import com.quantum.util.connection.NotConnectedException;
 
 /**
  * Example PHP completion processor.
@@ -224,7 +232,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
     return internalComputeCompletionProposals(viewer, documentOffset, contextInformationPosition);
   }
 
-  private int getLastToken(ITextViewer viewer, int completionPosition, JavaContext context, TableName tableName) {
+  private int getLastToken(List list, ITextViewer viewer, int completionPosition, JavaContext context, TableName tableName) {
     IDocument document = viewer.getDocument();
     int start = context.getStart();
     int end = context.getEnd();
@@ -262,23 +270,24 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
         scanner.setPHPMode(true);
         int beforeLastToken = ITerminalSymbols.TokenNameEOF;
         int lastToken = ITerminalSymbols.TokenNameEOF;
-        char[] ident;
+        char[] ident = null;
         try {
           token = scanner.getNextToken();
           lastToken = token;
           while (token != ITerminalSymbols.TokenNameERROR && token != ITerminalSymbols.TokenNameEOF) {
             beforeLastToken = lastToken;
-            if (lastToken == ITerminalSymbols.TokenNameVariable) {
+            if (token == ITerminalSymbols.TokenNameVariable) {
               ident = scanner.getCurrentTokenSource();
               if (ident.length == 5 && ident[0] == '$' && ident[1] == 't' && ident[2] == 'h' && ident[3] == 'i' && ident[4] == 's') {
-                beforeLastToken = ITerminalSymbols.TokenNamethis_PHP_COMPLETION;
+                token = ITerminalSymbols.TokenNamethis_PHP_COMPLETION;
               }
             }
             lastToken = token;
-            //                                                         System.out.println(scanner.toStringAction(lastToken));
+            // System.out.println(scanner.toStringAction(lastToken));
             token = scanner.getNextToken();
           }
         } catch (InvalidInputException e1) {
+        } catch (SyntaxError e) {
         }
         switch (lastToken) {
         case ITerminalSymbols.TokenNameMINUS_GREATER:
@@ -286,6 +295,10 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
           lastSignificantToken = ITerminalSymbols.TokenNameMINUS_GREATER;
           if (beforeLastToken == ITerminalSymbols.TokenNameVariable) {
             lastSignificantToken = ITerminalSymbols.TokenNameVariable;
+            list.set(0, ident);
+          } else if (beforeLastToken == ITerminalSymbols.TokenNamethis_PHP_COMPLETION) {
+            lastSignificantToken = ITerminalSymbols.TokenNamethis_PHP_COMPLETION;
+            list.set(0, ident);
           }
           break;
         case ITerminalSymbols.TokenNamenew:
@@ -305,10 +318,10 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
     try {
       while (true) {
         ch = sqlText.charAt(currentCharacterPosition++);
-        if (tableNameStart == -1 && Character.isJavaIdentifierStart(ch)) {
+        if (tableNameStart == -1 && Scanner.isPHPIdentifierStart(ch)) {
           tableNameStart = currentCharacterPosition - 1;
         } else {
-          if (!Character.isJavaIdentifierPart(ch)) {
+          if (!Scanner.isPHPIdentifierPart(ch)) {
             return sqlText.substring(tableNameStart, currentCharacterPosition - 1);
           }
         }
@@ -502,7 +515,6 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
   private ICompletionProposal[] internalComputeCompletionProposals(ITextViewer viewer, int offset, int contextOffset) {
     ICompilationUnit unit = fManager.getWorkingCopy(fEditor.getEditorInput());
     IDocument document = viewer.getDocument();
-    Object[] identifiers = null;
     IFile file = null;
     IProject project = null;
     if (offset > 0) {
@@ -515,7 +527,6 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
     }
 
     Point selection = viewer.getSelectedRange();
-
     // remember selected text
     String selectedText = null;
     if (selection.y != 0) {
@@ -530,17 +541,46 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
     JavaContext context = (JavaContext) phpContextType.createContext(document, offset, selection.y, unit);
     context.setVariable("selection", selectedText); //$NON-NLS-1$
     String prefix = context.getKey();
+
+    HashMap methodVariables = null;
+    HashMap typeVariables = null;
+    HashMap unitVariables = null;
+    ICompilationUnit compilationUnit = (ICompilationUnit) context.findEnclosingElement(IJavaElement.COMPILATION_UNIT);
+    //    if (compilationUnit != null) {
+    //      unitVariables = ((CompilationUnit) compilationUnit).variables;
+    //    }
+    IType type = (IType) context.findEnclosingElement(IJavaElement.TYPE);
+    //    if (type != null) {
+    //      typeVariables = ((SourceType) type).variables;
+    //    }
+    IMethod method = (IMethod) context.findEnclosingElement(IJavaElement.METHOD);
+    //    if (method != null) {
+    //      methodVariables = ((SourceMethod) method).variables;
+    //    }
+
     boolean emptyPrefix = prefix == null || prefix.equals("");
     IPHPCompletionProposal[] localVariableResults = new IPHPCompletionProposal[0];
+
     if (!emptyPrefix && prefix.length() >= 1 && prefix.charAt(0) == '$') { // php Variable ?
-      HashSet localVariables = getLocalVariableProposals(viewer, project, context, prefix);
-      if (localVariables.size() > 0) {
+      String lowerCasePrefix = prefix.toLowerCase();
+      HashSet localVariables = new HashSet();
+      if (compilationUnit != null) {
+        unitVariables = getUnitVariables(unitVariables, compilationUnit);
+        getVariableProposals(localVariables, viewer, project, context, unitVariables, lowerCasePrefix, 94);
+      }
+      if (method != null) {
+        methodVariables = getMethodVariables(methodVariables, method);
+        getVariableProposals(localVariables, viewer, project, context, methodVariables, lowerCasePrefix, 99);
+      }
+      if (!localVariables.isEmpty()) {
         localVariableResults = (IPHPCompletionProposal[]) localVariables.toArray(new IPHPCompletionProposal[localVariables.size()]);
       }
     }
 
     TableName sqlTable = new TableName();
-    int lastSignificantToken = getLastToken(viewer, offset, context, sqlTable);
+    ArrayList list = new ArrayList();
+    list.add(null);
+    int lastSignificantToken = getLastToken(list, viewer, offset, context, sqlTable);
     boolean useClassMembers = (lastSignificantToken == ITerminalSymbols.TokenNameMINUS_GREATER)
         || (lastSignificantToken == ITerminalSymbols.TokenNameVariable) || (lastSignificantToken == ITerminalSymbols.TokenNamenew)
         || (lastSignificantToken == ITerminalSymbols.TokenNamethis_PHP_COMPLETION);
@@ -553,17 +593,9 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
         fTemplateEngine.complete(viewer, offset, unit);
         templateResults = fTemplateEngine.getResults();
       }
+      // TODO delete this
       IPHPCompletionProposal[] identifierResults = new IPHPCompletionProposal[0];
-      if ((!useClassMembers) && identifiers != null) {
-        IdentifierEngine identifierEngine;
-        JavaContextType contextType = (JavaContextType) PHPeclipsePlugin.getDefault().getTemplateContextRegistry().getContextType(
-            "php"); //$NON-NLS-1$
-        if (contextType != null) {
-          identifierEngine = new IdentifierEngine(contextType);
-          identifierEngine.complete(viewer, offset, identifiers, unit);
-          identifierResults = identifierEngine.getResults();
-        }
-      }
+
       // declarations stored in file project.index on project level
       IPHPCompletionProposal[] declarationResults = new IPHPCompletionProposal[0];
       if (project != null) {
@@ -572,9 +604,35 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
             "php"); //$NON-NLS-1$
         if (contextType != null) {
           IdentifierIndexManager indexManager = PHPeclipsePlugin.getDefault().getIndexManager(project);
-          SortedMap sortedMap = indexManager.getIdentifierMap();
+          SortedMap sortedMap;
           declarationEngine = new DeclarationEngine(project, contextType, lastSignificantToken, file);
-          declarationEngine.complete(viewer, offset, sortedMap, unit);
+          if (lastSignificantToken == ITerminalSymbols.TokenNamethis_PHP_COMPLETION) {
+            // complete '$this->'
+            sortedMap = indexManager.getIdentifiers(file);
+            declarationEngine.completeObject(viewer, offset, sortedMap, unit);
+          } else {
+            String typeRef = null;
+            char[] varName = (char[]) list.get(0);
+            if (varName != null) {
+              if (method != null) {
+                methodVariables = getMethodVariables(methodVariables, method);
+                VariableInfo info = (VariableInfo) methodVariables.get(new String(varName));
+                if (info != null && info.typeIdentifier != null) {
+                  typeRef = new String(info.typeIdentifier);
+                }
+
+              }
+            }
+            if (typeRef != null) {
+              // complete '$variable->' with type information
+              sortedMap = indexManager.getIdentifiers(typeRef);
+              declarationEngine.completeObject(viewer, offset, sortedMap, unit);
+            } else {
+              // complete '$variable->' without type information
+              sortedMap = indexManager.getIdentifierMap();
+              declarationEngine.complete(viewer, offset, sortedMap, unit);
+            }
+          }
           declarationResults = declarationEngine.getResults();
         }
       }
@@ -592,23 +650,25 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
           builtinResults = builtinEngine.getResults();
         }
       }
-      ICompletionProposal[] sqlResults = new ICompletionProposal[0];
-      if (project != null) {
-        sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable);
-      }
+//      ICompletionProposal[] sqlResults = new ICompletionProposal[0];
+//      if (project != null) {
+//        sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable);
+//      }
       // concatenate the result arrays
       IPHPCompletionProposal[] total;
       total = new IPHPCompletionProposal[localVariableResults.length + templateResults.length + identifierResults.length
-          + builtinResults.length + declarationResults.length + sqlResults.length];
+          + builtinResults.length + declarationResults.length];// + sqlResults.length];
       System.arraycopy(templateResults, 0, total, 0, templateResults.length);
       System.arraycopy(identifierResults, 0, total, templateResults.length, identifierResults.length);
       System.arraycopy(builtinResults, 0, total, templateResults.length + identifierResults.length, builtinResults.length);
       System.arraycopy(declarationResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length,
           declarationResults.length);
-      System.arraycopy(sqlResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
-          + declarationResults.length, sqlResults.length);
+//      System.arraycopy(sqlResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
+//          + declarationResults.length, sqlResults.length);
+//      System.arraycopy(localVariableResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
+//          + declarationResults.length + sqlResults.length, localVariableResults.length);
       System.arraycopy(localVariableResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
-          + declarationResults.length + sqlResults.length, localVariableResults.length);
+          + declarationResults.length, localVariableResults.length);
       results = total;
       fNumberOfComputedResults = (results == null ? 0 : results.length);
       /*
@@ -619,6 +679,54 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
     }
     return new IPHPCompletionProposal[0];
   }
+  /**
+   * @param unitVariables
+   * @param unit
+   */
+  private HashMap getUnitVariables(HashMap unitVariables, ICompilationUnit unit) {
+    if (unitVariables == null) {
+      try {
+        String unitText = unit.getSource();
+        unitVariables = new HashMap();
+        
+        ProblemReporter problemReporter = new ProblemReporter(DefaultErrorHandlingPolicies.exitAfterAllProblems(),
+            new CompilerOptions(JavaCore.getOptions()), new DefaultProblemFactory());
+        UnitParser parser = new UnitParser(problemReporter);
+        parser.compilationUnit = new CompilationUnitDeclaration(problemReporter, null, unitText.length());
+        parser.parse(unitText, unitVariables);
+        
+      } catch (Exception e) {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+        PHPeclipsePlugin.log(e);
+      }
+    }
+    return unitVariables;
+  }
+  
+  /**
+   * @param methodVariables
+   * @param method
+   */
+  private HashMap getMethodVariables(HashMap methodVariables, IMethod method) {
+    if (methodVariables == null) {
+      try {
+        String methodText = method.getSource();
+        methodVariables = new HashMap();
+        ProblemReporter problemReporter = new ProblemReporter(DefaultErrorHandlingPolicies.exitAfterAllProblems(),
+            new CompilerOptions(JavaCore.getOptions()), new DefaultProblemFactory());
+        UnitParser parser = new UnitParser(problemReporter);
+        parser.compilationUnit = new CompilationUnitDeclaration(problemReporter, null, methodText.length());
+        parser.parseFunction(methodText, methodVariables);
+      } catch (Exception e) {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+        PHPeclipsePlugin.log(e);
+      }
+    }
+    return methodVariables;
+  }
 
   /**
    * @param viewer
@@ -627,48 +735,76 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
    * @param prefix
    * @return
    */
-  private HashSet getLocalVariableProposals(ITextViewer viewer, IProject project, JavaContext context, String prefix) {
-    HashSet localVariables = new HashSet();
-    try {
-      IMethod method = (IMethod) context.findEnclosingElement(IJavaElement.METHOD);
+  private void getVariableProposals(HashSet localVariables, ITextViewer viewer, IProject project, JavaContext context,
+      HashMap variables, String prefix, int relevance) {
+//    try {
       int start = context.getStart();
       int end = context.getEnd();
       IRegion region = new Region(start, end - start);
-      char[] varName;
+      //      IMethod method = (IMethod) context.findEnclosingElement(IJavaElement.METHOD);
+      //      if (method != null && (method instanceof SourceMethod) && ((SourceMethod) method).variables != null) {
+      //        HashMap map = ((SourceMethod) method).variables;
+      Set set = variables.keySet();
+      Iterator iter = set.iterator();
+      String varName;
       boolean matchesVarName;
-      if (method != null) {
-        ISourceRange range = method.getSourceRange();
-        char[] source = method.getSource().toCharArray();
-        Scanner scanner = new Scanner();
-        scanner.setSource(source);
-        scanner.phpMode = true;
-        int token = Scanner.TokenNameWHITESPACE;
-        while ((token = scanner.getNextToken()) != Scanner.TokenNameEOF) {
-          if (token == Scanner.TokenNameVariable) {
-            varName = scanner.getCurrentTokenSource();
-            if (varName.length >= prefix.length()) {
-              matchesVarName = true;
-              for (int i = 0; i < prefix.length(); i++) {
-                if (prefix.charAt(i) != varName[i]) {
-                  matchesVarName = false;
-                  break;
-                }
-              }
-              if (matchesVarName) {
-                LocalVariableProposal prop = new LocalVariableProposal(new String(varName), region, viewer);
-                if (varName.length == prefix.length()) {
-                  prop.setRelevance(98);
-                }
-                localVariables.add(prop);
-              }
+      while (iter.hasNext()) {
+        varName = (String) iter.next();
+        if (varName.length() >= prefix.length()) {
+          matchesVarName = true;
+          for (int i = 0; i < prefix.length(); i++) {
+            if (prefix.charAt(i) != Character.toLowerCase(varName.charAt(i))) {
+              matchesVarName = false;
+              break;
             }
           }
+          if (matchesVarName) {
+            LocalVariableProposal prop;
+            //            if (varName.length == prefix.length()) {
+            //              prop = new LocalVariableProposal(new String(varName), region, viewer, relevance-10);
+            //            } else {
+            prop = new LocalVariableProposal(new String(varName), region, viewer, relevance);
+            //            }
+            localVariables.add(prop);
+          }
         }
       }
-    } catch (Throwable e) {
-      // ignore - Syntax exceptions could occur, if there are syntax errors !
-    }
-    return localVariables;
+      //      }
+
+      //      char[] varName;
+      //      boolean matchesVarName;
+      //      if (method != null) {
+      //        ISourceRange range = method.getSourceRange();
+      //        char[] source = method.getSource().toCharArray();
+      //        Scanner scanner = new Scanner();
+      //        scanner.setSource(source);
+      //        scanner.phpMode = true;
+      //        int token = Scanner.TokenNameWHITESPACE;
+      //        while ((token = scanner.getNextToken()) != Scanner.TokenNameEOF) {
+      //          if (token == Scanner.TokenNameVariable) {
+      //            varName = scanner.getCurrentTokenSource();
+      //            if (varName.length >= prefix.length()) {
+      //              matchesVarName = true;
+      //              for (int i = 0; i < prefix.length(); i++) {
+      //                if (prefix.charAt(i) != varName[i]) {
+      //                  matchesVarName = false;
+      //                  break;
+      //                }
+      //              }
+      //              if (matchesVarName) {
+      //                LocalVariableProposal prop = new LocalVariableProposal(new String(varName), region, viewer);
+      //                if (varName.length == prefix.length()) {
+      //                  prop.setRelevance(98);
+      //                }
+      //                localVariables.add(prop);
+      //              }
+      //            }
+      //          }
+      //        }
+      //      }
+    //    } catch (Throwable e) {
+    //      // ignore - Syntax exceptions could occur, if there are syntax errors !
+    //    }
   }
 
   /**
@@ -680,122 +816,113 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
    * @param sqlResults
    * @return
    */
-  private ICompletionProposal[] getSQLProposals(ITextViewer viewer, IProject project, DocumentTemplateContext context,
-      String prefix, TableName sqlTable) {
-    ICompletionProposal[] sqlResults = new ICompletionProposal[0];
-    // Get The Database bookmark from the Quantum SQL plugin:
-    BookmarkCollection sqlBookMarks = BookmarkCollection.getInstance();
-    if (sqlBookMarks != null) {
-      String bookmarkString = ProjectPrefUtil.getMiscProjectsPreferenceValue(project, IPreferenceConstants.PHP_BOOKMARK_DEFAULT);
-      if (bookmarkString != null && !bookmarkString.equals("")) {
-        Bookmark bookmark = sqlBookMarks.find(bookmarkString);
-        ArrayList sqlList = new ArrayList();
-        if (bookmark != null && !bookmark.isConnected()) {
-          new ConnectionUtil().connect(bookmark, null);
-        }
-        if (bookmark != null && bookmark.isConnected()) {
-          try {
-            Connection connection = bookmark.getConnection();
-            DatabaseMetaData metaData = connection.getMetaData();
-
-            if (metaData != null) {
-              int start = context.getStart();
-              int end = context.getEnd();
-              String foundSQLTableName = sqlTable.getTableName();
-              String tableName;
-              String columnName;
-              String prefixWithoutDollar = prefix;
-              boolean isDollarPrefix = false;
-              if (prefix.length() > 0 && prefix.charAt(0) == '$') {
-                prefixWithoutDollar = prefix.substring(1);
-                isDollarPrefix = true;
-              }
-              IRegion region = new Region(start, end - start);
-              ResultSet set;
-              if (!isDollarPrefix) {
-                set = metaData.getTables(null, null, prefixWithoutDollar + "%", null);
-                while (set.next()) {
-                  //                  String tempSchema = set.getString("TABLE_SCHEM");
-                  //                  tempSchema = (tempSchema == null) ? "" :
-                  // tempSchema.trim();
-                  tableName = set.getString("TABLE_NAME");
-                  tableName = (tableName == null) ? "" : tableName.trim();
-                  if (tableName != null && tableName.length() > 0) {
-                    sqlList.add(new SQLProposal(tableName, context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
-                  }
-                }
-                set.close();
-              }
-              set = metaData.getColumns(null, null, "%", prefixWithoutDollar + "%");
-              SQLProposal sqlProposal;
-              while (set.next()) {
-                columnName = set.getString("COLUMN_NAME");
-                columnName = (columnName == null) ? "" : columnName.trim();
-                tableName = set.getString("TABLE_NAME");
-                tableName = (tableName == null) ? "" : tableName.trim();
-                if (tableName != null && tableName.length() > 0 && columnName != null && columnName.length() > 0) {
-                  if (isDollarPrefix) {
-                    sqlProposal = new SQLProposal(tableName, "$" + columnName, context, region, viewer, PHPUiImages
-                        .get(PHPUiImages.IMG_COLUMN));
-                  } else {
-                    sqlProposal = new SQLProposal(tableName, columnName, context, region, viewer, PHPUiImages
-                        .get(PHPUiImages.IMG_COLUMN));
-                  }
-                  if (tableName.equals(foundSQLTableName)) {
-                    sqlProposal.setRelevance(90);
-                  } else if (tableName.indexOf(foundSQLTableName) >= 0) {
-                    sqlProposal.setRelevance(75);
-                  }
-                  sqlList.add(sqlProposal);
-                }
-              }
-              set.close();
-              sqlResults = new IPHPCompletionProposal[sqlList.size()];
-              for (int i = 0; i < sqlList.size(); i++) {
-                sqlResults[i] = (SQLProposal) sqlList.get(i);
-              }
-            }
-          } catch (NotConnectedException e) {
-            // ignore this - not mission critical
-          } catch (SQLException e) {
-            e.printStackTrace();
-          }
-        }
-      }
-    }
-    return sqlResults;
+//  private ICompletionProposal[] getSQLProposals(ITextViewer viewer, IProject project, DocumentTemplateContext context,
+//      String prefix, TableName sqlTable) {
+//    ICompletionProposal[] sqlResults = new ICompletionProposal[0];
+//    // Get The Database bookmark from the Quantum SQL plugin:
+//    //    BookmarkCollection sqlBookMarks = BookmarkCollection.getInstance();
+//    //    if (sqlBookMarks != null) {
+//    String bookmarkString = ProjectPrefUtil.getMiscProjectsPreferenceValue(project, IPreferenceConstants.PHP_BOOKMARK_DEFAULT);
+//    if (bookmarkString != null && !bookmarkString.equals("")) {
+//      String[] bookmarks = ExternalInterface.getBookmarkNames();
+//      boolean foundBookmark = false;
+//      for (int i = 0; i < bookmarks.length; i++) {
+//        if (bookmarks[i].equals(bookmarkString)) {
+//          foundBookmark = true;
+//        }
+//      }
+//      if (!foundBookmark) {
+//        return sqlResults;
+//      }
+//      //        Bookmark bookmark = sqlBookMarks.find(bookmarkString);
+//      ArrayList sqlList = new ArrayList();
+//      if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
+//        ExternalInterface.connectBookmark(bookmarkString, null);
+//        if (!ExternalInterface.isBookmarkConnected(bookmarkString)) {
+//          return sqlResults;
+//        }
+//      }
+//      //      if (ExternalInterface.isBookmarkConnected(bookmarkString)) {
+//      try {
+//         int start = context.getStart();
+//        int end = context.getEnd();
+//        String foundSQLTableName = sqlTable.getTableName();
+//        String tableName;
+//        String columnName;
+//        String prefixWithoutDollar = prefix;
+//        boolean isDollarPrefix = false;
+//        if (prefix.length() > 0 && prefix.charAt(0) == '$') {
+//          prefixWithoutDollar = prefix.substring(1);
+//          isDollarPrefix = true;
+//        }
+//        IRegion region = new Region(start, end - start);
+//        ResultSet set;
+//        if (!isDollarPrefix) {
+//          String[] tableNames = ExternalInterface.getMatchingTableNames(null, bookmarkString, prefixWithoutDollar, null, false);
+//          for (int i = 0; i < tableNames.length; i++) {
+//            sqlList.add(new SQLProposal(tableNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
+//          }
+//        }
+//
+//        String[] columnNames = ExternalInterface.getMatchingColumnNames(null, bookmarkString, prefixWithoutDollar, null, false);
+//        for (int i = 0; i < columnNames.length; i++) {
+//          sqlList.add(new SQLProposal(columnNames[i], context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_TABLE)));
+//        }
+//        
+//        sqlResults = new IPHPCompletionProposal[sqlList.size()];
+//        for (int i = 0; i < sqlList.size(); i++) {
+//          sqlResults[i] = (SQLProposal) sqlList.get(i);
+//        }
+//      } catch (Exception /* NotConnectedException */ e) {
+//        
+//      }
+//      //      }
+//    }
+//    //    }
+//    return sqlResults;
+//  }
+
+  private boolean looksLikeMethod(PHPCodeReader reader) throws IOException {
+    int curr = reader.read();
+    while (curr != PHPCodeReader.EOF && Character.isWhitespace((char) curr))
+      curr = reader.read();
+
+    if (curr == PHPCodeReader.EOF)
+      return false;
+
+    return Scanner.isPHPIdentifierPart((char) curr) || Scanner.isPHPIdentifierStart((char) curr);
   }
 
   private int guessContextInformationPosition(ITextViewer viewer, int offset) {
     int contextPosition = offset;
     IDocument document = viewer.getDocument();
-    //    try {
-    //
-    //      PHPCodeReader reader= new PHPCodeReader();
-    //      reader.configureBackwardReader(document, offset, true, true);
-    //  
-    //      int nestingLevel= 0;
-    //
-    //      int curr= reader.read();
-    //      while (curr != PHPCodeReader.EOF) {
-    //
-    //        if (')' == (char) curr)
-    //          ++ nestingLevel;
-    //
-    //        else if ('(' == (char) curr) {
-    //          -- nestingLevel;
-    //        
-    //          if (nestingLevel < 0) {
-    //            int start= reader.getOffset();
-    //            if (looksLikeMethod(reader))
-    //              return start + 1;
-    //          }
-    //        }
-    //
-    //        curr= reader.read();
-    //      }
-    //    } catch (IOException e) {
-    //    }
+    try {
+
+      PHPCodeReader reader = new PHPCodeReader();
+      reader.configureBackwardReader(document, offset, true, true);
+
+      int nestingLevel = 0;
+
+      int curr = reader.read();
+      while (curr != PHPCodeReader.EOF) {
+
+        if (')' == (char) curr)
+          ++nestingLevel;
+
+        else if ('(' == (char) curr) {
+          --nestingLevel;
+
+          if (nestingLevel < 0) {
+            int start = reader.getOffset();
+            if (looksLikeMethod(reader))
+              return start + 1;
+          }
+        }
+
+        curr = reader.read();
+      }
+    } catch (IOException e) {
+    }
     return contextPosition;
   }
 
@@ -827,6 +954,13 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
    */
   private ICompletionProposal[] order(ICompletionProposal[] proposals) {
     Arrays.sort(proposals, fComparator);
+    //    int len = proposals.length;
+    //    if (len > 10) {
+    //      len = 10;
+    //    }
+    //    for (int i = 0; i < len; i++) {
+    //      System.out.println(proposals[i].getDisplayString());
+    //    }
     return proposals;
   }