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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPWordExtractor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPWordExtractor.java
index aeda784..ed9b88c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPWordExtractor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPWordExtractor.java
@@ -1,19 +1,21 @@
 /**********************************************************************
-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
-**********************************************************************/
+ 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
+ www.phpeclipse.de
+ **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor.php;
 
-import org.eclipse.swt.graphics.Point;
+import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.swt.graphics.Point;
 
 /**
  * Detects PHP words in documents.
@@ -22,10 +24,13 @@ public class PHPWordExtractor {
 
 	/**
 	 * Find the location of the word at offset in document.
-	 * @returns Point - x is the start position, y is the end position.
-	 * 	Return null if it is not found.
-	 * @param document the document being searched.
-	 * @param offset - the position to start searching from.
+	 * 
+	 * @returns Point - x is the start position, y is the end position. Return
+	 *          null if it is not found.
+	 * @param document
+	 *            the document being searched.
+	 * @param offset -
+	 *            the position to start searching from.
 	 */
 	public static Point findWord(IDocument document, int offset) {
 
@@ -39,7 +44,8 @@ public class PHPWordExtractor {
 
 			while (position >= 0) {
 				character = document.getChar(position);
-				if (!Character.isJavaIdentifierPart(character) && (character != '$'))
+				if (!Scanner.isPHPIdentifierPart(character)
+						&& (character != '$'))
 					break;
 				--position;
 			}
@@ -51,12 +57,13 @@ public class PHPWordExtractor {
 
 			while (position < length) {
 				character = document.getChar(position);
-				if (!Character.isJavaIdentifierPart(character) && (character != '$'))
+				if (!Scanner.isPHPIdentifierPart(character)
+						&& (character != '$'))
 					break;
 				++position;
 			}
 
-      start++;
+			start++;
 			end = position;
 
 			if (end > start)