rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Fixed error when redoing/undoing auto format

Browse Source
This commit is contained in:
Federico Fissore 2015-07-06 14:35:18 +02:00
parent 0d857e7e20
commit 1af21b2233
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/cc/arduino/packages/formatter/AStyle.java
View File

@ -99,19 +99,25 @@ public class AStyle implements Tool {
editor.getTextArea().getUndoManager().endInternalAtomicEdit();
if (line != -1 && lineOffset != -1) {
setCaretPosition(textArea, line, lineOffset);
try {
setCaretPosition(textArea, line, lineOffset);
} catch (BadLocationException e) {
e.printStackTrace();
}
}
// 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 void setCaretPosition(SketchTextArea textArea, int line, int lineOffset) throws BadLocationException {
int caretPosition;
if (line < textArea.getLineCount()) {
caretPosition = Math.min(textArea.getLineStartOffset(line) + lineOffset, textArea.getLineEndOffset(line) - 1);
} else {
caretPosition = textArea.getText().length() - 1;
}
textArea.setCaretPosition(caretPosition);
}
private int getLineOffset(SketchTextArea textArea, int line) {