Skip to content

Replace mode when closing bracket #6124

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

Open
nikpappas wants to merge 4 commits into
base: master
Choose a base branch
from
+40 −3
Open

Replace mode when closing bracket #6124

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94541d1
Merge pull request #1 from processing/master
nikpappas Mar 2, 2019
a5a9484
Merge pull request #2 from processing/master
nikpappas Mar 17, 2019
5a51039
Merge pull request #3 from processing/master
nikpappas Nov 25, 2020
754cbf5
Move care when closing matching bracket
nikpappas Nov 25, 2020
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
43 changes: 40 additions & 3 deletions app/src/processing/app/syntax/InputHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,9 +1090,16 @@ public void actionPerformed(ActionEvent evt) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < repeatCount; i++)
sb.append(str);
if (Preferences.getBoolean("editor.completion.auto_close") &&
hasBracketsAndQuotes(str)) {
matchBracketsAndQuotes(str, evt, textArea, sb);
if (Preferences.getBoolean("editor.completion.auto_close")) {
if(hasClosingBracketsAndQuotes(str) &&
isNextCharEqual(str, textArea) &&
isPrevCharEquivalentOpeningBracketOrQuote(str, textArea)) {
textArea.setCaretPosition(textArea.getCaretPosition() + 1);
} else if(hasBracketsAndQuotes(str)){
matchBracketsAndQuotes(str, evt, textArea, sb);
} else{
textArea.overwriteSetSelectedText(sb.toString());
}
} else {
textArea.overwriteSetSelectedText(sb.toString());
}
Expand All @@ -1116,6 +1123,36 @@ private boolean hasBracketsAndQuotes(String str) {
}
return false;
}

private boolean isNextCharEqual(String str, JEditTextArea textArea){
int caretPosition = textArea.getCaretPosition();
return textArea.getText().length() > caretPosition &&
str.length() == 1 &&
textArea.getText().charAt(caretPosition) == str.charAt(0);

}

private boolean isPrevCharEquivalentOpeningBracketOrQuote(String str, JEditTextArea textArea){
int caretPosition = textArea.getCaretPosition();
if(textArea.getText().length() < caretPosition) return false;
String prevChar = String.valueOf(textArea.getText().charAt(caretPosition - 1));
for (String item : bracketsAndQuotesMap.keys()) {
if (prevChar.equals(item) && bracketsAndQuotesMap.get(prevChar).equals(str)) {
return true;
}
}
return false;
}


private boolean hasClosingBracketsAndQuotes(String str) {
for (String item : bracketsAndQuotesMap.values()) {
if (str.equals(item)) {
return true;
}
}
return false;
}
}


Expand Down