Regex

.gitignore

@@ -23,6 +23,7 @@
 
 # Generated by gradle task "generateGrammarSource"
 src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated
+vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
 # Generated JSONs for lazy classloading
 /vim-engine/src/main/resources/ksp-generated
 /src/main/resources/ksp-generated

src/main/java/com/maddyhome/idea/vim/extension/multiplecursors/VimMultipleCursorsExtension.kt

@@ -246,7 +246,7 @@ internal class VimMultipleCursorsExtension : VimExtension {
 
       // Note that ignoreCase is not overridden by the `\C` in the pattern
       val pattern = makePattern(text, whole)
-      val matches = SearchHelper.findAll(editor, pattern, 0, -1, false)
+      val matches = injector.searchHelper.findAll(IjVimEditor(editor), pattern, 0, -1, false)
       for (match in matches) {
         if (match.contains(primaryCaret.offset)) {
           primaryCaret.vim.moveToOffset(match.startOffset)
@@ -322,7 +322,7 @@ internal class VimMultipleCursorsExtension : VimExtension {
       searchOptions.add(SearchOptions.WRAP)
     }
 
-    return SearchHelper.findPattern(editor, makePattern(text, whole), startOffset, 1, searchOptions)?.startOffset ?: -1
+    return injector.searchHelper.findPattern(IjVimEditor(editor), makePattern(text, whole), startOffset, 1, searchOptions)?.startOffset ?: -1
   }
 
   private fun makePattern(text: String, whole: Boolean): String {

src/main/java/com/maddyhome/idea/vim/group/IjOptionProperties.kt

@@ -35,6 +35,9 @@ public open class GlobalIjOptions(scope: OptionAccessScope) : OptionsPropertiesB
   public var oldundo: Boolean by optionProperty(IjOptions.oldundo)
   public var unifyjumps: Boolean by optionProperty(IjOptions.unifyjumps)
   public var exCommandAnnotation: Boolean by optionProperty(IjOptions.exCommandAnnotation)
+  public var vimscriptFunctionAnnotation: Boolean by optionProperty(IjOptions.vimscriptFunctionAnnotation)
+  public var commandOrMotionAnnotation: Boolean by optionProperty(IjOptions.commandOrMotionAnnotation)
+  public var useNewRegex: Boolean by optionProperty(IjOptions.useNewRegex)
 }
 
 /**

src/main/java/com/maddyhome/idea/vim/group/IjOptions.kt

@@ -84,7 +84,10 @@ public object IjOptions {
   public val unifyjumps: ToggleOption = addOption(ToggleOption("unifyjumps", GLOBAL, "unifyjumps", true))
   public val visualdelay: UnsignedNumberOption = addOption(UnsignedNumberOption("visualdelay", GLOBAL, "visualdelay", 100))
   public val oldundo: ToggleOption = addOption(ToggleOption("oldundo", GLOBAL, "oldundo", false, isTemporary = true))
+  public val vimscriptFunctionAnnotation: ToggleOption = addOption(ToggleOption("vimscriptfunctionannotation", GLOBAL, "vimscriptfunctionannotation", true, isTemporary = true))
+  public val commandOrMotionAnnotation: ToggleOption = addOption(ToggleOption("commandormotionannotation", GLOBAL, "commandormotionannotation", true, isTemporary = true))
   public val showmodewidget: ToggleOption = addOption(ToggleOption("showmodewidget", GLOBAL, "showmodewidget", false, isTemporary = true))
+  public val useNewRegex: ToggleOption = addOption(ToggleOption("usenewregex", GLOBAL, "usenewregex", true, isTemporary = true))
 
   // This needs to be Option<out VimDataType> so that it can work with derived option types, such as NumberOption, which
   // derives from Option<VimInt>

src/main/java/com/maddyhome/idea/vim/group/ProcessGroup.kt

@@ -51,6 +51,8 @@ import javax.swing.SwingUtilities
 public class ProcessGroup : VimProcessGroupBase() {
   override var lastCommand: String? = null
     private set
+  override var isCommandProcessing: Boolean = false
+  override var modeBeforeCommandProcessing: Mode? = null
 
   public override fun startSearchCommand(editor: VimEditor, context: ExecutionContext, count: Int, leader: Char) {
     // Don't allow searching in one line editors
@@ -79,6 +81,8 @@ public class ProcessGroup : VimProcessGroupBase() {
       "Cannot enable cmd mode from current mode $currentMode"
     }
 
+    isCommandProcessing = true
+    modeBeforeCommandProcessing = currentMode
     val initText = getRange(editor, cmd)
     injector.markService.setVisualSelectionMarks(editor)
     editor.vimStateMachine.mode = Mode.CMD_LINE(currentMode)
@@ -134,6 +138,9 @@ public class ProcessGroup : VimProcessGroupBase() {
       logger.error(bad)
       VimPlugin.indicateError()
       res = false
+    } finally {
+      isCommandProcessing = false
+      modeBeforeCommandProcessing = null
     }
 
     return res

src/main/java/com/maddyhome/idea/vim/helper/SearchHelper.java

@@ -23,15 +23,15 @@
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.api.EngineEditorHelperKt;
 import com.maddyhome.idea.vim.api.VimEditor;
+import com.maddyhome.idea.vim.regexp.*;
+import com.maddyhome.idea.vim.regexp.match.VimMatchResult;
 import com.maddyhome.idea.vim.state.mode.Mode;
 import com.maddyhome.idea.vim.state.VimStateMachine;
 import com.maddyhome.idea.vim.common.CharacterPosition;
 import com.maddyhome.idea.vim.common.Direction;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.newapi.IjVimCaret;
 import com.maddyhome.idea.vim.newapi.IjVimEditor;
-import com.maddyhome.idea.vim.regexp.CharPointer;
-import com.maddyhome.idea.vim.regexp.RegExp;
 import kotlin.Pair;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -42,10 +42,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
-import static com.maddyhome.idea.vim.api.VimInjectorKt.options;
+import static com.maddyhome.idea.vim.api.VimInjectorKt.*;
 import static com.maddyhome.idea.vim.helper.SearchHelperKtKt.checkInString;
 import static com.maddyhome.idea.vim.helper.SearchHelperKtKt.shouldIgnoreCase;
+import static com.maddyhome.idea.vim.newapi.IjVimInjectorKt.globalIjOptions;
 
 /**
  * Helper methods for searching text
@@ -59,6 +59,8 @@ public static String makeSearchPattern(String pattern, Boolean whole) {
   /**
    * Find text matching the given pattern.
    *
+   * @deprecated Use IjVimSearchHelper.findPattern instead
+   *
    * <p>See search.c:searchit</p>
    *
    * @param editor          The editor to search in
@@ -69,12 +71,13 @@ public static String makeSearchPattern(String pattern, Boolean whole) {
    * @return                A TextRange representing the result, or null
    */
   @Nullable
+  @Deprecated
   public static TextRange findPattern(@NotNull Editor editor,
                                       @Nullable String pattern,
                                       int startOffset,
                                       int count,
                                       EnumSet<SearchOptions> searchOptions) {
-    if (pattern == null || pattern.length() == 0) {
+    if (pattern == null || pattern.isEmpty()) {
       logger.warn("Pattern is null or empty. Cannot perform search");
       return null;
     }
@@ -347,19 +350,42 @@ else if (lnum <= 0) {
   /**
    * Find all occurrences of the pattern.
    *
+   * @deprecated Use IjVimSearchHelper.findall instead
+   *
    * @param editor      The editor to search in
    * @param pattern     The pattern to search for
    * @param startLine   The start line of the range to search for
    * @param endLine     The end line of the range to search for, or -1 for the whole document
    * @param ignoreCase  Case sensitive or insensitive searching
    * @return            A list of TextRange objects representing the results
    */
+  @Deprecated
   public static @NotNull List<TextRange> findAll(@NotNull Editor editor,
                                                  @NotNull String pattern,
                                                  int startLine,
                                                  int endLine,
                                                  boolean ignoreCase) {
     final List<TextRange> results = Lists.newArrayList();
+
+    if (globalIjOptions(injector).getUseNewRegex()) {
+      final List<VimRegexOptions> options = new ArrayList<>();
+      if (globalOptions(injector).getSmartcase()) options.add(VimRegexOptions.SMART_CASE);
+      if (globalOptions(injector).getIgnorecase()) options.add(VimRegexOptions.IGNORE_CASE);
+      VimEditor vimEditor = new IjVimEditor(editor);
+      try {
+        // TODO: we shouldn't care about the ignoreCase argument, and instead just look into the editor options.
+        // It would require a refactor, so for now prepend \c or \C to "force" ignoreCase
+        String newPattern = (ignoreCase ? "\\c" : "\\C") + pattern;
+        VimRegex regex = new VimRegex(newPattern);
+        List<VimMatchResult.Success> foundMatches = regex.findAll(vimEditor, vimEditor.getLineStartOffset(startLine), vimEditor.getLineEndOffset(endLine == -1 ? vimEditor.lineCount() - 1 : endLine) + 1, options);
+        for (VimMatchResult.Success match : foundMatches) results.add(match.getRange());
+        return results;
+      } catch (VimRegexException e) {
+        injector.getMessages().showStatusBarMessage(vimEditor, e.getMessage());
+        return results;
+      }
+    }
+
     final int lineCount = new IjVimEditor(editor).lineCount();
     final int actualEndLine = endLine == -1 ? lineCount - 1 : endLine;
 
@@ -402,6 +428,10 @@ else if (lnum <= 0) {
     return results;
   }
 
+  /**
+   * @deprecated Use IjVimSearchHelper.findSection instead
+   */
+  @Deprecated
   public static int findSection(@NotNull Editor editor, @NotNull Caret caret, char type, int dir, int count) {
     CharSequence chars = editor.getDocument().getCharsSequence();
     int line = caret.getLogicalPosition().line + dir;
@@ -428,6 +458,10 @@ public static int findSection(@NotNull Editor editor, @NotNull Caret caret, char
     return res;
   }
 
+  /**
+   * @deprecated Use IjVimSearchHelper.findUnmatchedBlock instead
+   */
+  @Deprecated
   public static int findUnmatchedBlock(@NotNull Editor editor, @NotNull Caret caret, char type, int count) {
     CharSequence chars = editor.getDocument().getCharsSequence();
     int pos = caret.getOffset();
@@ -447,6 +481,8 @@ public static int findUnmatchedBlock(@NotNull Editor editor, @NotNull Caret care
   /**
    * Find block enclosing the caret
    *
+   * @deprecated Use IjVimSearchHelper.findBlockRange instead
+   *
    * @param editor  The editor to search in
    * @param caret   The caret currently at
    * @param type    The type of block, e.g. (, [, {, <
@@ -798,6 +834,10 @@ private static int ignoreWhitespaceAtLineStart(CharSequence seq, int lineStart,
   }
 
 
+  /**
+   * @deprecated Use IjVimSearchHelper.findBlockTagRange instead
+   */
+  @Deprecated
   public static @Nullable TextRange findBlockTagRange(@NotNull Editor editor,
                                                       @NotNull Caret caret,
                                                       int count,
@@ -1330,6 +1370,10 @@ else if (hex && ((ch >= '0' && ch <= '9') || "abcdefABCDEF".indexOf(ch) >= 0)) {
     return new TextRange(start, end);
   }
 
+  /**
+   * @deprecated Use IjVimSearchHelper.findWordUnderCursor instead
+   */
+  @Deprecated
   @Contract("_, _, _, _, _, _, _ -> new")
   public static @NotNull TextRange findWordUnderCursor(@NotNull Editor editor,
                                                        @NotNull Caret caret,
@@ -1515,10 +1559,16 @@ public static int findNextCharacterOnLine(@NotNull Editor editor, @NotNull Caret
     }
   }
 
+  /**
+   * @deprecated Use IjVimSearchHelper.findMethodStart instead
+   */
   public static int findMethodStart(@NotNull Editor editor, @NotNull Caret caret, int count) {
     return PsiHelper.findMethodStart(editor, caret.getOffset(), count);
   }
 
+  /**
+   * @deprecated Use IjVimSearchHelper.findMethodEnd instead
+   */
   public static int findMethodEnd(@NotNull Editor editor, @NotNull Caret caret, int count) {
     return PsiHelper.findMethodEnd(editor, caret.getOffset(), count);
   }

src/main/java/com/maddyhome/idea/vim/helper/SearchHighlightsHelper.kt

@@ -26,6 +26,7 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.options
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.ex.ranges.LineRange
+import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.vim
 import org.jetbrains.annotations.Contract
 import java.awt.Color
@@ -105,7 +106,7 @@ private fun updateSearchHighlights(
         val startLine = searchRange?.startLine ?: 0
         val endLine = searchRange?.endLine ?: -1
         val results =
-          SearchHelper.findAll(editor, pattern, startLine, endLine, shouldIgnoreCase(pattern, shouldIgnoreSmartCase))
+          injector.searchHelper.findAll(IjVimEditor(editor), pattern, startLine, endLine, shouldIgnoreCase(pattern, shouldIgnoreSmartCase))
         if (results.isNotEmpty()) {
           currentMatchOffset = findClosestMatch(editor, results, initialOffset, forwards)
           highlightSearchResults(editor, pattern, results, currentMatchOffset)
@@ -119,7 +120,7 @@ private fun updateSearchHighlights(
         }
         if (shouldIgnoreSmartCase) searchOptions.add(SearchOptions.IGNORE_SMARTCASE)
         if (!forwards) searchOptions.add(SearchOptions.BACKWARDS)
-        val result = SearchHelper.findPattern(editor, pattern, initialOffset, 1, searchOptions)
+        val result = injector.searchHelper.findPattern(IjVimEditor(editor), pattern, initialOffset, 1, searchOptions)
         if (result != null) {
           currentMatchOffset = result.startOffset
           val results = listOf(result)

src/main/java/com/maddyhome/idea/vim/listener/VimListenerManager.kt

@@ -307,7 +307,7 @@ internal object VimListenerManager {
       if (VimPlugin.isNotEnabled()) return
       MotionGroup.fileEditorManagerSelectionChangedCallback(event)
       FileGroup.fileEditorManagerSelectionChangedCallback(event)
-      SearchGroup.fileEditorManagerSelectionChangedCallback(event)
+      VimPlugin.getSearch().fileEditorManagerSelectionChangedCallback(event)
       OptionGroup.fileEditorManagerSelectionChangedCallback(event)
     }
   }