-
Notifications
You must be signed in to change notification settings - Fork 188
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.
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
Improved Regex handeling when searching #2373
Improved Regex handeling when searching #2373
Conversation
3e5dbbb
to
93f7f83
Compare
93f7f83
to
eb8bef5
Compare
bundles/org.eclipse.ui/src/org/eclipse/ui/internal/SearchDecoration.java
Outdated
Show resolved
Hide resolved
@@ -24,6 +24,7 @@ | |||
* The plug-in class for the org.eclipse.ui plug-in. | |||
* This class is internal to the workbench and should not be | |||
* referenced by clients. | |||
* @since 3.207 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert this change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
*/ | ||
|
||
/** | ||
* | ||
* @since 3.207 | ||
* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
eb8bef5
to
b6afc55
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jannisCode thank you for the contribution. I made some comments regarding coding style and naming conventions.
I haven't tested it yet, I can do it once the PR is ready to be reviewed.
bundles/org.eclipse.ui/src/org/eclipse/ui/internal/SearchDecoration.java
Outdated
Show resolved
Hide resolved
...kbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
Outdated
Show resolved
Hide resolved
...kbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
Outdated
Show resolved
Hide resolved
...les/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java
Outdated
Show resolved
Hide resolved
...les/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java
Outdated
Show resolved
Hide resolved
...kbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
Outdated
Show resolved
Hide resolved
bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java
Outdated
Show resolved
Hide resolved
bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java
Outdated
Show resolved
Hide resolved
...les/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java
Outdated
Show resolved
Hide resolved
bundles/org.eclipse.ui/src/org/eclipse/ui/internal/UIPreferenceInitializer.java
Outdated
Show resolved
Hide resolved
3b530e1
to
fe4eb3a
Compare
bundles/org.eclipse.ui/src/org/eclipse/ui/internal/SearchDecoration.java
Outdated
Show resolved
Hide resolved
...les/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java
Outdated
Show resolved
Hide resolved
...les/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java
Outdated
Show resolved
Hide resolved
...kbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the screenshot looks nice
d00c824
to
a6ff1a3
Compare
bundles/org.eclipse.ui/src/org/eclipse/ui/internal/SearchDecoration.java
Outdated
Show resolved
Hide resolved
e65493d
to
c50dfae
Compare
c50dfae
to
a0eee8a
Compare
08000ed
to
1ce32d5
Compare
d2e5a25
to
6651eaa
Compare
This looks like a promising change. I wonder
It would be nice if you could provide 1) as a follow-up PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks better but I found one change in AbstractTreeViewer
that doesn't belong here and I have another question regarding some removed invocations of evaluateFindReplaceStatus
(which was renamed to decorate
). Maybe the latter is the reason why @Wittmaxi asks for integration with the new find & replace overlay? I remember testing the previous version of this PR and the f&r overlay was working exactly as the other searches i.e. it was integrated before.
I haven't tested again, I will do it later today.
bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java
Outdated
Show resolved
Hide resolved
bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java
Outdated
Show resolved
Hide resolved
...les/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java
Show resolved
Hide resolved
bdf702c
to
6b0e632
Compare
...kbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
Outdated
Show resolved
Hide resolved
6b0e632
to
91762a5
Compare
After testing, the behavior looks almost OK, I have only 1 finding (read further): What worksThe expression is validated in all 3 requested places: The findingIt would be better if the f&r dialog deactivates all of the buttons below once the regex is found invalid, just like the Search dialog ( @Wittmaxi please test it too and let us know if you have any findings. Also, please elaborate on your request:
I see the behavior already in it, maybe you meant something else by "incorporated" (it's a ambiguous term). w.r.t. your other request:
I also saw it and the solution is to "merely" adapting the (old) method |
@jannisCode there are conflicts that need to be resolved. |
@jannisCode remove the "merge" commit Better to rebase on top of Since the "committer" is GitHub, I assume it was done by clicking "Update Branch" in this PR? |
The changes in AbstractTreeViewer were reverted
31fefe3
to
b14bc4d
Compare
EDIT 2: you did it while I was writing the comment ✔️ ✔️ ✔️ |
The failing tests are unrelated --> eclipse-platform/eclipse.platform.swt#1518 Let's wait until the I-Build is done and re-trigger the checks to make sure nothing broke. |
b14bc4d
to
7c942ca
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ignoring random test failure #1941
@jannisCode please create a N&N entry
What it does
This PR improves the handeling of the Regex search when searching in the new or old find/replace dialog or the Big Search (strg+h). This is regarding #1204
Before
After
while typing:
when hovering:
Additionally to the functional changes the new class helps with reusing the code that handles the regex search.