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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/util/PHPWordDetector.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/util/PHPWordDetector.java
index 99e036f..1050592 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/util/PHPWordDetector.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/util/PHPWordDetector.java
@@ -7,14 +7,16 @@ http://www.eclipse.org/legal/cpl-v10.html
 
 Contributors:
     IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
+    www.phpeclipse.de
 **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor.util;
 
+import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
+
 import org.eclipse.jface.text.rules.IWordDetector;
 
 /**
- * A Java aware word detector.
+ * A PHP aware word detector.
  */
 public class PHPWordDetector implements IWordDetector {
 
@@ -22,13 +24,13 @@ public class PHPWordDetector implements IWordDetector {
 	 * Method declared on IWordDetector.
 	 */
 	public boolean isWordPart(char character) {
-		return Character.isJavaIdentifierPart(character);
+		return Scanner.isPHPIdentifierPart(character);
 	}
 	
 	/* (non-Javadoc)
 	 * Method declared on IWordDetector.
 	 */
 	public boolean isWordStart(char character) {
-		return (character=='$')||Character.isJavaIdentifierStart(character);
+		return Scanner.isPHPIdentOrVarStart(character);
 	}
 }