Restoring keyword.txt loading and parsing. Added token type identifiers and related style in theme.txt

Author: Federico Fissore

app/src/processing/app/Base.java

@@ -53,6 +53,7 @@
 import processing.app.macosx.ThinkDifferent;
 import processing.app.packages.LibraryList;
 import processing.app.packages.UserLibrary;
+import processing.app.syntax.PdeKeywords;
 import processing.app.tools.MenuScroller;
 import processing.app.tools.ZipDeflater;
 
@@ -118,6 +119,8 @@ public boolean apply(UserLibrary library) {
   private List<JMenu> boardsCustomMenus;
   private volatile Action openBoardsManager;
 
+  private final PdeKeywords pdeKeywords;
+
   static public void main(String args[]) throws Exception {
     System.setProperty("awt.useSystemAAFontSettings", "on");
     System.setProperty("swing.aatext", "true");
@@ -345,6 +348,9 @@ public Base(String[] args) throws Exception {
     // them.
     PreferencesData.save();
 
+    this.pdeKeywords = new PdeKeywords();
+    this.pdeKeywords.reload();
+
     if (parser.isInstallBoard()) {
       ContributionsIndexer indexer = new ContributionsIndexer(BaseNoGui.getSettingsFolder());
       ContributionInstaller installer = new ContributionInstaller(indexer) {
@@ -2771,4 +2777,8 @@ public List<Editor> getEditors() {
   public Action getOpenBoardsManager() {
     return openBoardsManager;
   }
+
+  public PdeKeywords getPdeKeywords() {
+    return pdeKeywords;
+  }
 }

app/src/processing/app/Editor.java

@@ -925,7 +925,7 @@ protected String findClassInZipFile(String base, File file) {
 
 
   protected SketchTextArea createTextArea() throws IOException {
-      SketchTextArea textArea = new SketchTextArea();
+      SketchTextArea textArea = new SketchTextArea(base.getPdeKeywords());
       textArea.requestFocusInWindow();
       textArea.setMarkOccurrences(true);
       textArea.setMarginLineEnabled(false);
@@ -1716,7 +1716,7 @@ protected void setCode(final SketchCodeDocument codeDoc) {
     RSyntaxDocument document = (RSyntaxDocument) codeDoc.getDocument();
 
     if (document == null) {  // this document not yet inited
-      document = new RSyntaxDocument(RSyntaxDocument.SYNTAX_STYLE_CPLUSPLUS);
+      document = new RSyntaxDocument(new ArduinoTokenMakerFactory(base.getPdeKeywords()), RSyntaxDocument.SYNTAX_STYLE_CPLUSPLUS);
       document.putProperty(PlainDocument.tabSizeAttribute, Preferences.getInteger("editor.tabs.size"));
 
       // insert the program text into the document object
@@ -1912,7 +1912,7 @@ protected String getCurrentKeyword() {
 	protected void handleFindReference() {
 		String text = getCurrentKeyword();
 
-		String referenceFile = PdeKeywords.getReference(text);
+		String referenceFile = base.getPdeKeywords().getReference(text);
 		if (referenceFile == null) {
 			statusNotice(I18n.format(_("No reference available for \"{0}\""), text));
 		} else {
@@ -2848,7 +2848,7 @@ public void actionPerformed(ActionEvent e) {
 
       @Override
       public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-            String referenceFile = PdeKeywords.getReference(getCurrentKeyword());
+            String referenceFile = base.getPdeKeywords().getReference(getCurrentKeyword());
             referenceItem.setEnabled(referenceFile != null);
 
             int offset = textarea.getCaretPosition();

app/src/processing/app/Theme.java

@@ -21,37 +21,42 @@
 
 package processing.app;
 
-import static processing.app.I18n._;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.io.File;
-
-import javax.swing.text.StyleContext;
-
 import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesHelper;
 import processing.app.helpers.PreferencesMap;
 
+import javax.swing.text.StyleContext;
+import java.awt.*;
+import java.awt.font.TextAttribute;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import static processing.app.I18n._;
+
 /**
  * Storage class for theme settings. This was separated from the Preferences
  * class for 1.0 so that the coloring wouldn't conflict with previous releases
  * and to make way for future ability to customize.
  */
 public class Theme {
 
-  /** Copy of the defaults in case the user mangles a preference. */
+  /**
+   * Copy of the defaults in case the user mangles a preference.
+   */
   static PreferencesMap defaults;
-  /** Table of attributes/values for the theme. */
+  /**
+   * Table of attributes/values for the theme.
+   */
   static PreferencesMap table = new PreferencesMap();
 
   static protected void init() {
     try {
       table.load(new File(BaseNoGui.getContentFile("lib"), "theme/theme.txt"));
     } catch (Exception te) {
       Base.showError(null, _("Could not read color theme settings.\n" +
-                             "You'll need to reinstall Arduino."), te);
+              "You'll need to reinstall Arduino."), te);
     }
 
     // other things that have to be set explicitly for the defaults
@@ -106,8 +111,8 @@ static public Font getFont(String attr) {
     }
     return font;
   }
-  
-    /**
+
+  /**
    * Returns the default font for text areas.
    *
    * @return The default font.
@@ -129,8 +134,7 @@ public static final Font getDefaultFont() {
           font = sc.getFont("Monospaced", Font.PLAIN, 13);
         }
       }
-    }
-    else {
+    } else {
       // Consolas added in Vista, used by VS2010+.
       font = sc.getFont("Consolas", Font.PLAIN, 13);
       if (!"Consolas".equals(font.getFamily())) {
@@ -140,6 +144,30 @@ public static final Font getDefaultFont() {
 
     //System.out.println(font.getFamily() + ", " + font.getName());
     return font;
+  }
+
+  public static Map<String, Object> getStyledFont(String what, Font font) {
+    String split[] = get("editor." + what + ".style").split(",");
+
+    Color color = PreferencesHelper.parseColor(split[0]);
 
+    String style = split[1];
+    boolean bold = style.contains("bold");
+    boolean italic = style.contains("italic");
+    boolean underlined = style.contains("underlined");
+
+    Font styledFont = new Font(font.getFamily(), (bold ? Font.BOLD : 0) | (italic ? Font.ITALIC : 0), font.getSize());
+    if (underlined) {
+      Map<TextAttribute, Object> attr = new Hashtable<TextAttribute, Object>();
+      attr.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
+      styledFont = styledFont.deriveFont(attr);
+    }
+
+    Map<String, Object> result = new HashMap<String, Object>();
+    result.put("color", color);
+    result.put("font", styledFont);
+
+    return result;
   }
+
 }

app/src/processing/app/syntax/ArduinoTokenMakerFactory.java

@@ -0,0 +1,25 @@
+package processing.app.syntax;
+
+import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
+import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
+import org.fife.ui.rsyntaxtextarea.TokenMaker;
+
+public class ArduinoTokenMakerFactory extends AbstractTokenMakerFactory {
+
+  private final PdeKeywords pdeKeywords;
+
+  public ArduinoTokenMakerFactory(PdeKeywords pdeKeywords) {
+    this.pdeKeywords = pdeKeywords;
+  }
+
+  @Override
+  protected TokenMaker getTokenMakerImpl(String key) {
+    return new SketchTokenMaker(pdeKeywords);
+  }
+
+  @Override
+  protected void initTokenMakerMap() {
+    putMapping(RSyntaxDocument.SYNTAX_STYLE_CPLUSPLUS, SketchTokenMaker.class.getName());
+  }
+
+}