guicursor!

resources/messages/IdeaVimBundle.properties

@@ -72,6 +72,10 @@ e_patnotf2=Pattern not found: {0}
 unkopt=Unknown option: {0}
 e_invarg=Invalid argument: {0}
 E475=E475: Invalid argument: {0}
+E545=E545: Missing colon: {0}
+E546=E546: Illegal mode: {0}
+E548=E548: Digit expected: {0}
+E549=E549: Illegal percentage: {0}
 E774=E774: 'operatorfunc' is empty
 
 action.VimPluginToggle.text=Vim Emulator

src/com/maddyhome/idea/vim/KeyHandler.java

@@ -41,9 +41,7 @@
 import com.maddyhome.idea.vim.action.change.insert.InsertCompletedLiteralAction;
 import com.maddyhome.idea.vim.action.macro.ToggleRecordingAction;
 import com.maddyhome.idea.vim.command.*;
-import com.maddyhome.idea.vim.group.ChangeGroup;
 import com.maddyhome.idea.vim.group.RegisterGroup;
-import com.maddyhome.idea.vim.group.visual.VisualGroupKt;
 import com.maddyhome.idea.vim.handler.ActionBeanClass;
 import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
 import com.maddyhome.idea.vim.helper.*;
@@ -357,7 +355,6 @@ private void handleEditorReset(@NotNull Editor editor, @NotNull KeyStroke key, f
       }
     }
     reset(editor);
-    ChangeGroup.resetCaret(editor, false);
   }
 
   private boolean handleKeyMapping(final @NotNull Editor editor,
@@ -883,7 +880,6 @@ public void fullReset(@NotNull Editor editor) {
     if (registerGroup != null) {
       registerGroup.resetRegister();
     }
-    VisualGroupKt.updateCaretState(editor);
     editor.getSelectionModel().removeSelection();
   }
 
@@ -978,7 +974,6 @@ public void run() {
       if (editorState.getSubMode() == CommandState.SubMode.SINGLE_COMMAND &&
           (!cmd.getFlags().contains(CommandFlags.FLAG_EXPECT_MORE))) {
         editorState.popModes();
-        VisualGroupKt.resetShape(CommandStateHelper.getMode(editor), editor);
       }
 
       if (editorState.getCommandBuilder().isDone()) {

src/com/maddyhome/idea/vim/action/motion/select/SelectToggleVisualMode.kt

@@ -23,7 +23,6 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandState
-import com.maddyhome.idea.vim.group.visual.updateCaretState
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.commandState
 import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
@@ -60,7 +59,6 @@ class SelectToggleVisualMode : VimActionHandler.SingleExecution() {
         }
       }
     }
-    updateCaretState(editor)
     return true
   }
 }

src/com/maddyhome/idea/vim/action/motion/visual/VisualToggleBlockModeAction.kt

@@ -23,14 +23,14 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandState
 import com.maddyhome.idea.vim.handler.VimActionHandler
-import com.maddyhome.idea.vim.option.ListOption
 import com.maddyhome.idea.vim.option.OptionsManager.selectmode
+import com.maddyhome.idea.vim.option.StringListOption
 
 class VisualToggleBlockModeAction : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    val listOption: ListOption = selectmode
+    val listOption: StringListOption = selectmode
     return if (listOption.contains("cmd")) {
       VimPlugin.getVisualMotion().enterSelectMode(editor, CommandState.SubMode.VISUAL_BLOCK)
     } else VimPlugin.getVisualMotion()

src/com/maddyhome/idea/vim/action/motion/visual/VisualToggleCharacterModeAction.kt

@@ -23,14 +23,14 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandState
 import com.maddyhome.idea.vim.handler.VimActionHandler
-import com.maddyhome.idea.vim.option.ListOption
 import com.maddyhome.idea.vim.option.OptionsManager.selectmode
+import com.maddyhome.idea.vim.option.StringListOption
 
 class VisualToggleCharacterModeAction : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    val listOption: ListOption = selectmode
+    val listOption: StringListOption = selectmode
     return if (listOption.contains("cmd")) {
       VimPlugin.getVisualMotion().enterSelectMode(editor, CommandState.SubMode.VISUAL_CHARACTER)
     } else VimPlugin.getVisualMotion()

