do {
fBuffer.append((char) c);
c = scanner.read();
- } while (c != scanner.EOF && fDetector.isWordPart((char) c));
+ } while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c));
scanner.unread();
if (isVariable) {
* Creates a PHP code scanner
*/
public PHPCodeScanner(PHPColorProvider provider) {
- final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+ final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
variable = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_VARIABLE))));
keyword = new Token(new TextAttribute(provider.getColor(PreferenceConverter.getColor(store, PHP_KEYWORD))));
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))));
-
List rules = new ArrayList();
// Add rule for single line comments.
// Add word rule for keywords, types, and constants.
PHPWordRule wordRule = new PHPWordRule(new PHPWordDetector(), other);
- for (int i = 0; i < PHPKeywords.PHP_KEYWORS.length; i++)
- wordRule.addWord(PHPKeywords.PHP_KEYWORS[i], keyword);
+// //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);
+// }
+// }
+//
+// //for (int i = 0; i < PHPFunctionNames.FUNCTION_NAMES.length; i++)
+// // wordRule.addWord(PHPFunctionNames.FUNCTION_NAMES[i], functionName);
+// //<--choochter
for (int i = 0; i < PHPFunctionNames.FUNCTION_NAMES.length; i++)
wordRule.addWord(PHPFunctionNames.FUNCTION_NAMES[i], functionName);
for (int i = 0; i < fgConstants.length; i++)
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))));
-
+
}
}