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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
index f4e6582..02a3c70 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
@@ -11,12 +11,19 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor;
 
+import java.io.FileReader;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
-import net.sourceforge.phpeclipse.phpeditor.php.PHPFunctionDescription;
-import net.sourceforge.phpeclipse.phpeditor.php.PHPFunctionNames;
+import net.sourceforge.phpdt.internal.corext.phpdoc.PHPDocUtil;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
+import net.sourceforge.phpeclipse.builder.PHPIdentifierLocation;
+import net.sourceforge.phpeclipse.phpeditor.php.PHPElement;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPWordExtractor;
-import org.eclipse.jface.text.BadLocationException;
+
+import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextHover;
 import org.eclipse.jface.text.ITextViewer;
@@ -24,13 +31,21 @@ import org.eclipse.jface.text.Region;
 import org.eclipse.swt.graphics.Point;
 
 /**
- * Example implementation for an <code>ITextHover</code> 
+ * Implementation for an <code>ITextHover</code> 
  * which hovers over PHP code.
  */
 public class PHPTextHover implements ITextHover {
   public static HashMap functionDescriptions = null;
-  
+
   private static PHPWordExtractor phpWordDetector = new PHPWordExtractor();
+  /**
+   * The current project; maybe <code>null</code> for preference pages
+   */
+  private IProject fProject;
+
+  public PHPTextHover(IProject project) {
+    fProject = project;
+  }
   /* (non-Javadoc)
    * Method declared on ITextHover
    */
@@ -39,15 +54,54 @@ public class PHPTextHover implements ITextHover {
       try {
         if (hoverRegion.getLength() > -1) {
           String word = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());
-          if (functionDescriptions==null) {
-            functionDescriptions = new HashMap(997);
-            for (int i=0; i<PHPFunctionNames.FUNCTION_NAMES.length;i++) {
-              functionDescriptions.put(PHPFunctionNames.FUNCTION_NAMES[i],PHPFunctionDescription.FUNCTION_DESCRIPTION[i]);
+          if (functionDescriptions == null) {
+            functionDescriptions = new HashMap();
+
+						ArrayList syntaxbuffer = PHPSyntaxRdr.getSyntaxData();
+            String strbuffer = null;
+            PHPElement elbuffer = null;
+            if (syntaxbuffer!=null) {
+            	for (int i=0;i<syntaxbuffer.size();i++) {
+							  elbuffer = (PHPElement) syntaxbuffer.get(i);
+								functionDescriptions.put(elbuffer.getName(), elbuffer.getHoverText());
+            	}
+            }
+//            
+//            while ((syntaxbuffer != null)
+//              && (!syntaxbuffer.isEmpty() && ((elbuffer = (PHPElement) syntaxbuffer.remove(0)) != null))) {
+//              functionDescriptions.put(elbuffer.getName(), elbuffer.getHoverText());
+//            }
+
+          }
+          String hoverInfo = (String) functionDescriptions.get(word);
+          if (hoverInfo == null && fProject != null) {
+            // get the possible PHPDoc information from the index file
+            IdentifierIndexManager indexManager = PHPeclipsePlugin.getDefault().getIndexManager(fProject);
+            List list = indexManager.getLocations(word);
+            if (list.size() > 0) {
+              try {
+                PHPIdentifierLocation location;
+                String filename;
+                FileReader phpdocFileReader;
+                StringBuffer hoverInfoBuffer = new StringBuffer();
+                String workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
+                //                boolean foundPHPdoc = false;
+                for (int i = 0; i < list.size(); i++) {
+                  location = (PHPIdentifierLocation) list.get(i);
+									filename = workspaceLocation + location.getFilename();
+                  PHPDocUtil.appendPHPDoc(hoverInfoBuffer, filename, location);
+                }
+                hoverInfo = hoverInfoBuffer.toString();
+              } catch (Throwable e) {
+                // ignore exceptions
+                // e.printStackTrace();
+              }
             }
           }
-          return (String) functionDescriptions.get(word);
+          return hoverInfo;
         }
-      } catch (BadLocationException x) {
+        //      } catch (BadLocationException x) {
+      } catch (Exception x) {
       }
     }
     return "empty selection";
@@ -58,8 +112,8 @@ public class PHPTextHover implements ITextHover {
    */
   public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
     Point selection = PHPWordExtractor.findWord(textViewer.getDocument(), offset);
-//  show the extracted word as a tooltip
-    if (selection!=null && selection.x <= offset && offset < selection.x + selection.y)
+    //  show the extracted word as a tooltip
+    if (selection != null && selection.x <= offset && offset < selection.x + selection.y)
       return new Region(selection.x, selection.y);
     return new Region(offset, 0);
   }