Skip to content

Fix nextTab/prevTab selection logic #5383

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 5 commits into from
Sep 20, 2016
Merged

Fix nextTab/prevTab selection logic #5383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c927237
Fix tab order in FindReplace
matthijskooijman Sep 19, 2016
9723726
Call ensureOffsetNotInClosedFold only when a match is found
cmaglie Sep 20, 2016
47fcff7
Simplify FindReplace.find() logic (part 1)
cmaglie Sep 20, 2016
c5a6a44
Simplify FindReplace.find() logic (part 2)
cmaglie Sep 20, 2016
1efa07f
Enable visibility of selection on find
cmaglie Sep 20, 2016
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: 8 additions & 15 deletions app/src/cc/arduino/view/findreplace/FindReplace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import processing.app.Base;
import processing.app.Editor;
import processing.app.EditorTab;
import processing.app.helpers.OSUtils;

import java.awt.*;
Expand Down Expand Up @@ -284,7 +285,6 @@ private void replaceAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//
// End of variables declaration//GEN-END:variables

private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int originTab) {
boolean wrapNeeded = false;
String search = findField.getText();

if (search.length() == 0) {
Expand All @@ -304,10 +304,6 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
int selectionEnd = editor.getCurrentTab().getSelectionStop();

nextIndex = text.indexOf(search, selectionEnd);
if (wrap && nextIndex == -1) {
// if wrapping, a second chance is ok, start from beginning
wrapNeeded = true;
}
} else {
// int selectionStart = editor.textarea.getSelectionStart();
int selectionStart = editor.getCurrentTab().getSelectionStart() - 1;
Expand All @@ -317,14 +313,8 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
} else {
nextIndex = -1;
}
if (wrap && nextIndex == -1) {
// if wrapping, a second chance is ok, start from the end
wrapNeeded = true;
}
}

editor.getCurrentTab().getTextArea().getFoldManager().ensureOffsetNotInClosedFold(nextIndex);

if (nextIndex == -1) {
// Nothing found on this tab: Search other tabs if required
if (searchTabs) {
Expand All @@ -345,12 +335,12 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
}

if (backwards) {
editor.selectNextTab();
editor.selectPrevTab();
this.setVisible(true);
int l = editor.getCurrentTab().getText().length() - 1;
editor.getCurrentTab().setSelection(l, l);
} else {
editor.selectPrevTab();
editor.selectNextTab();
this.setVisible(true);
editor.getCurrentTab().setSelection(0, 0);
}
Expand All @@ -360,13 +350,16 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
}
}

if (wrapNeeded) {
if (wrap) {
nextIndex = backwards ? text.lastIndexOf(search) : text.indexOf(search, 0);
}
}

if (nextIndex != -1) {
editor.getCurrentTab().setSelection(nextIndex, nextIndex + search.length());
EditorTab currentTab = editor.getCurrentTab();
currentTab.getTextArea().getFoldManager().ensureOffsetNotInClosedFold(nextIndex);
currentTab.setSelection(nextIndex, nextIndex + search.length());
currentTab.getTextArea().getCaret().setSelectionVisible(true);
return true;
}

Expand Down
1 change: 0 additions & 1 deletion app/src/processing/app/EditorTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ private SketchTextArea createTextArea(RSyntaxDocument document)

editor.lineStatus.set(lineStart, lineEnd);
});

ToolTipManager.sharedInstance().registerComponent(textArea);

configurePopupMenu(textArea);
Expand Down