From ee006271d86185e6e3b2f038eb511062cbca615f Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 22 Jun 2015 09:01:55 +0200
Subject: [PATCH] New editor: setForeground doesn't change default text color,
 "IDENTIFIER" token style does the job. Fixes #3372

---
 app/src/processing/app/syntax/SketchTextArea.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/processing/app/syntax/SketchTextArea.java b/app/src/processing/app/syntax/SketchTextArea.java
index d1245f840..8ff329a5f 100644
--- a/app/src/processing/app/syntax/SketchTextArea.java
+++ b/app/src/processing/app/syntax/SketchTextArea.java
@@ -106,7 +106,6 @@ public class SketchTextArea extends RSyntaxTextArea {
       IOUtils.closeQuietly(defaultXmlInputStream);
     }
 
-    setForeground(processing.app.Theme.getColor("editor.fgcolor"));
     setBackground(processing.app.Theme.getColor("editor.bgcolor"));
     setCurrentLineHighlightColor(processing.app.Theme.getColor("editor.linehighlight.color"));
     setCaretColor(processing.app.Theme.getColor("editor.caret.color"));
@@ -129,6 +128,10 @@ public class SketchTextArea extends RSyntaxTextArea {
     setSyntaxTheme(TokenTypes.LITERAL_BOOLEAN, "literal_boolean");
     setSyntaxTheme(TokenTypes.LITERAL_CHAR, "literal_char");
     setSyntaxTheme(TokenTypes.LITERAL_STRING_DOUBLE_QUOTE, "literal_string_double_quote");
+
+    Style style = getSyntaxScheme().getStyle(TokenTypes.IDENTIFIER);
+    style.foreground = processing.app.Theme.getColor("editor.fgcolor");
+    getSyntaxScheme().setStyle(TokenTypes.IDENTIFIER, style);
   }
 
   private void setSyntaxTheme(int tokenType, String id) {
@@ -391,7 +394,7 @@ public class SketchTextArea extends RSyntaxTextArea {
         // Copy token, viewToModel() unfortunately modifies Token
         t = new TokenImpl(t);
       }
-      Cursor c2 = null;
+      Cursor c2;
       if (t != null && t.isHyperlink()) {
         if (hoveredOverLinkOffset == -1 ||
           hoveredOverLinkOffset != t.getOffset()) {