Allow regex in / search #627

ascandella · 2016-08-19T14:53:42Z

Fixes #572

johnfn · 2016-08-22T05:24:23Z

My big concern is I'm not quite sure how well Vim regexp maps to JS regexp. Would you mind doing a little research to see if it is a fairly close mapping or not?

ascandella · 2016-08-22T05:25:32Z

Sounds good. Hopefully they're close...

johnfn · 2016-08-22T05:27:20Z

I hope so too. Or close enough that you can use a meta regex to translate the normal regex to a js re... oh god, what am I saying?

rebornix · 2016-08-22T08:00:03Z

@sectioneight the regex we use here is the same as Vim Substitution

Vim/src/cmd_line/commands/substitute.ts

Line 64 in 7ac106d

let jsRegexFlags = "";

. The catch about Regex is no one is following the standard (if there is a standard).

For now I'm using JS's regex in substitution, I'm not quite sure if ppl are satisfied with it but I don't see any complains yet (maybe they don't notice its existence yet).

You may want to write some JS regex to translate Vim's regex to JS's regex ...

ascandella · 2016-08-22T17:35:54Z

Yes, I've found:

https://github.com/othree/eregex.vim/blob/master/plugin/eregex.vim

To translate Vim regex to PCRE, but of course JS is not PCRE.

There's also https://en.wikipedia.org/wiki/Comparison_of_regular_expression_engines but it's pretty high level.

Sounds like a good first pass would be to use JS regex for search. But I'm open to suggestions.

johnfn · 2016-08-22T17:38:46Z

Yiiiikes. If it's too complicated, let's just do JS regex for now and see if anyone complains. 😉

rebornix · 2016-08-25T23:02:19Z

This PR is good to go IMO.

johnfn · 2016-08-26T00:17:05Z

It still says WIP on it - @sectioneight is this good to go?

ascandella · 2016-08-26T01:54:17Z

Still need to add a test or two, but it sounds like you guys approve of the approach.

johnfn · 2016-08-26T05:35:00Z

I do; I'm very much a fan of 80% solutions, especially when people very rarely use the other 20%. Ping me when it's good to go. :)

ascandella · 2016-08-26T06:25:07Z

As am I. Will get some tests in tomorrow and ping you for review.
On Thu, Aug 25, 2016 at 10:35 PM Grant Mathews [email protected]
wrote:

I do; I'm very much a fan of 80% solutions, especially when people very
rarely use the other 20%.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#627 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAF7PwxoDZRo1_dE7y_86vz1fYnKPNKJks5qjnsGgaJpZM4JojVl
.

ascandella · 2016-08-26T18:12:49Z

Ok, ready for review @johnfn

johnfn · 2016-08-26T18:31:44Z

src/actions/actions.ts

@@ -782,7 +782,7 @@ export class CommandSearchForwards extends BaseCommand {
  isMotion = true;

  public async exec(position: Position, vimState: VimState): Promise<VimState> {
-    vimState.searchState = new SearchState(SearchDirection.Forward, vimState.cursorPosition);
+    vimState.searchState = new SearchState(SearchDirection.Forward, vimState.cursorPosition, "", true);


Minor, but I'm trying to move towards a style where we explicitly name all our boolean arguments. Something like { isRegex: true } is what I'm thinking here.

Sounds good.

johnfn · 2016-08-26T18:32:17Z

Only one small comment.

I think this PR is going to have a big impact for such a small LOC difference! :)

ascandella · 2016-08-26T18:56:45Z

I'm going to update one more thing on this PR. Right now if you have a partial regex (e.g. /a() it throws an error in the console. I need to try/catch the SyntaxError and just do a plain match if it doesn't compile.

ascandella · 2016-08-26T20:45:32Z

src/mode/modeHandler.ts

@@ -280,10 +295,11 @@ export class SearchState {
    }
  }

