Ignore case for functions in syntax highlighting

[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 242f759..a21ea07 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
@@ -51,7 +51,9 @@ public class HTMLCodeScanner extends AbstractJavaScanner {
     IPreferenceConstants.PHP_KEYWORD,
     IPreferenceConstants.PHP_FUNCTIONNAME,
     IPreferenceConstants.PHP_VARIABLE,
-    IPreferenceConstants.PHP_STRING,
+    IPreferenceConstants.PHP_VARIABLE_DOLLAR,
+    IPreferenceConstants.PHP_STRING_DQ,
+    IPreferenceConstants.PHP_STRING_SQ,
     IPreferenceConstants.PHP_TYPE,
     IPreferenceConstants.PHP_CONSTANT,
     IPreferenceConstants.PHP_DEFAULT,
@@ -142,7 +144,7 @@ public class HTMLCodeScanner extends AbstractJavaScanner {
 
 //  keyword = new Token(new TextAttribute(provider.getColor(PHPColorProvider.KEYWORD)));
 //  IToken type = new Token(new TextAttribute(provider.getColor(PHPColorProvider.FUNCTION_NAME)));
-//    IToken string = new Token(new TextAttribute(provider.getColor(PHPColorProvider.STRING)));
+//    IToken string = new Token(new TextAttribute(provider.getColor(PHPColorProvider.STRING_DQ)));
 //  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)));
 //    IToken other = new Token(new TextAttribute(provider.getColor(PHPColorProvider.DEFAULT)));
@@ -155,7 +157,7 @@ public class HTMLCodeScanner extends AbstractJavaScanner {
   //rules.add(new EndOfLineRule("#", comment));
 
   // Add rule for strings and character constants.
-  rules.add(new SingleLineRule("\"", "\"", getToken(IPreferenceConstants.PHP_STRING))); //$NON-NLS-2$ //$NON-NLS-1$
+  rules.add(new SingleLineRule("\"", "\"", getToken(IPreferenceConstants.PHP_STRING_DQ))); //$NON-NLS-2$ //$NON-NLS-1$
   // rules.add(new SingleLineRule("'", "'", string, '\\')); //$NON-NLS-2$ //$NON-NLS-1$
 
   // rules.add(new SingleLineRule("//", "//", php_comment));