new editor based on RSyntaxTextArea

Author: ricardojlrufino

app/src/ArduinoIDE.java

@@ -0,0 +1,36 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2004-10 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2
+  as published by the Free Software Foundation.
+
+  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+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.
  *
@@ -29,16 +31,18 @@
 
 package cc.arduino.packages.formatter;
 
-import processing.app.Base;
-import processing.app.Editor;
-import processing.app.helpers.FileUtils;
-import processing.app.syntax.JEditTextArea;
-import processing.app.tools.Tool;
+import static processing.app.I18n._;
 
 import java.io.File;
 import java.io.IOException;
 
-import static processing.app.I18n._;
+import javax.swing.text.BadLocationException;
+
+import processing.app.Base;
+import processing.app.Editor;
+import processing.app.helpers.FileUtils;
+import processing.app.syntax.SketchTextArea;
+import processing.app.tools.Tool;
 
 public class AStyle implements Tool {
 
@@ -84,13 +88,17 @@ 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();
     editor.setText(formattedText);
     editor.getSketch().setModified(true);
-    textArea.setCaretPosition(Math.min(textArea.getLineStartOffset(line) + lineOffset, textArea.getSafeLineStopOffset(line) - 1));
+    
+    try {
+      int line = textArea.getLineOfOffset(textArea.getCaretPosition());
+      int lineOffset = textArea.getCaretPosition() - textArea.getLineStartOffset(line);
+      textArea.setCaretPosition(Math.min(textArea.getLineStartOffset(line) + lineOffset, textArea.getLineEndOffset(line) - 1));
+    } catch (BadLocationException e) {
+      e.printStackTrace();
+    }
     // mark as finished
     editor.statusNotice(_("Auto Format finished."));
   }

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();
   }