X-Git-Url: http://secure.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
index beae245..c8755e0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
@@ -7,49 +7,48 @@
Contributors:
IBM Corporation - Initial implementation
- Klaus Hartlage - www.eclipseproject.de
**********************************************************************/
package net.sourceforge.phpeclipse.phpeditor.php;
+
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import java.util.SortedMap;
import net.sourceforge.phpdt.core.ICompilationUnit;
-import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.core.IMethod;
+import net.sourceforge.phpdt.core.ISourceRange;
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.parser.Scanner;
-import net.sourceforge.phpdt.internal.corext.template.ContextType;
-import net.sourceforge.phpdt.internal.corext.template.ContextTypeRegistry;
-import net.sourceforge.phpdt.internal.corext.template.php.CompilationUnitContextType;
-import net.sourceforge.phpdt.internal.corext.template.php.PHPUnitContext;
+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.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.TemplateEngine;
+import net.sourceforge.phpdt.internal.ui.text.template.contentassist.TemplateEngine;
import net.sourceforge.phpdt.ui.IWorkingCopyManager;
-import net.sourceforge.phpdt.ui.PreferenceConstants;
-import net.sourceforge.phpeclipse.IPreferenceConstants;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
-import net.sourceforge.phpeclipse.overlaypages.Util;
import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
+import net.sourceforge.phpeclipse.ui.IPreferenceConstants;
+import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@@ -62,9 +61,10 @@ import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationExtension;
import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.jface.text.templates.DocumentTemplateContext;
+import org.eclipse.jface.text.templates.TemplateContextType;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
@@ -72,146 +72,159 @@ import com.quantum.model.Bookmark;
import com.quantum.model.BookmarkCollection;
import com.quantum.model.NotConnectedException;
import com.quantum.util.connection.ConnectionUtil;
+
/**
* Example PHP completion processor.
*/
public class PHPCompletionProcessor implements IContentAssistProcessor {
/**
- * Simple content assist tip closer. The tip is valid in a range of 5
- * characters around its popup location.
+ * Simple content assist tip closer. The tip is valid in a range of 5 characters around its popup location.
*/
- protected static class Validator
- implements
- IContextInformationValidator,
- IContextInformationPresenter {
+ protected static class Validator implements IContextInformationValidator, IContextInformationPresenter {
protected int fInstallOffset;
+
/*
* @see IContextInformationValidator#isContextInformationValid(int)
*/
public boolean isContextInformationValid(int offset) {
return Math.abs(fInstallOffset - offset) < 5;
}
+
/*
- * @see IContextInformationValidator#install(IContextInformation,
- * ITextViewer, int)
+ * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
*/
public void install(IContextInformation info, ITextViewer viewer, int offset) {
fInstallOffset = offset;
}
+
/*
- * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int,
- * TextPresentation)
+ * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int, TextPresentation)
*/
- public boolean updatePresentation(int documentPosition,
- TextPresentation presentation) {
+ public boolean updatePresentation(int documentPosition, TextPresentation presentation) {
return false;
}
};
- private static class ContextInformationWrapper
- implements
- IContextInformation,
- IContextInformationExtension {
+
+ private static class ContextInformationWrapper implements IContextInformation, IContextInformationExtension {
private final IContextInformation fContextInformation;
+
private int fPosition;
+
public ContextInformationWrapper(IContextInformation contextInformation) {
fContextInformation = contextInformation;
}
+
/*
* @see IContextInformation#getContextDisplayString()
*/
public String getContextDisplayString() {
return fContextInformation.getContextDisplayString();
}
+
/*
* @see IContextInformation#getImage()
*/
public Image getImage() {
return fContextInformation.getImage();
}
+
/*
* @see IContextInformation#getInformationDisplayString()
*/
public String getInformationDisplayString() {
return fContextInformation.getInformationDisplayString();
}
+
/*
* @see IContextInformationExtension#getContextInformationPosition()
*/
public int getContextInformationPosition() {
return fPosition;
}
+
public void setContextInformationPosition(int position) {
fPosition = position;
}
};
+
private class TableName {
String fTableName;
+
TableName() {
fTableName = null;
}
+
/**
* @return Returns the tableName.
*/
public String getTableName() {
- if (fTableName==null) {
+ if (fTableName == null) {
return "";
}
return fTableName;
}
+
/**
- * @param tableName The tableName to set.
+ * @param tableName
+ * The tableName to set.
*/
public void setTableName(String tableName) {
fTableName = tableName;
}
}
+
private char[] fProposalAutoActivationSet;
+
protected IContextInformationValidator fValidator = new Validator();
+
private TemplateEngine fTemplateEngine;
+
private PHPCompletionProposalComparator fComparator;
+
private int fNumberOfComputedResults = 0;
+
private IEditorPart fEditor;
+
protected IWorkingCopyManager fManager;
+
public PHPCompletionProcessor(IEditorPart editor) {
- fEditor= editor;
- fManager= PHPeclipsePlugin.getDefault().getWorkingCopyManager();
- ContextType contextType = ContextTypeRegistry.getInstance().getContextType(
- "php"); //$NON-NLS-1$
+ fEditor = editor;
+ fManager = PHPeclipsePlugin.getDefault().getWorkingCopyManager();
+ TemplateContextType contextType = PHPeclipsePlugin.getDefault().getTemplateContextRegistry().getContextType("php"); //$NON-NLS-1$
if (contextType != null)
fTemplateEngine = new TemplateEngine(contextType);
fComparator = new PHPCompletionProposalComparator();
}
+
/**
* Tells this processor to order the proposals alphabetically.
*
* @param order
- * true if proposals should be ordered.
+ * true if proposals should be ordered.
*/
public void orderProposalsAlphabetically(boolean order) {
fComparator.setOrderAlphabetically(order);
}
+
/**
- * Sets this processor's set of characters triggering the activation of the
- * completion proposal computation.
+ * Sets this processor's set of characters triggering the activation of the completion proposal computation.
*
* @param activationSet
- * the activation set
+ * the activation set
*/
public void setCompletionProposalAutoActivationCharacters(char[] activationSet) {
fProposalAutoActivationSet = activationSet;
}
+
/*
* (non-Javadoc) Method declared on IContentAssistProcessor
*/
- public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
- int documentOffset) {
- int contextInformationPosition = guessContextInformationPosition(viewer,
- documentOffset);
- return internalComputeCompletionProposals(viewer, documentOffset,
- contextInformationPosition);
+ public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
+ int contextInformationPosition = guessContextInformationPosition(viewer, documentOffset);
+ return internalComputeCompletionProposals(viewer, documentOffset, contextInformationPosition);
}
- private int getLastToken(ITextViewer viewer, int completionPosition,
- PHPUnitContext context, TableName tableName) {
+
+ private int getLastToken(ITextViewer viewer, int completionPosition, JavaContext context, TableName tableName) {
IDocument document = viewer.getDocument();
int start = context.getStart();
int end = context.getEnd();
@@ -242,19 +255,25 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
System.out.println(startText);
}
int token = ITerminalSymbols.TokenNameEOF;
-// token = getLastSQLToken(startText);
+ // token = getLastSQLToken(startText);
tableName.setTableName(getLastSQLTableName(startText));
Scanner scanner = ToolFactory.createScanner(false, false, false);
scanner.setSource(startText.toCharArray());
scanner.setPHPMode(true);
int beforeLastToken = ITerminalSymbols.TokenNameEOF;
int lastToken = ITerminalSymbols.TokenNameEOF;
+ char[] ident;
try {
token = scanner.getNextToken();
lastToken = token;
- while (token != ITerminalSymbols.TokenNameERROR
- && token != ITerminalSymbols.TokenNameEOF) {
+ while (token != ITerminalSymbols.TokenNameERROR && token != ITerminalSymbols.TokenNameEOF) {
beforeLastToken = lastToken;
+ if (lastToken == 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;
+ }
+ }
lastToken = token;
// System.out.println(scanner.toStringAction(lastToken));
token = scanner.getNextToken();
@@ -262,45 +281,46 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
} catch (InvalidInputException e1) {
}
switch (lastToken) {
- case ITerminalSymbols.TokenNameMINUS_GREATER :
- // dereferencing operator '->' found
- lastSignificantToken = ITerminalSymbols.TokenNameMINUS_GREATER;
- if (beforeLastToken == ITerminalSymbols.TokenNameVariable) {
- lastSignificantToken = ITerminalSymbols.TokenNameVariable;
- }
- break;
- case ITerminalSymbols.TokenNamenew :
- lastSignificantToken = ITerminalSymbols.TokenNamenew;
- break;
+ case ITerminalSymbols.TokenNameMINUS_GREATER:
+ // dereferencing operator '->' found
+ lastSignificantToken = ITerminalSymbols.TokenNameMINUS_GREATER;
+ if (beforeLastToken == ITerminalSymbols.TokenNameVariable) {
+ lastSignificantToken = ITerminalSymbols.TokenNameVariable;
+ }
+ break;
+ case ITerminalSymbols.TokenNamenew:
+ lastSignificantToken = ITerminalSymbols.TokenNamenew;
+ break;
}
}
} catch (BadLocationException e) {
}
return lastSignificantToken;
}
-
+
String getSQLTableName(String sqlText, int start) {
int tableNameStart = -1;
- int currentCharacterPosition = start+1;
+ int currentCharacterPosition = start + 1;
char ch;
try {
- while(true) {
- ch = sqlText.charAt(currentCharacterPosition++);
- if (tableNameStart==-1 && Character.isJavaIdentifierStart(ch)) {
- tableNameStart = currentCharacterPosition-1;
- } else {
- if (!Character.isJavaIdentifierPart(ch)) {
- return sqlText.substring(tableNameStart, currentCharacterPosition-1);
- }
- }
+ while (true) {
+ ch = sqlText.charAt(currentCharacterPosition++);
+ if (tableNameStart == -1 && Character.isJavaIdentifierStart(ch)) {
+ tableNameStart = currentCharacterPosition - 1;
+ } else {
+ if (!Character.isJavaIdentifierPart(ch)) {
+ return sqlText.substring(tableNameStart, currentCharacterPosition - 1);
+ }
+ }
}
} catch (IndexOutOfBoundsException e) {
- if (tableNameStart>=0) {
- return sqlText.substring(tableNameStart, currentCharacterPosition-1);
+ if (tableNameStart >= 0) {
+ return sqlText.substring(tableNameStart, currentCharacterPosition - 1);
}
}
return "";
}
+
private String getLastSQLTableName(String startText) {
int token;
// scan for sql identifiers
@@ -328,52 +348,52 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
if (ident.length() >= 4 && ident.length() <= 6) {
ident = ident.toLowerCase();
switch (ident.length()) {
-// case 3 :
-// if (ident.equals("set")) {
-// // System.out.println("set");
-// token = ITerminalSymbols.TokenNameSQLset;
-// return token;
-// }
-// break;
- case 4 :
- if (ident.equals("from")) {
- // System.out.println("from");
- token = ITerminalSymbols.TokenNameSQLfrom;
- return getSQLTableName(startText, identEnd);
- } else if (ident.equals("into")) {
- // System.out.println("into");
- token = ITerminalSymbols.TokenNameSQLinto;
- return getSQLTableName(startText, identEnd);
- }
- break;
-// case 5 :
-// if (ident.equals("where")) {
-// // System.out.println("where");
-// token = ITerminalSymbols.TokenNameSQLwhere;
-// return token;
-// }
-// break;
- case 6 :
-// if (ident.equals("select")) {
-// // System.out.println("select");
-// token = ITerminalSymbols.TokenNameSQLselect;
-// return token;
-// } else if (ident.equals("insert")) {
-// // System.out.println("insert");
-// token = ITerminalSymbols.TokenNameSQLinsert;
-// return token;
-// } else
- if (ident.equals("update")) {
- // System.out.println("update");
- token = ITerminalSymbols.TokenNameSQLupdate;
- return getSQLTableName(startText, identEnd);
- }
-// else if (ident.equals("values")) {
-// // System.out.println("values");
-// token = ITerminalSymbols.TokenNameSQLvalues;
-// return token;
-// }
- break;
+ // case 3 :
+ // if (ident.equals("set")) {
+ // // System.out.println("set");
+ // token = ITerminalSymbols.TokenNameSQLset;
+ // return token;
+ // }
+ // break;
+ case 4:
+ if (ident.equals("from")) {
+ // System.out.println("from");
+ token = ITerminalSymbols.TokenNameSQLfrom;
+ return getSQLTableName(startText, identEnd);
+ } else if (ident.equals("into")) {
+ // System.out.println("into");
+ token = ITerminalSymbols.TokenNameSQLinto;
+ return getSQLTableName(startText, identEnd);
+ }
+ break;
+ // case 5 :
+ // if (ident.equals("where")) {
+ // // System.out.println("where");
+ // token = ITerminalSymbols.TokenNameSQLwhere;
+ // return token;
+ // }
+ // break;
+ case 6:
+ // if (ident.equals("select")) {
+ // // System.out.println("select");
+ // token = ITerminalSymbols.TokenNameSQLselect;
+ // return token;
+ // } else if (ident.equals("insert")) {
+ // // System.out.println("insert");
+ // token = ITerminalSymbols.TokenNameSQLinsert;
+ // return token;
+ // } else
+ if (ident.equals("update")) {
+ // System.out.println("update");
+ token = ITerminalSymbols.TokenNameSQLupdate;
+ return getSQLTableName(startText, identEnd);
+ }
+ // else if (ident.equals("values")) {
+ // // System.out.println("values");
+ // token = ITerminalSymbols.TokenNameSQLvalues;
+ // return token;
+ // }
+ break;
}
}
whiteSpace = false;
@@ -387,6 +407,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
}
return "";
}
+
/**
* Detect the last significant SQL token in the text before the completion
*
@@ -419,51 +440,51 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
if (ident.length() >= 3 && ident.length() <= 6) {
ident = ident.toLowerCase();
switch (ident.length()) {
- case 3 :
- if (ident.equals("set")) {
- // System.out.println("set");
- token = ITerminalSymbols.TokenNameSQLset;
- return token;
- }
- break;
- case 4 :
- if (ident.equals("from")) {
- // System.out.println("from");
- token = ITerminalSymbols.TokenNameSQLfrom;
- //getSQLTableName();
- return token;
- } else if (ident.equals("into")) {
- // System.out.println("into");
- token = ITerminalSymbols.TokenNameSQLinto;
- return token;
- }
- break;
- case 5 :
- if (ident.equals("where")) {
- // System.out.println("where");
- token = ITerminalSymbols.TokenNameSQLwhere;
- return token;
- }
- break;
- case 6 :
- if (ident.equals("select")) {
- // System.out.println("select");
- token = ITerminalSymbols.TokenNameSQLselect;
- return token;
- } else if (ident.equals("insert")) {
- // System.out.println("insert");
- token = ITerminalSymbols.TokenNameSQLinsert;
- return token;
- } else if (ident.equals("update")) {
- // System.out.println("update");
- token = ITerminalSymbols.TokenNameSQLupdate;
- return token;
- } else if (ident.equals("values")) {
- // System.out.println("values");
- token = ITerminalSymbols.TokenNameSQLvalues;
- return token;
- }
- break;
+ case 3:
+ if (ident.equals("set")) {
+ // System.out.println("set");
+ token = ITerminalSymbols.TokenNameSQLset;
+ return token;
+ }
+ break;
+ case 4:
+ if (ident.equals("from")) {
+ // System.out.println("from");
+ token = ITerminalSymbols.TokenNameSQLfrom;
+ //getSQLTableName();
+ return token;
+ } else if (ident.equals("into")) {
+ // System.out.println("into");
+ token = ITerminalSymbols.TokenNameSQLinto;
+ return token;
+ }
+ break;
+ case 5:
+ if (ident.equals("where")) {
+ // System.out.println("where");
+ token = ITerminalSymbols.TokenNameSQLwhere;
+ return token;
+ }
+ break;
+ case 6:
+ if (ident.equals("select")) {
+ // System.out.println("select");
+ token = ITerminalSymbols.TokenNameSQLselect;
+ return token;
+ } else if (ident.equals("insert")) {
+ // System.out.println("insert");
+ token = ITerminalSymbols.TokenNameSQLinsert;
+ return token;
+ } else if (ident.equals("update")) {
+ // System.out.println("update");
+ token = ITerminalSymbols.TokenNameSQLupdate;
+ return token;
+ } else if (ident.equals("values")) {
+ // System.out.println("values");
+ token = ITerminalSymbols.TokenNameSQLvalues;
+ return token;
+ }
+ break;
}
}
whiteSpace = false;
@@ -477,10 +498,9 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
}
return ITerminalSymbols.TokenNameEOF;
}
- private ICompletionProposal[] internalComputeCompletionProposals(
- ITextViewer viewer, int offset, int contextOffset) {
- ICompilationUnit unit= fManager.getWorkingCopy(fEditor.getEditorInput());
- System.out.println( unit.toString() );
+
+ 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;
@@ -491,41 +511,56 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
editor = (PHPEditor) fEditor;
file = ((IFileEditorInput) editor.getEditorInput()).getFile();
project = file.getProject();
- // outlinePage = editor.getfOutlinePage();
- // TODO: get the identifiers from the new model
- // if (outlinePage instanceof PHPContentOutlinePage) {
- // identifiers = ((PHPContentOutlinePage) outlinePage).getVariables();
- // }
}
}
- ContextType phpContextType = ContextTypeRegistry.getInstance()
- .getContextType("php"); //$NON-NLS-1$
- ((CompilationUnitContextType) phpContextType).setContextParameters(
- document, offset, 0);
- PHPUnitContext context = (PHPUnitContext) phpContextType.createContext();
+
+ Point selection = viewer.getSelectedRange();
+
+ // remember selected text
+ String selectedText = null;
+ if (selection.y != 0) {
+ try {
+ selectedText = document.get(selection.x, selection.y);
+ } catch (BadLocationException e) {
+ }
+ }
+
+ JavaContextType phpContextType = (JavaContextType) PHPeclipsePlugin.getDefault().getTemplateContextRegistry().getContextType(
+ "php"); //$NON-NLS-1$
+ JavaContext context = (JavaContext) phpContextType.createContext(document, offset, selection.y, unit);
+ context.setVariable("selection", selectedText); //$NON-NLS-1$
String prefix = context.getKey();
+ 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) {
+ localVariableResults = (IPHPCompletionProposal[]) localVariables.toArray(new IPHPCompletionProposal[localVariables.size()]);
+ }
+ }
+
TableName sqlTable = new TableName();
int lastSignificantToken = getLastToken(viewer, offset, context, sqlTable);
boolean useClassMembers = (lastSignificantToken == ITerminalSymbols.TokenNameMINUS_GREATER)
- || (lastSignificantToken == ITerminalSymbols.TokenNameVariable)
- || (lastSignificantToken == ITerminalSymbols.TokenNamenew);
- boolean emptyPrefix = prefix == null || prefix.equals("");
+ || (lastSignificantToken == ITerminalSymbols.TokenNameVariable) || (lastSignificantToken == ITerminalSymbols.TokenNamenew)
+ || (lastSignificantToken == ITerminalSymbols.TokenNamethis_PHP_COMPLETION);
+
if (fTemplateEngine != null) {
IPHPCompletionProposal[] templateResults = new IPHPCompletionProposal[0];
ICompletionProposal[] results;
if (!emptyPrefix) {
fTemplateEngine.reset();
- fTemplateEngine.complete(viewer, offset); //, unit);
+ fTemplateEngine.complete(viewer, offset, unit);
templateResults = fTemplateEngine.getResults();
}
IPHPCompletionProposal[] identifierResults = new IPHPCompletionProposal[0];
if ((!useClassMembers) && identifiers != null) {
IdentifierEngine identifierEngine;
- ContextType contextType = ContextTypeRegistry.getInstance()
- .getContextType("php"); //$NON-NLS-1$
+ JavaContextType contextType = (JavaContextType) PHPeclipsePlugin.getDefault().getTemplateContextRegistry().getContextType(
+ "php"); //$NON-NLS-1$
if (contextType != null) {
identifierEngine = new IdentifierEngine(contextType);
- identifierEngine.complete(viewer, offset, identifiers);
+ identifierEngine.complete(viewer, offset, identifiers, unit);
identifierResults = identifierEngine.getResults();
}
}
@@ -533,15 +568,13 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
IPHPCompletionProposal[] declarationResults = new IPHPCompletionProposal[0];
if (project != null) {
DeclarationEngine declarationEngine;
- ContextType contextType = ContextTypeRegistry.getInstance()
- .getContextType("php"); //$NON-NLS-1$
+ JavaContextType contextType = (JavaContextType) PHPeclipsePlugin.getDefault().getTemplateContextRegistry().getContextType(
+ "php"); //$NON-NLS-1$
if (contextType != null) {
- IdentifierIndexManager indexManager = PHPeclipsePlugin.getDefault()
- .getIndexManager(project);
+ IdentifierIndexManager indexManager = PHPeclipsePlugin.getDefault().getIndexManager(project);
SortedMap sortedMap = indexManager.getIdentifierMap();
- declarationEngine = new DeclarationEngine(contextType,
- lastSignificantToken, file);
- declarationEngine.complete(viewer, offset, sortedMap);
+ declarationEngine = new DeclarationEngine(project, contextType, lastSignificantToken, file);
+ declarationEngine.complete(viewer, offset, sortedMap, unit);
declarationResults = declarationEngine.getResults();
}
}
@@ -551,130 +584,188 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
if ((!useClassMembers) && syntaxbuffer != null) {
BuiltInEngine builtinEngine;
String proposal;
- ContextType contextType = ContextTypeRegistry.getInstance()
- .getContextType("php"); //$NON-NLS-1$
+ JavaContextType contextType = (JavaContextType) PHPeclipsePlugin.getDefault().getTemplateContextRegistry().getContextType(
+ "php"); //$NON-NLS-1$
if (contextType != null) {
builtinEngine = new BuiltInEngine(contextType);
- builtinEngine.complete(viewer, offset, syntaxbuffer);
+ builtinEngine.complete(viewer, offset, syntaxbuffer, unit);
builtinResults = builtinEngine.getResults();
}
}
- IPHPCompletionProposal[] sqlResults = new IPHPCompletionProposal[0];
+ ICompletionProposal[] sqlResults = new ICompletionProposal[0];
if (project != null) {
- // Get The Database bookmark from the Quantum SQL plugin:
- BookmarkCollection sqlBookMarks = BookmarkCollection.getInstance();
- if (sqlBookMarks != null) {
- String bookmarkString = Util.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();
- }
- }
- }
- }
+ sqlResults = getSQLProposals(viewer, project, context, prefix, sqlTable);
}
// concatenate the result arrays
IPHPCompletionProposal[] total;
- total = new IPHPCompletionProposal[templateResults.length
- + identifierResults.length + builtinResults.length
- + declarationResults.length + sqlResults.length];
+ total = new IPHPCompletionProposal[localVariableResults.length + templateResults.length + identifierResults.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,
+ 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
+ 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);
results = total;
fNumberOfComputedResults = (results == null ? 0 : results.length);
/*
- * Order here and not in result collector to make sure that the order
- * applies to all proposals and not just those of the compilation unit.
+ * Order here and not in result collector to make sure that the order applies to all proposals and not just those of the
+ * compilation unit.
*/
return order(results);
}
return new IPHPCompletionProposal[0];
}
+
+ /**
+ * @param viewer
+ * @param project
+ * @param context
+ * @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);
+ int start = context.getStart();
+ int end = context.getEnd();
+ IRegion region = new Region(start, end - start);
+ 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 !
+ }
+ return localVariables;
+ }
+
+ /**
+ * @param viewer
+ * @param project
+ * @param context
+ * @param prefix
+ * @param sqlTable
+ * @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 int guessContextInformationPosition(ITextViewer viewer, int offset) {
int contextPosition = offset;
IDocument document = viewer.getDocument();
@@ -707,49 +798,30 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
// }
return contextPosition;
}
- /*
- * (non-Javadoc) Method declared on IContentAssistProcessor
- */
- // public IContextInformation[] computeContextInformation(ITextViewer viewer,
- // int documentOffset) {
- // IContextInformation[] result = new IContextInformation[5];
- // for (int i = 0; i < result.length; i++)
- // result[i] = new
- // ContextInformation(MessageFormat.format(PHPEditorMessages.getString("CompletionProcessor.ContextInfo.display.pattern"),
- // new Object[] { new Integer(i), new Integer(documentOffset)}),
- // //$NON-NLS-1$
- // MessageFormat.format(PHPEditorMessages.getString("CompletionProcessor.ContextInfo.value.pattern"),
- // new Object[] { new Integer(i), new Integer(documentOffset - 5), new
- // Integer(documentOffset + 5)})); //$NON-NLS-1$
- // return result;
- // }
+
/**
* @see IContentAssistProcessor#computeContextInformation(ITextViewer, int)
*/
- public IContextInformation[] computeContextInformation(ITextViewer viewer,
- int offset) {
- int contextInformationPosition = guessContextInformationPosition(viewer,
- offset);
+ public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
+ int contextInformationPosition = guessContextInformationPosition(viewer, offset);
List result = addContextInformations(viewer, contextInformationPosition);
- return (IContextInformation[]) result
- .toArray(new IContextInformation[result.size()]);
+ return (IContextInformation[]) result.toArray(new IContextInformation[result.size()]);
}
+
private List addContextInformations(ITextViewer viewer, int offset) {
- ICompletionProposal[] proposals = internalComputeCompletionProposals(
- viewer, offset, -1);
+ ICompletionProposal[] proposals = internalComputeCompletionProposals(viewer, offset, -1);
List result = new ArrayList();
for (int i = 0; i < proposals.length; i++) {
- IContextInformation contextInformation = proposals[i]
- .getContextInformation();
+ IContextInformation contextInformation = proposals[i].getContextInformation();
if (contextInformation != null) {
- ContextInformationWrapper wrapper = new ContextInformationWrapper(
- contextInformation);
+ ContextInformationWrapper wrapper = new ContextInformationWrapper(contextInformation);
wrapper.setContextInformationPosition(offset);
result.add(wrapper);
}
}
return result;
}
+
/**
* Order the given proposals.
*/
@@ -757,6 +829,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
Arrays.sort(proposals, fComparator);
return proposals;
}
+
/*
* (non-Javadoc) Method declared on IContentAssistProcessor
*/
@@ -764,22 +837,25 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
return fProposalAutoActivationSet;
// return null; // new char[] { '$' };
}
+
/*
* (non-Javadoc) Method declared on IContentAssistProcessor
*/
public char[] getContextInformationAutoActivationCharacters() {
- return new char[]{};
+ return new char[] {};
}
+
/*
* (non-Javadoc) Method declared on IContentAssistProcessor
*/
public IContextInformationValidator getContextInformationValidator() {
return fValidator;
}
+
/*
* (non-Javadoc) Method declared on IContentAssistProcessor
*/
public String getErrorMessage() {
return null;
}
-}
+}
\ No newline at end of file