added code completion for HTML mode

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / text / template / IdentifierEngine.java

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 66a315c..90d6c44 100644 (file)
--- 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
@@ -6,22 +6,15 @@ package net.sourceforge.phpdt.internal.ui.text.template;
 
 import java.util.ArrayList;
 
+import net.sourceforge.phpdt.internal.corext.template.ContextType;
+import net.sourceforge.phpdt.internal.corext.template.php.PHPUnitContext;
+import net.sourceforge.phpdt.internal.corext.template.php.CompilationUnitContextType;
+import net.sourceforge.phpdt.internal.ui.PHPUiImages;
+import net.sourceforge.phpdt.internal.ui.text.java.IPHPCompletionProposal;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.Region;
-
-//import org.eclipse.jdt.core.ICompilationUnit;
-//import org.eclipse.jdt.core.JavaModelException;
-
-//import org.eclipse.jdt.internal.corext.Assert;
-import net.sourceforge.phpdt.internal.corext.template.ContextType;
-import net.sourceforge.phpdt.internal.corext.template.Template;
-import net.sourceforge.phpdt.internal.corext.template.Templates;
-import net.sourceforge.phpdt.internal.corext.template.java.CompilationUnitContext;
-import net.sourceforge.phpdt.internal.corext.template.java.CompilationUnitContextType;
-//import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import net.sourceforge.phpdt.internal.ui.text.java.IJavaCompletionProposal;
 //import org.eclipse.jdt.internal.ui.text.link.LinkedPositionManager;
 
 public class IdentifierEngine {
@@ -53,8 +46,8 @@ public class IdentifierEngine {
        /**
         * Returns the array of matching templates.
         */
-       public IJavaCompletionProposal[] getResults() {
-               return (IJavaCompletionProposal[]) fProposals.toArray(new IJavaCompletionProposal[fProposals.size()]);
+       public IPHPCompletionProposal[] getResults() {
+               return (IPHPCompletionProposal[]) fProposals.toArray(new IPHPCompletionProposal[fProposals.size()]);
        }
 
        /**
@@ -78,7 +71,7 @@ public class IdentifierEngine {
                        return;
                
                ((CompilationUnitContextType) fContextType).setContextParameters(document, completionPosition);//mpilationUnit);
-               CompilationUnitContext context= (CompilationUnitContext) fContextType.createContext();
+               PHPUnitContext context= (PHPUnitContext) fContextType.createContext();
                int start= context.getStart();
                int end= context.getEnd();
                IRegion region= new Region(start, end - start);
@@ -88,7 +81,7 @@ public class IdentifierEngine {
                for (int i= 0; i != identifiers.length; i++) {
       identifier = (String) identifiers[i];
                        if (context.canEvaluate(identifier)) {
-                               fProposals.add(new IdentifierProposal(identifier, context, region, viewer)); //luginImages.get(JavaPluginImages.IMG_OBJS_TEMPLATE)));
+                               fProposals.add(new IdentifierProposal(identifier, context, region, viewer, PHPUiImages.get(PHPUiImages.IMG_FUN), PHPUiImages.get(PHPUiImages.IMG_VAR))); 
       }
     }
        }