-  constructor(direction: SearchDirection, startPosition: Position, searchString = "") {
+  constructor(direction: SearchDirection, startPosition: Position, searchString = "", { isRegex = false } = {}) {


I'm not really sure about this syntax (still a TS noob). Is this what you were thinking?

Yeah, that looks fine to me!

ascandella · 2016-08-26T23:51:02Z

OK, I think we're finally ready to go here

ascandella · 2016-08-28T19:06:49Z

Ping for review

johnfn · 2016-08-28T19:17:02Z

src/mode/modeHandler.ts

-      const regex = new RegExp(search.replace(SearchState.specialCharactersRegex, "\\$&"), ignorecase ? 'gi' : 'g');
+      let searchRE = search;
+      if (!this.isRegex) {
+        searchRE = search.replace(SearchState.specialCharactersRegex, "\\$&");


This is very cool. I never knew about $&.

johnfn · 2016-08-28T19:19:57Z

Thanks for the ping. Feel free to ping me on here/slack if I don't review within ~24h. That is almost certainly an indicator that it just slipped through the cracks.

johnfn · 2016-08-28T19:20:18Z

And thanks for the PR, of course :)

shaunluttin · 2017-02-05T19:49:55Z

Does this PR support searching for new lines? If so, how? We've tried:

\r
\n
\n\r
^M

simahao · 2017-04-16T08:31:03Z

@shaunluttin ,i have same problem. :(

johnfn · 2017-04-16T08:40:40Z

No, it doesn't support newline search yet. Feel free to open an issue.

ascandella force-pushed the support-search-regex branch from 7eeb859 to e31a63b Compare August 25, 2016 18:43

ascandella force-pushed the support-search-regex branch from e31a63b to 343779b Compare August 26, 2016 18:11

ascandella changed the title ~~WIP: Allow regex in / search~~ Allow regex in / search Aug 26, 2016

Allow regex in / search

bcaeba6

ascandella force-pushed the support-search-regex branch from 343779b to bcaeba6 Compare August 26, 2016 18:12

johnfn reviewed Aug 26, 2016
View reviewed changes

ascandella added 2 commits August 26, 2016 13:39

Handle invalid regexen

4caac22

Update constructor

273c64a

ascandella reviewed Aug 26, 2016
View reviewed changes

Escape backslash

8f7a868

ascandella and others added 2 commits August 26, 2016 19:50

Also support backwards search

3c581de

Merge branch 'master' into support-search-regex

b1d8ec2

johnfn reviewed Aug 28, 2016
View reviewed changes

johnfn merged commit de982ac into VSCodeVim:master Aug 28, 2016

ascandella deleted the support-search-regex branch August 28, 2016 19:20

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow regex in / search #627

Allow regex in / search #627

ascandella commented Aug 19, 2016 •

edited

Loading

johnfn commented Aug 22, 2016

ascandella commented Aug 22, 2016

johnfn commented Aug 22, 2016

rebornix commented Aug 22, 2016

ascandella commented Aug 22, 2016

johnfn commented Aug 22, 2016

rebornix commented Aug 25, 2016

johnfn commented Aug 26, 2016

ascandella commented Aug 26, 2016

johnfn commented Aug 26, 2016 •

edited

Loading

ascandella commented Aug 26, 2016

ascandella commented Aug 26, 2016

johnfn Aug 26, 2016

ascandella Aug 26, 2016

johnfn commented Aug 26, 2016

ascandella commented Aug 26, 2016

ascandella Aug 26, 2016

johnfn Aug 26, 2016

ascandella commented Aug 26, 2016

ascandella commented Aug 28, 2016

johnfn Aug 28, 2016

johnfn commented Aug 28, 2016

johnfn commented Aug 28, 2016

shaunluttin commented Feb 5, 2017 •

edited

Loading

simahao commented Apr 16, 2017

johnfn commented Apr 16, 2017

Allow regex in / search #627

Allow regex in / search #627

Conversation

ascandella commented Aug 19, 2016 • edited Loading

johnfn commented Aug 22, 2016

ascandella commented Aug 22, 2016

johnfn commented Aug 22, 2016

rebornix commented Aug 22, 2016

ascandella commented Aug 22, 2016

johnfn commented Aug 22, 2016

rebornix commented Aug 25, 2016

johnfn commented Aug 26, 2016

ascandella commented Aug 26, 2016

johnfn commented Aug 26, 2016 • edited Loading

ascandella commented Aug 26, 2016

ascandella commented Aug 26, 2016

johnfn Aug 26, 2016

Choose a reason for hiding this comment

ascandella Aug 26, 2016

Choose a reason for hiding this comment

johnfn commented Aug 26, 2016

ascandella commented Aug 26, 2016

ascandella Aug 26, 2016

Choose a reason for hiding this comment

johnfn Aug 26, 2016

Choose a reason for hiding this comment

ascandella commented Aug 26, 2016

ascandella commented Aug 28, 2016

johnfn Aug 28, 2016

Choose a reason for hiding this comment

johnfn commented Aug 28, 2016

johnfn commented Aug 28, 2016

shaunluttin commented Feb 5, 2017 • edited Loading

simahao commented Apr 16, 2017

johnfn commented Apr 16, 2017

ascandella commented Aug 19, 2016 •

edited

Loading

johnfn commented Aug 26, 2016 •

edited

Loading

shaunluttin commented Feb 5, 2017 •

edited

Loading