rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-27 21:54:30 +01:00
Code Issues Releases Activity

Fixed regression tests on Indent/Unindent and Comment/Uncomment actions

Browse Source 
RSTA for some reason doesn't fire update signals on DocumentListeners.
This commit is contained in:
Cristian Maglie 2017-02-24 17:09:51 +01:00 committed by Cristian Maglie
parent f5eb673f44
commit 1f35bfca53
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/processing/app/EditorTab.java
View File

@ -518,7 +518,8 @@ public class EditorTab extends JPanel implements SketchFile.TextStorage {
void handleCommentUncomment() { void handleCommentUncomment() {
Action action = textarea.getActionMap().get(RSyntaxTextAreaEditorKit.rstaToggleCommentAction); Action action = textarea.getActionMap().get(RSyntaxTextAreaEditorKit.rstaToggleCommentAction);
action.actionPerformed(null); action.actionPerformed(null);
// XXX: RSyntaxDocument doesn't fire DocumentListener events, it should be fixed in RSyntaxTextArea?
editor.updateUndoRedoState();
} }
void handleDiscourseCopy() { void handleDiscourseCopy() {
@ -538,6 +539,8 @@ public class EditorTab extends JPanel implements SketchFile.TextStorage {
Action action = textarea.getActionMap().get(RSyntaxTextAreaEditorKit.rstaDecreaseIndentAction); Action action = textarea.getActionMap().get(RSyntaxTextAreaEditorKit.rstaDecreaseIndentAction);
action.actionPerformed(null); action.actionPerformed(null);
} }
// XXX: RSyntaxDocument doesn't fire DocumentListener events, it should be fixed in RSyntaxTextArea?
editor.updateUndoRedoState();
} }
void handleUndo() { void handleUndo() {

14
app/test/processing/app/BlockCommentGeneratesOneUndoActionTest.java
View File

@ -53,12 +53,24 @@ public class BlockCommentGeneratesOneUndoActionTest extends AbstractGUITest {
jEditTextArea.selectAll(); jEditTextArea.selectAll();
GuiActionRunner.execute(new GuiQuery<Frame>() { GuiActionRunner.execute(new GuiQuery<Frame>() {
protected Frame executeInEDT() { protected Frame executeInEDT() {
window.getEditor().getCurrentTab().handleCommentUncomment(); window.getEditor().getCurrentTab().handleCommentUncomment();
return window.getEditor(); return window.getEditor();
} }
});
menuEditUndo.requireEnabled();
menuEditUndo.click();
assertEquals(previousText, jEditTextArea.getText());
menuEditUndo.requireDisabled();
GuiActionRunner.execute(new GuiQuery<Frame>() {
protected Frame executeInEDT() {
window.getEditor().getCurrentTab().handleIndentOutdent(true);
return window.getEditor();
}
}); });
menuEditUndo.requireEnabled(); menuEditUndo.requireEnabled();