Fleet

CONTRIBUTING.md

@@ -62,7 +62,7 @@ for a few days or send it to a friend for testing.
 If you are looking for:
 
 - Vim commands (`w`, `<C-O>`, `p`, etc.):
-    - Any particular command: `package-info.java`.
+    - Any particular command: `engine_commands.json` + `intellij_commands.json` (this files are generated during compilation, please run `gradle build` to generate them manually).
     - How commands are executed in common: `EditorActionHandlerBase`.
     - Key mapping: `KeyHandler.handleKey()`.
 

README.md

@@ -109,7 +109,6 @@ etc
 
 See also:
 
-* [The list of all supported commands](src/main/java/com/maddyhome/idea/vim/package-info.java)
 * [Top feature requests and bugs](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+sort+by%3A+votes)
 * [Vimscript support roadmap](vimscript-info/VIMSCRIPT_ROADMAP.md)
 * [List of supported in-build functions](vimscript-info/FUNCTIONS_INFO.MD)

qodana.yaml

@@ -19,7 +19,6 @@ exclude:
       - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/JavaText.kt
       - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/LoremText.kt
       - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/SimpleText.kt
-      - src/main/java/com/maddyhome/idea/vim/package-info.java
       - vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
       - vim-engine/src/main/java/com/maddyhome/idea/vim/parser/generated
       - src/main/java/com/maddyhome/idea/vim/group/SearchGroup.java

src/main/java/com/maddyhome/idea/vim/group/HistoryGroup.java

@@ -14,9 +14,7 @@
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.history.HistoryBlock;
-import com.maddyhome.idea.vim.history.HistoryEntry;
-import com.maddyhome.idea.vim.history.VimHistoryBase;
+import com.maddyhome.idea.vim.history.*;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -35,21 +33,20 @@ public void saveData(@NotNull Element element) {
     logger.debug("saveData");
     Element hist = new Element("history");
 
-    saveData(hist, SEARCH);
-    saveData(hist, COMMAND);
-    saveData(hist, EXPRESSION);
-    saveData(hist, INPUT);
+    for (Type type : getHistories().keySet()) {
+      saveData(hist, type);
+    }
 
     element.addContent(hist);
   }
 
-  private void saveData(@NotNull Element element, String key) {
-    final HistoryBlock block = getHistories().get(key);
+  private void saveData(@NotNull Element element, VimHistory.Type type) {
+    final HistoryBlock block = getHistories().get(type);
     if (block == null) {
       return;
     }
 
-    final Element root = new Element("history-" + key);
+    final Element root = new Element("history-" + typeToKey(type));
 
     for (HistoryEntry entry : block.getEntries()) {
       final Element entryElement = new Element("entry");
@@ -67,10 +64,10 @@ public void readData(@NotNull Element element) {
       return;
     }
 
-    readData(hist, SEARCH);
-    readData(hist, COMMAND);
-    readData(hist, EXPRESSION);
-    readData(hist, INPUT);
+    for (Element child : hist.getChildren()) {
+      String key = child.getName().replace("history-", "");
+      readData(hist, key);
+    }
   }
 
   private void readData(@NotNull Element element, String key) {
@@ -80,7 +77,7 @@ private void readData(@NotNull Element element, String key) {
     }
 
     block = new HistoryBlock();
-    getHistories().put(key, block);
+    getHistories().put(getTypeForString(key), block);
 
     final Element root = element.getChild("history-" + key);
     if (root != null) {
@@ -94,6 +91,25 @@ private void readData(@NotNull Element element, String key) {
     }
   }
 
+  private String typeToKey(VimHistory.Type type) {
+    if (type instanceof VimHistory.Type.Search) {
+      return SEARCH;
+    }
+    if (type instanceof VimHistory.Type.Command) {
+      return COMMAND;
+    }
+    if (type instanceof VimHistory.Type.Expression) {
+      return EXPRESSION;
+    }
+    if (type instanceof VimHistory.Type.Input) {
+      return INPUT;
+    }
+    if (type instanceof VimHistory.Type.Custom) {
+      return ((Type.Custom) type).getId();
+    }
+    return "unreachable";
+  }
+
   @Nullable
   @Override
   public Element getState() {

src/main/java/com/maddyhome/idea/vim/ui/ex/ExDocument.java

@@ -34,7 +34,7 @@ public class ExDocument extends PlainDocument {
   void toggleInsertReplace() {
     VimCommandLine commandLine = injector.getCommandLine().getActiveCommandLine();
     if (commandLine != null) {
-      commandLine.toggleReplaceMode();
+      ((ExEntryPanel) commandLine).isReplaceMode = !((ExEntryPanel)commandLine).isReplaceMode;
     }
     overwrite = !overwrite;
   }