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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
index e73e00d..6a5040c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
@@ -15,10 +15,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
-import net.sourceforge.phpeclipse.IPreferenceConstants;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
-import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPWhitespaceDetector;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPWordDetector;
 
@@ -36,6 +32,13 @@ import org.eclipse.jface.text.rules.SingleLineRule;
 import org.eclipse.jface.text.rules.Token;
 import org.eclipse.jface.text.rules.WhitespaceRule;
 import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+
+import net.sourceforge.phpeclipse.IPreferenceConstants;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
+import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
 
 /**
  * PHP Code Scanner
@@ -44,6 +47,8 @@ public class PHPCodeScanner extends RuleBasedScanner implements IPreferenceConst
 
   private static Token variable;
   private static Token keyword;
+  private static Token type;
+  private static Token constant;
   private static Token functionName;
   private static Token string;
   private static Token comment;
@@ -96,93 +101,166 @@ public class PHPCodeScanner extends RuleBasedScanner implements IPreferenceConst
     }
   }
 
-  private static String[] fgConstants = { "__LINE__", "__FILE__", "true", "false", "null", "object", "array" };
-  //  private static TextAttribute fSingleLine;
-  //  private static TextAttribute fMultiLine;
-  //  private static TextAttribute fKeyword;
-  //  private static TextAttribute fFunctionName;
-  //  private static TextAttribute fString;
-  //  private static TextAttribute fVariable;
   private PHPColorProvider fColorProvider;
 
   /**
-   * Creates a PHP code scanner
-   */
+  	* Creates a PHP code scanner
+  	*/
   public PHPCodeScanner(PHPColorProvider provider) {
     final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+    Color BackgroundColor = provider.getColor(PreferenceConverter.getColor(store, PHP_EDITOR_BACKGROUND));
+    variable =
+      new Token(
+        new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_VARIABLE)),
+          BackgroundColor,
+          (store.getBoolean(PHP_VARIABLE_BOLD) ? SWT.BOLD : SWT.NONE)
+            + (store.getBoolean(PHP_VARIABLE_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+      keyword =
+        new Token(new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_KEYWORD)),
+          BackgroundColor,
+    //SWT.NONE));
+   (store.getBoolean(PHP_KEYWORD_BOLD) ? SWT.BOLD : SWT.NONE) + (store.getBoolean(PHP_KEYWORD_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+      type =
+        new Token(new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_TYPE)),
+          BackgroundColor,
+    //SWT.NONE));
+   (store.getBoolean(PHP_TYPE_BOLD) ? SWT.BOLD : SWT.NONE) + (store.getBoolean(PHP_TYPE_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+      functionName =
+        new Token(new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_FUNCTIONNAME)),
+          BackgroundColor,
+    //SWT.NONE));
+  (store.getBoolean(PHP_FUNCTIONNAME_BOLD) ? SWT.BOLD : SWT.NONE)
+    + (store.getBoolean(PHP_FUNCTIONNAME_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+      constant =
+        new Token(new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_CONSTANT)),
+          BackgroundColor,
+    //SWT.NONE));
+   (store.getBoolean(PHP_CONSTANT_BOLD) ? SWT.BOLD : SWT.NONE) + (store.getBoolean(PHP_CONSTANT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+      string =
+        new Token(new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_STRING)),
+          BackgroundColor,
+    //SWT.NONE));
+   (store.getBoolean(PHP_STRING_BOLD) ? SWT.BOLD : SWT.NONE ) + (store.getBoolean(PHP_STRING_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+      comment =
+        new Token(new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_SINGLELINE_COMMENT)),
+          BackgroundColor,
+    //SWT.NONE));
+  (store.getBoolean(PHP_SINGLELINE_COMMENT_BOLD) ? SWT.BOLD : SWT.NONE )
+    + (store.getBoolean(PHP_SINGLELINE_COMMENT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+      multi_comment =
+        new Token(new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_MULTILINE_COMMENT)),
+          BackgroundColor,
+    //SWT.NONE));
+  (store.getBoolean(PHP_MULTILINE_COMMENT_BOLD) ? SWT.BOLD : SWT.NONE)
+    + (store.getBoolean(PHP_MULTILINE_COMMENT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+      other =
+        new Token(new TextAttribute(
+          provider.getColor(PreferenceConverter.getColor(store, PHP_DEFAULT)),
+          BackgroundColor,
+    //SWT.NONE));
+   (store.getBoolean(PHP_DEFAULT_BOLD) ? SWT.BOLD : SWT.NONE) + (store.getBoolean(PHP_DEFAULT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    updateWordRules();
+  }
 
-    variable = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_VARIABLE))));
-    keyword = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_KEYWORD))));
-    functionName = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_FUNCTIONNAME))));
-    string = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_STRING))));
-    comment = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_SINGLELINE_COMMENT))));
-    multi_comment = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_MULTILINE_COMMENT))));
-    other = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_DEFAULT))));
+  public void updateToken(PHPColorProvider provider) {
+    final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
 
-    List rules = new ArrayList();
+    Color BackgroundColor = provider.getColor(PreferenceConverter.getColor(store, PHP_EDITOR_BACKGROUND));
+
+    variable.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_VARIABLE)),
+        BackgroundColor,
+        (store.getBoolean(PHP_VARIABLE_BOLD) ? SWT.BOLD : SWT.NONE)
+          + (store.getBoolean(PHP_VARIABLE_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    keyword.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_KEYWORD)),
+        BackgroundColor,
+        (store.getBoolean(PHP_KEYWORD_BOLD) ? SWT.BOLD : SWT.NONE)
+          + (store.getBoolean(PHP_KEYWORD_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    type.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_TYPE)),
+        BackgroundColor,
+        (store.getBoolean(PHP_TYPE_BOLD) ? SWT.BOLD : SWT.NONE) + (store.getBoolean(PHP_TYPE_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    functionName.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_FUNCTIONNAME)),
+        BackgroundColor,
+        (store.getBoolean(PHP_FUNCTIONNAME_BOLD) ? SWT.BOLD : SWT.NONE)
+          + (store.getBoolean(PHP_FUNCTIONNAME_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    constant.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_CONSTANT)),
+        BackgroundColor,
+        (store.getBoolean(PHP_CONSTANT_BOLD) ? SWT.BOLD : SWT.NONE)
+          + (store.getBoolean(PHP_CONSTANT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    string.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_STRING)),
+        BackgroundColor,
+        (store.getBoolean(PHP_STRING_BOLD) ? SWT.BOLD : SWT.NONE) + (store.getBoolean(PHP_STRING_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    comment.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_SINGLELINE_COMMENT)),
+        BackgroundColor,
+        (store.getBoolean(PHP_SINGLELINE_COMMENT_BOLD) ? SWT.BOLD : SWT.NONE)
+          + (store.getBoolean(PHP_SINGLELINE_COMMENT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    multi_comment.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_MULTILINE_COMMENT)),
+        BackgroundColor,
+        (store.getBoolean(PHP_MULTILINE_COMMENT_BOLD) ? SWT.BOLD : SWT.NONE)
+          + (store.getBoolean(PHP_MULTILINE_COMMENT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+    other.setData(
+      new TextAttribute(
+        provider.getColor(PreferenceConverter.getColor(store, PHP_DEFAULT)),
+        BackgroundColor,
+        (store.getBoolean(PHP_DEFAULT_BOLD) ? SWT.BOLD : SWT.NONE)
+          + (store.getBoolean(PHP_DEFAULT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+  }
 
+  public void updateWordRules() {
+    List rules = new ArrayList();
     // Add rule for single line comments.
     rules.add(new EndOfLineRule("//", comment)); //$NON-NLS-1$
     rules.add(new EndOfLineRule("#", comment));
-
     // Add rule for strings and character constants.
     rules.add(new MultiLineRule("\"", "\"", string, '\\')); //$NON-NLS-2$ //$NON-NLS-1$
     rules.add(new SingleLineRule("'", "'", string, '\\')); //$NON-NLS-2$ //$NON-NLS-1$
-
     // rules.add(new SingleLineRule("//", "//", php_comment));
     rules.add(new MultiLineRule("/*", "*/", multi_comment));
-
     // Add generic whitespace rule.
     rules.add(new WhitespaceRule(new PHPWhitespaceDetector()));
-
     // Add word rule for keywords, types, and constants.
     PHPWordRule wordRule = new PHPWordRule(new PHPWordDetector(), other);
-    //choochter-->
-    for (int i = 0; i < PHPKeywords.PHP_KEYWORS.length; i++)
-      wordRule.addWord(PHPKeywords.PHP_KEYWORS[i], keyword);
-
-    /*Read in the keywords from the XML file*/
-    PHPSyntaxRdr syntaxRdr = new PHPSyntaxRdr();
-    syntaxRdr.readFromFile(
-      "C:\\eclipse\\workspace\\net.sourceforge.phpeclipse\\src\\net\\sourceforge\\phpeclipse\\phpeditor"
-        + java.io.File.separator
-        + "syntax.xml");
-    {
-      Vector Vbuffer = syntaxRdr.getKeywords();
-      String VString = null;
-      //Read keywords
-      while ((Vbuffer != null) && (!Vbuffer.isEmpty() && ((VString = (String) Vbuffer.remove(0)) != null))) {
-        wordRule.addWord(VString, keyword);
-      }
-      //Read functions  - to be tested
-      Vbuffer = syntaxRdr.getFunctions();
-      while ((Vbuffer != null) && (!Vbuffer.isEmpty() && ((VString = (String) Vbuffer.remove(0)) != null))) {
-        wordRule.addWord(VString, functionName);
-      }
+
+    PHPSyntaxRdr.readInSyntax();
+    Vector buffer = PHPSyntaxRdr.getsyntaxdata();
+    String strbuffer = null;
+    PHPElement elbuffer = null;
+    while ((buffer != null) && (!buffer.isEmpty() && ((elbuffer = (PHPElement) buffer.remove(0)) != null))) {
+      if (elbuffer instanceof PHPKeyword)
+        wordRule.addWord(((PHPKeyword) elbuffer).getName(), keyword);
+      if (elbuffer instanceof PHPFunction)
+        wordRule.addWord(((PHPFunction) elbuffer).getName(), functionName);
+      if (elbuffer instanceof PHPType)
+        wordRule.addWord(elbuffer.getName(), type);
+      if (elbuffer instanceof PHPConstant)
+        wordRule.addWord(elbuffer.getName(), constant);
     }
-    
-    //for (int i = 0; i < PHPFunctionNames.FUNCTION_NAMES.length; i++)
-    //  wordRule.addWord(PHPFunctionNames.FUNCTION_NAMES[i], functionName);
-    //<--choochter
-    for (int i = 0; i < fgConstants.length; i++)
-      wordRule.addWord(fgConstants[i], functionName);
     rules.add(wordRule);
-
     IRule[] result = new IRule[rules.size()];
     rules.toArray(result);
     setRules(result);
   }
-
-  public void updateToken(PHPColorProvider provider) {
-    final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-
-    variable.setData(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_VARIABLE))));
-    keyword.setData(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_KEYWORD))));
-    functionName.setData(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_FUNCTIONNAME))));
-    string.setData(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_STRING))));
-    comment.setData(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_SINGLELINE_COMMENT))));
-    multi_comment.setData(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_MULTILINE_COMMENT))));
-    other.setData(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_DEFAULT))));
-
-  }
 }