First submit for debug plugin

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / php / HTMLCodeScanner.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCodeScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCodeScanner.java
index ccc6b92..450c3b4 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCodeScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCodeScanner.java
@@ -14,10 +14,12 @@ package net.sourceforge.phpeclipse.phpeditor.php;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sourceforge.phpdt.internal.ui.text.JavaColorManager;
 import net.sourceforge.phpeclipse.phpeditor.util.HTMLWordDetector;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPWhitespaceDetector;
-import org.eclipse.jface.text.BadLocationException;
+
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.rules.ICharacterScanner;
 import org.eclipse.jface.text.rules.IRule;
@@ -30,7 +32,7 @@ import org.eclipse.jface.text.rules.WhitespaceRule;
 import org.eclipse.jface.text.rules.WordRule;
 
 /**
- * A Java code scanner.
+ * A HTML code scanner.
  */
 public class HTMLCodeScanner extends RuleBasedScanner {
 
@@ -74,7 +76,7 @@ public class HTMLCodeScanner extends RuleBasedScanner {
             if (c == '/' && (fBuffer.length() > 2) ) {
               break;
             }
-          } while (c != scanner.EOF && fDetector.isWordPart((char) c));
+          } while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c));
           scanner.unread();
 
           if (tagBegin) {
@@ -107,10 +109,10 @@ public class HTMLCodeScanner extends RuleBasedScanner {
   /**
    * Creates a Java code scanner
    */
-  public HTMLCodeScanner(PHPColorProvider provider) {
+  public HTMLCodeScanner(JavaColorManager provider, IPreferenceStore store) {
 
     keyword = new Token(new TextAttribute(provider.getColor(PHPColorProvider.KEYWORD)));
-    IToken type = new Token(new TextAttribute(provider.getColor(PHPColorProvider.TYPE)));
+    IToken type = new Token(new TextAttribute(provider.getColor(PHPColorProvider.FUNCTION_NAME)));
     IToken string = new Token(new TextAttribute(provider.getColor(PHPColorProvider.STRING)));
     IToken comment = new Token(new TextAttribute(provider.getColor(PHPColorProvider.SINGLE_LINE_COMMENT)));
     IToken multi_comment = new Token(new TextAttribute(provider.getColor(PHPColorProvider.MULTI_LINE_COMMENT)));