src/com/maddyhome/idea/vim/command/CommandState.kt

@@ -27,6 +27,8 @@ import com.maddyhome.idea.vim.helper.DigraphSequence
 import com.maddyhome.idea.vim.helper.MessageHelper
 import com.maddyhome.idea.vim.helper.VimNlsSafe
 import com.maddyhome.idea.vim.helper.noneOfEnum
+import com.maddyhome.idea.vim.helper.updateCaretsVisualAttributes
+import com.maddyhome.idea.vim.helper.updateCaretsVisualPosition
 import com.maddyhome.idea.vim.helper.vimCommandState
 import com.maddyhome.idea.vim.key.CommandPartNode
 import com.maddyhome.idea.vim.option.OptionsManager.showmode
@@ -35,17 +37,17 @@ import java.util.*
 import javax.swing.KeyStroke
 
 /**
- * Used to maintain state while entering a Vim command (operator, motion, text object, etc.)
+ * Used to maintain state before and while entering a Vim command (operator, motion, text object, etc.)
  */
-class CommandState private constructor() {
+class CommandState private constructor(private val editor: Editor) {
   val commandBuilder = CommandBuilder(getKeyRootNode(MappingMode.NORMAL))
   private val modeStates = Stack<ModeState>()
   val mappingState = MappingState()
   private val digraphSequence = DigraphSequence()
   var isRecording = false
     set(value) {
       field = value
-      updateStatus()
+      doShowMode()
     }
   var isDotRepeatInProgress = false
 
@@ -78,17 +80,26 @@ class CommandState private constructor() {
 
   fun pushModes(mode: Mode, submode: SubMode) {
     val newModeState = ModeState(mode, submode)
+
     logger.debug("Push new mode state: ${newModeState.toSimpleString()}")
     logger.debug { "Stack of mode states before push: ${toSimpleString()}" }
+
+    val previousMode = currentModeState()
     modeStates.push(newModeState)
     setMappingMode()
-    updateStatus()
+
+    if (previousMode.mode != newModeState.mode) {
+      onModeChanged()
+    }
   }
 
   fun popModes() {
     val popped = modeStates.pop()
     setMappingMode()
-    updateStatus()
+    if (popped.mode != mode) {
+      onModeChanged()
+    }
+
     logger.debug("Popped mode state: ${popped.toSimpleString()}")
     logger.debug { "Stack of mode states after pop: ${toSimpleString()}" }
   }
@@ -107,13 +118,18 @@ class CommandState private constructor() {
 
   private fun resetModes() {
     modeStates.clear()
+    onModeChanged()
     setMappingMode()
   }
 
+  private fun onModeChanged() {
+    editor.updateCaretsVisualAttributes()
+    editor.updateCaretsVisualPosition()
+    doShowMode()
+  }
+
   private fun setMappingMode() {
-    val modeState = currentModeState()
-    val newMappingMode = if (modeState.mode == Mode.OP_PENDING) MappingMode.OP_PENDING else modeToMappingMode(mode)
-    mappingState.mappingMode = newMappingMode
+    mappingState.mappingMode = modeToMappingMode(mode)
   }
 
   @Contract(pure = true)
@@ -124,7 +140,7 @@ class CommandState private constructor() {
       Mode.VISUAL -> MappingMode.VISUAL
       Mode.SELECT -> MappingMode.SELECT
       Mode.CMD_LINE -> MappingMode.CMD_LINE
-      else -> error("Unexpected mode: $mode")
+      Mode.OP_PENDING -> MappingMode.OP_PENDING
     }
   }
 
@@ -137,7 +153,6 @@ class CommandState private constructor() {
       val modeState = currentModeState()
       popModes()
       pushModes(modeState.mode, submode)
-      updateStatus()
     }
 
   fun startDigraphSequence() {
@@ -183,7 +198,6 @@ class CommandState private constructor() {
     resetModes()
     commandBuilder.resetInProgressCommandPart(getKeyRootNode(mappingState.mappingMode))
     digraphSequence.reset()
-    updateStatus()
   }
 
   fun toSimpleString(): String = modeStates.joinToString { it.toSimpleString() }
@@ -262,7 +276,7 @@ class CommandState private constructor() {
     return if (modeStates.size > 0) modeStates.peek() else defaultModeState
   }
 
-  private fun updateStatus() {
+  private fun doShowMode() {
     val msg = StringBuilder()
     if (showmode.isSet) {
       msg.append(getStatusString(modeStates.size - 1))
@@ -334,7 +348,7 @@ class CommandState private constructor() {
     fun getInstance(editor: Editor): CommandState {
       var res = editor.vimCommandState
       if (res == null) {
-        res = CommandState()
+        res = CommandState(editor)
         editor.vimCommandState = res
       }
       return res

src/com/maddyhome/idea/vim/ex/ExExceptions.kt

@@ -17,7 +17,18 @@
  */
 package com.maddyhome.idea.vim.ex
 
-open class ExException(s: String? = null) : Exception(s)
+import com.maddyhome.idea.vim.helper.MessageHelper
+import org.jetbrains.annotations.PropertyKey
+
+open class ExException(s: String? = null) : Exception(s) {
+  var code: String? = null
+    private set
+
+  companion object {
+    fun message(@PropertyKey(resourceBundle = MessageHelper.BUNDLE) code: String, vararg params: Any) =
+      ExException(MessageHelper.message(code, *params)).apply { this.code = code }
+  }
+}
 
 class InvalidCommandException(message: String, cmd: String?) : ExException(message + if (cmd != null) " | $cmd" else "")
 

src/com/maddyhome/idea/vim/group/ChangeGroup.java

@@ -56,15 +56,14 @@
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.ex.ranges.LineRange;
 import com.maddyhome.idea.vim.group.visual.VimSelection;
-import com.maddyhome.idea.vim.group.visual.VisualGroupKt;
 import com.maddyhome.idea.vim.group.visual.VisualModeHelperKt;
 import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
 import com.maddyhome.idea.vim.handler.Motion;
 import com.maddyhome.idea.vim.helper.*;
 import com.maddyhome.idea.vim.listener.SelectionVimListenerSuppressor;
 import com.maddyhome.idea.vim.listener.VimInsertListener;
 import com.maddyhome.idea.vim.listener.VimListenerSuppressor;
-import com.maddyhome.idea.vim.option.BoundListOption;
+import com.maddyhome.idea.vim.option.BoundedStringListOption;
 import com.maddyhome.idea.vim.option.OptionsManager;
 import com.maddyhome.idea.vim.option.StrictMode;
 import kotlin.Pair;
@@ -446,8 +445,6 @@ private void initInsert(@NotNull Editor editor, @NotNull DataContext context, @N
       oldOffset = editor.getCaretModel().getOffset();
       setInsertEditorState(editor, mode == CommandState.Mode.INSERT);
       state.pushModes(mode, CommandState.SubMode.NONE);
-
-      VisualGroupKt.updateCaretState(editor);
     }
 
     notifyListeners(editor);
@@ -550,8 +547,6 @@ public void processEscape(@NotNull Editor editor, @Nullable DataContext context)
 
     CommandState.getInstance(editor).popModes();
     exitAllSingleCommandInsertModes(editor);
-
-    VisualGroupKt.updateCaretState(editor);
   }
 
   /**
@@ -1829,10 +1824,6 @@ private boolean deleteText(final @NotNull Editor editor,
     return false;
   }
 
-  public static void resetCaret(@NotNull Editor editor, boolean insert) {
-    editor.getSettings().setBlockCursor(!insert);
-  }
-
   /**
    * Sort range of text with a given comparator
    *
@@ -1893,7 +1884,7 @@ public boolean changeNumberVisualMode(final @NotNull Editor editor,
                                         @NotNull TextRange selectedRange,
                                         final int count,
                                         boolean avalanche) {
-    BoundListOption nf = OptionsManager.INSTANCE.getNrformats();
+    BoundedStringListOption nf = OptionsManager.INSTANCE.getNrformats();
     boolean alpha = nf.contains("alpha");
     boolean hex = nf.contains("hex");
     boolean octal = nf.contains("octal");
@@ -1935,7 +1926,7 @@ private void exitAllSingleCommandInsertModes(@NotNull Editor editor) {
   private @Nullable List<Object> lastStrokes;
 
   public boolean changeNumber(final @NotNull Editor editor, @NotNull Caret caret, final int count) {
-    final BoundListOption nf = OptionsManager.INSTANCE.getNrformats();
+    final BoundedStringListOption nf = OptionsManager.INSTANCE.getNrformats();
     final boolean alpha = nf.contains("alpha");
     final boolean hex = nf.contains("hex");
     final boolean octal = nf.contains("octal");

src/com/maddyhome/idea/vim/group/EditorGroup.java

@@ -23,15 +23,17 @@
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.editor.*;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorGutter;
+import com.intellij.openapi.editor.EditorSettings;
+import com.intellij.openapi.editor.LineNumberConverter;
 import com.intellij.openapi.editor.event.CaretEvent;
 import com.intellij.openapi.editor.event.CaretListener;
 import com.intellij.openapi.editor.ex.EditorGutterComponentEx;
 import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
 import com.intellij.openapi.project.Project;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.group.visual.VisualGroupKt;
 import com.maddyhome.idea.vim.helper.*;
 import com.maddyhome.idea.vim.option.OptionChangeListener;
 import com.maddyhome.idea.vim.option.OptionsManager;
@@ -41,6 +43,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import static com.maddyhome.idea.vim.helper.CaretVisualAttributesHelperKt.updateCaretsVisualAttributes;
+
 /**
  * @author vlan
  */
@@ -224,7 +228,7 @@ public void editorCreated(@NotNull Editor editor) {
       VimPlugin.getChange().insertBeforeCursor(editor, EditorDataContext.init(editor, null));
       KeyHandler.getInstance().reset(editor);
     }
-    VisualGroupKt.resetShape(CommandStateHelper.getMode(editor), editor);
+    updateCaretsVisualAttributes(editor);
     editor.getSettings().setRefrainFromScrolling(REFRAIN_FROM_SCROLLING_VIM_VALUE);
   }
 

src/com/maddyhome/idea/vim/group/RegisterGroup.java

@@ -56,8 +56,8 @@
 import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import com.maddyhome.idea.vim.helper.StringHelper;
-import com.maddyhome.idea.vim.option.ListOption;
 import com.maddyhome.idea.vim.option.OptionsManager;
+import com.maddyhome.idea.vim.option.StringListOption;
 import com.maddyhome.idea.vim.ui.ClipboardHandler;
 import kotlin.Pair;
 import org.jdom.Element;
@@ -111,7 +111,7 @@ public class RegisterGroup implements PersistentStateComponent<Element> {
   private @Nullable List<KeyStroke> recordList = null;
 
   public RegisterGroup() {
-    final ListOption clipboardOption = OptionsManager.INSTANCE.getClipboard();
+    final StringListOption clipboardOption = OptionsManager.INSTANCE.getClipboard();
     clipboardOption.addOptionChangeListenerAndExecute((oldValue, newValue) -> {
       if (clipboardOption.contains("unnamed")) {
         defaultRegister = '*';

src/com/maddyhome/idea/vim/group/SearchGroup.java

@@ -37,9 +37,9 @@
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.ex.ranges.LineRange;
 import com.maddyhome.idea.vim.helper.*;
-import com.maddyhome.idea.vim.option.ListOption;
 import com.maddyhome.idea.vim.option.OptionChangeListener;
 import com.maddyhome.idea.vim.option.OptionsManager;
+import com.maddyhome.idea.vim.option.StringListOption;
 import com.maddyhome.idea.vim.regexp.CharPointer;
 import com.maddyhome.idea.vim.regexp.CharacterClasses;
 import com.maddyhome.idea.vim.regexp.RegExp;
@@ -1273,7 +1273,7 @@ public void readData(@NotNull Element element) {
     }
 
     Element show = search.getChild("show-last");
-    final ListOption vimInfo = OptionsManager.INSTANCE.getViminfo();
+    final StringListOption vimInfo = OptionsManager.INSTANCE.getViminfo();
     final boolean disableHighlight = vimInfo.contains("h");
     showSearchHighlight = !disableHighlight && Boolean.parseBoolean(show.getText());
     if (logger.isDebugEnabled()) {

src/com/maddyhome/idea/vim/group/visual/IdeaSelectionControl.kt

@@ -88,7 +88,6 @@ object IdeaSelectionControl {
       }
 
       KeyHandler.getInstance().reset(editor)
-      updateCaretState(editor)
       logger.debug("${editor.mode} is enabled")
     }
   }