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 eada1ba..c799309 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
@@ -1,14 +1,14 @@
 /**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
+ Copyright (c) 2000, 2002 IBM Corp. and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Common Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/cpl-v10.html
 
-Contributors:
-    IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
-**********************************************************************/
+ Contributors:
+ IBM Corporation - Initial implementation
+ www.phpeclipse.de
+ **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor.util;
 
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
@@ -16,21 +16,21 @@ 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 {
 
-	/* (non-Javadoc)
-	 * Method declared on IWordDetector.
+	/*
+	 * (non-Javadoc) Method declared on IWordDetector.
 	 */
 	public boolean isWordPart(char character) {
 		return Scanner.isPHPIdentifierPart(character);
 	}
-	
-	/* (non-Javadoc)
-	 * Method declared on IWordDetector.
+
+	/*
+	 * (non-Javadoc) Method declared on IWordDetector.
 	 */
 	public boolean isWordStart(char character) {
-		return (character=='$')||Scanner.isPHPIdentifierStart(character);
+		return Scanner.isPHPIdentOrVarStart(character);
 	}
 }