Skip to content
This repository
Browse code

Fix '*' and '#' when regexsearch is enabled.

  • Loading branch information...
commit 2a1d2086faaf3dbc33255493cee2492ec1a7ea6d 1 parent f516e28
keforbes authored July 30, 2012
4  net.sourceforge.vrapper.core/src/net/sourceforge/vrapper/vim/modes/commandline/SearchCommandParser.java
@@ -47,7 +47,9 @@ public static Search createSearch(EditorAdaptor editor, String keyword, boolean
47 47
         boolean caseSensitive = ! editor.getConfiguration().get(Options.IGNORE_CASE)
48 48
             || (editor.getConfiguration().get(Options.SMART_CASE)
49 49
                 && StringUtils.containsUppercase(keyword));
50  
-        boolean useRegExp = editor.getConfiguration().get(Options.SEARCH_REGEX);
  50
+        //can't mix wholeWord and regex search, Eclipse chokes
  51
+        //(if we're searching for wholeWord it isn't a regex anyway)
  52
+        boolean useRegExp = !wholeWord && editor.getConfiguration().get(Options.SEARCH_REGEX);
51 53
         if (offset == null) {
52 54
             // Sanity checking. Passing null is bad style though.
53 55
             offset = SearchOffset.NONE;

0 notes on commit 2a1d208

Please sign in to comment.
Something went wrong with that request. Please try again.