New Editor (based on RSyntaxTextArea ) - 1.6.4

app/.classpath

@@ -31,5 +31,6 @@
 	<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
 	<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
 	<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
+	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.0-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/lib/rsyntaxtextarea-BSD.txt

@@ -0,0 +1,24 @@
+Copyright (c) 2012, Robert Futrell
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its contributors may
+      be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

app/src/ArduinoIDE.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Arduino.
+ *
+ * Copyright 2015 Ricardo JL Rufino ([email protected])
+ *
+ * Arduino is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ */
+
+import processing.app.Base;
+
+/**
+ * Arduino IDE Launcher class
+ *
+ * @author Ricardo JL Rufino ([email protected])
+ * @date 23/01/2015
+ */
+public class ArduinoIDE {
+
+  public static void main(String[] args) throws Exception {
+    Base.main(args);
+  }
+
+}

app/src/cc/arduino/packages/formatter/AStyle.java

@@ -1,3 +1,5 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
 /*
  * This file is part of Arduino.
  *
@@ -32,9 +34,10 @@
 import processing.app.Base;
 import processing.app.Editor;
 import processing.app.helpers.FileUtils;
-import processing.app.syntax.JEditTextArea;
+import processing.app.syntax.SketchTextArea;
 import processing.app.tools.Tool;
 
+import javax.swing.text.BadLocationException;
 import java.io.File;
 import java.io.IOException;
 
@@ -84,17 +87,50 @@ public void run() {
       return;
     }
 
-    JEditTextArea textArea = editor.getTextArea();
-    int line = textArea.getLineOfOffset(textArea.getCaretPosition());
-    int lineOffset = textArea.getCaretPosition() - textArea.getLineStartOffset(line);
+    SketchTextArea textArea = editor.getTextArea();
+
+    int line = getLineOfOffset(textArea);
+    int lineOffset = getLineOffset(textArea, line);
 
+    editor.getTextArea().getUndoManager().beginInternalAtomicEdit();
     editor.setText(formattedText);
     editor.getSketch().setModified(true);
-    textArea.setCaretPosition(Math.min(textArea.getLineStartOffset(line) + lineOffset, textArea.getSafeLineStopOffset(line) - 1));
+    editor.getTextArea().getUndoManager().endInternalAtomicEdit();
+
+    if (line != -1 && lineOffset != -1) {
+      setCaretPosition(textArea, line, lineOffset);
+    }
+
     // mark as finished
     editor.statusNotice(_("Auto Format finished."));
   }
 
+  private void setCaretPosition(SketchTextArea textArea, int line, int lineOffset) {
+    try {
+      textArea.setCaretPosition(Math.min(textArea.getLineStartOffset(line) + lineOffset, textArea.getLineEndOffset(line) - 1));
+    } catch (BadLocationException e) {
+      e.printStackTrace();
+    }
+  }
+
+  private int getLineOffset(SketchTextArea textArea, int line) {
+    try {
+      return textArea.getCaretPosition() - textArea.getLineStartOffset(line);
+    } catch (BadLocationException e) {
+      e.printStackTrace();
+    }
+    return -1;
+  }
+
+  private int getLineOfOffset(SketchTextArea textArea) {
+    try {
+      return textArea.getLineOfOffset(textArea.getCaretPosition());
+    } catch (BadLocationException e) {
+      e.printStackTrace();
+    }
+    return -1;
+  }
+
   @Override
   public String getMenuTitle() {
     return _("Auto Format");

app/src/processing/app/Base.java

@@ -53,15 +53,20 @@
 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;
 
 import javax.swing.*;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.io.*;
 import java.util.*;
 import java.util.List;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import static processing.app.I18n._;
 
@@ -114,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");
@@ -137,6 +144,8 @@ static public void guardedMain(String args[]) throws Exception {
 
     BaseNoGui.initLogger();
 
+    initLogger();
+
     BaseNoGui.notifier = new GUIUserNotifier();
 
     initPlatform();
@@ -215,6 +224,34 @@ static public void guardedMain(String args[]) throws Exception {
     INSTANCE = new Base(args);
   }
 
+
+  static public void initLogger() {
+    Handler consoleHandler = new ConsoleLogger();
+    consoleHandler.setLevel(Level.ALL);
+    consoleHandler.setFormatter(new LogFormatter("%1$tl:%1$tM:%1$tS [%4$7s] %2$s: %5$s%n"));
+
+    Logger globalLogger = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+    globalLogger.setLevel(consoleHandler.getLevel());
+
+    // Remove default
+    Handler[] handlers = globalLogger.getHandlers();
+    for(Handler handler : handlers) {
+        globalLogger.removeHandler(handler);
+    }
+    Logger root = Logger.getLogger("");
+    handlers = root.getHandlers();
+    for(Handler handler : handlers) {
+      root.removeHandler(handler);
+    }
+
+    globalLogger.addHandler(consoleHandler);
+
+    Logger.getLogger("cc.arduino.packages.autocomplete").setParent(globalLogger);
+    Logger.getLogger("br.com.criativasoft.cpluslibparser").setParent(globalLogger);
+    Logger.getLogger(Base.class.getPackage().getName()).setParent(globalLogger);
+
+  }
+
 
   static protected void setCommandLine() {
     commandLine = true;
@@ -275,6 +312,9 @@ public Base(String[] args) throws Exception {
     // Setup board-dependent variables.
     onBoardOrPortChange();
 
+    this.pdeKeywords = new PdeKeywords();
+    this.pdeKeywords.reload();
+
     CommandlineParser parser = CommandlineParser.newCommandlineParser(args);
 
     for (String path : parser.getFilenames()) {
@@ -2098,6 +2138,14 @@ static public void setIcon(Frame frame) {
     // don't use the low-res icon on Mac OS X; the window should
     // already have the right icon from the .app file.
     if (OSUtils.isMacOS()) return;
+
+    // don't use the low-res icon on Linux
+    if (OSUtils.isLinux()){
+      String current = System.getProperty("user.dir");
+      Image image = Toolkit.getDefaultToolkit().createImage(current + "/lib/arduino.png");
+      frame.setIconImage(image);
+      return;
+    }
 
     Image image = Toolkit.getDefaultToolkit().createImage(PApplet.ICON_IMAGE);
     frame.setIconImage(image);
@@ -2152,7 +2200,12 @@ static public void showReference(String prefix, String filename) {
     File referenceFile = new File(referenceFolder, filename);
     if (!referenceFile.exists())
       referenceFile = new File(referenceFolder, filename + ".html");
-    openURL(referenceFile.getAbsolutePath());
+
+    if(referenceFile.exists()){
+      openURL(referenceFile.getAbsolutePath());
+    }else{
+      showWarning(_("Problem Opening URL"), I18n.format(_("Could not open the URL\n{0}"), referenceFile), null); 
+    }
   }
 
   public static void showEdisonGettingStarted() {
@@ -2724,4 +2777,8 @@ public List<Editor> getEditors() {
   public Action getOpenBoardsManager() {
     return openBoardsManager;
   }
+
+  public PdeKeywords getPdeKeywords() {
+    return pdeKeywords;
+  }
 }

app/src/processing/app/CaretAwareUndoableEdit.java

@@ -1,17 +1,17 @@
 package processing.app;
 
-import processing.app.syntax.JEditTextArea;
-
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoableEdit;
 
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+
 public class CaretAwareUndoableEdit implements UndoableEdit {
 
   private final UndoableEdit undoableEdit;
   private final int caretPosition;
 
-  public CaretAwareUndoableEdit(UndoableEdit undoableEdit, JEditTextArea textArea) {
+  public CaretAwareUndoableEdit(UndoableEdit undoableEdit, RSyntaxTextArea textArea) {
     this.undoableEdit = undoableEdit;
     this.caretPosition = textArea.getCaretPosition();
   }