import net.sourceforge.phpdt.internal.corext.template.ContextType;
import net.sourceforge.phpdt.internal.corext.template.php.CompilationUnitContextType;
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 net.sourceforge.phpeclipse.phpeditor.php.PHPElement;
+import net.sourceforge.phpeclipse.phpeditor.php.PHPFunction;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
* @param completionPosition the context position in the document of the text viewer
* @param compilationUnit the compilation unit (may be <code>null</code>)
*/
- public void complete(ITextViewer viewer, int completionPosition, Object[] identifiers)
+ public void complete(ITextViewer viewer, int completionPosition, ArrayList identifiers)
//,ICompilationUnit compilationUnit)
//hrows JavaModelException
{
// 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;
+ PHPElement element = null;
+ for (int i = 0; i != identifiers.size(); i++) {
+ element = (PHPElement) identifiers.get(i);
+ if (element instanceof PHPFunction) {
+ identifier = ((PHPFunction) element).getName();
+ if (context.canEvaluate(identifier)) {
+ if (maxProposals-- < 0) {
+ return;
+ }
+ fProposals.add(new BuiltInProposal(identifier, (PHPFunction) element, context, region, viewer));
}
- fProposals.add(new BuiltInProposal(identifier, context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_BUILTIN)));
}
}
}