Skip to content

Fix indent and un-indent keyboard shortcuts on OS X. #4327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 23, 2015
Merged

Fix indent and un-indent keyboard shortcuts on OS X. #4327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05be148
Fix issue #3502: behavior of Cmd+[ and Cmd+] on Mac OS X.
damellis Dec 22, 2015
07903b8
Use new IncreaseIndentAction for Edit > Increase Indent.
damellis Dec 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions app/src/processing/app/Editor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import processing.app.syntax.ArduinoTokenMakerFactory;
import processing.app.syntax.PdeKeywords;
import processing.app.syntax.SketchTextArea;
import processing.app.syntax.SketchTextAreaEditorKit;
import processing.app.tools.DiscourseFormat;
import processing.app.tools.MenuScroller;
import processing.app.tools.Tool;
Expand Down Expand Up @@ -1866,28 +1867,8 @@ void handleCommentUncomment() {

private void handleIndentOutdent(boolean indent) {
if (indent) {

int caretPosition = textarea.getCaretPosition();
boolean noSelec = !textarea.isSelectionActive();

// if no selection, focus on first char.
if (noSelec) {
try {
int line = textarea.getCaretLineNumber();
int startOffset = textarea.getLineStartOffset(line);
textarea.setCaretPosition(startOffset);
} catch (BadLocationException e) {
}
}

// Insert Tab or Spaces..
Action action = textarea.getActionMap().get(RSyntaxTextAreaEditorKit.insertTabAction);
Action action = textarea.getActionMap().get(SketchTextAreaEditorKit.rtaIncreaseIndentAction);
action.actionPerformed(null);

if (noSelec) {
textarea.setCaretPosition(caretPosition);
}

} else {
Action action = textarea.getActionMap().get(RSyntaxTextAreaEditorKit.rstaDecreaseIndentAction);
action.actionPerformed(null);
Expand Down
4 changes: 2 additions & 2 deletions app/src/processing/app/syntax/SketchTextAreaDefaultInputMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public SketchTextAreaDefaultInputMap() {

remove(KeyStroke.getKeyStroke(KeyEvent.VK_J, defaultModifier));

put(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, defaultModifier), DefaultEditorKit.insertTabAction);
put(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, defaultModifier), RSyntaxTextAreaEditorKit.rstaDecreaseIndentAction);
put(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, defaultModifier), RSyntaxTextAreaEditorKit.rstaDecreaseIndentAction);
put(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, defaultModifier), SketchTextAreaEditorKit.rtaIncreaseIndentAction);

put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, defaultModifier | shift), DefaultEditorKit.selectionBeginAction);
put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, defaultModifier | shift), DefaultEditorKit.selectionEndAction);
Expand Down
35 changes: 35 additions & 0 deletions app/src/processing/app/syntax/SketchTextAreaEditorKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ public class SketchTextAreaEditorKit extends RSyntaxTextAreaEditorKit {

public static final String rtaDeleteNextWordAction = "RTA.DeleteNextWordAction";
public static final String rtaDeleteLineToCursorAction = "RTA.DeleteLineToCursorAction";
public static final String rtaIncreaseIndentAction = "RTA.IncreaseIndentAction";

private static final Action[] defaultActions = {
new DeleteNextWordAction(),
new DeleteLineToCursorAction(),
new IncreaseIndentAction(),
new SelectWholeLineAction(),
new ToggleCommentAction()
};
Expand Down Expand Up @@ -103,6 +105,39 @@ public String getMacroID() {

}

/**
* Increases the indent of the selected or current line(s).
*/
public static class IncreaseIndentAction extends RSyntaxTextAreaEditorKit.InsertTabAction {

public IncreaseIndentAction() {
super(rtaIncreaseIndentAction);
}

@Override
public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
int caretPosition = textArea.getCaretPosition();
boolean noSelec = textArea.getSelectedText() == null;

// if no selection, focus on first char.
if (noSelec) {
try {
int line = textArea.getCaretLineNumber();
int startOffset = textArea.getLineStartOffset(line);
textArea.setCaretPosition(startOffset);
} catch (BadLocationException ex) {
}
}

// Insert Tab or Spaces..
super.actionPerformedImpl(e, textArea);

if (noSelec) {
textArea.setCaretPosition(caretPosition + (textArea.getTabsEmulated() ? textArea.getTabSize() : 1));
}
}
}

/**
* Selects the line around the caret.
*/
Expand Down