Update changelog

Add support for buffer list (buffers, files, ls)

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*.java]
+indent_size = 2
+indent_style = space
+
+[*.kt]
+indent_size = 2
+indent_style = space

.idea/codeStyleSettings.xml

@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="JAVA_INDENT_OPTIONS">
-          <value>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="2" />
-            <option name="TAB_SIZE" value="8" />
-            <option name="USE_TAB_CHARACTER" value="false" />
-            <option name="SMART_TABS" value="false" />
-            <option name="LABEL_INDENT_SIZE" value="0" />
-            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-            <option name="USE_RELATIVE_INDENTS" value="false" />
-          </value>
-        </option>
-        <option name="JSP_INDENT_OPTIONS">
-          <value>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="8" />
-            <option name="USE_TAB_CHARACTER" value="false" />
-            <option name="SMART_TABS" value="false" />
-            <option name="LABEL_INDENT_SIZE" value="0" />
-            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-            <option name="USE_RELATIVE_INDENTS" value="false" />
-          </value>
-        </option>
-        <option name="XML_INDENT_OPTIONS">
-          <value>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="8" />
-            <option name="USE_TAB_CHARACTER" value="false" />
-            <option name="SMART_TABS" value="false" />
-            <option name="LABEL_INDENT_SIZE" value="0" />
-            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-            <option name="USE_RELATIVE_INDENTS" value="false" />
-          </value>
-        </option>
-        <option name="OTHER_INDENT_OPTIONS">
-          <value>
-            <option name="INDENT_SIZE" value="4" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="4" />
-            <option name="USE_TAB_CHARACTER" value="false" />
-            <option name="SMART_TABS" value="false" />
-            <option name="LABEL_INDENT_SIZE" value="0" />
-            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-            <option name="USE_RELATIVE_INDENTS" value="false" />
-          </value>
-        </option>
-        <option name="FIELD_NAME_PREFIX" value="my" />
-        <option name="STATIC_FIELD_NAME_PREFIX" value="our" />
-        <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
-        <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
-        <option name="KEEP_LINE_BREAKS" value="false" />
-        <option name="ELSE_ON_NEW_LINE" value="true" />
-        <option name="WHILE_ON_NEW_LINE" value="true" />
-        <option name="CATCH_ON_NEW_LINE" value="true" />
-        <option name="FINALLY_ON_NEW_LINE" value="true" />
-        <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-        <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-        <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-        <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-        <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
-        <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-        <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
-        <option name="SPACE_AFTER_TYPE_CAST" value="false" />
-        <option name="CALL_PARAMETERS_WRAP" value="1" />
-        <option name="METHOD_PARAMETERS_WRAP" value="5" />
-        <option name="EXTENDS_LIST_WRAP" value="1" />
-        <option name="THROWS_LIST_WRAP" value="5" />
-        <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-        <option name="THROWS_KEYWORD_WRAP" value="1" />
-        <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-        <option name="BINARY_OPERATION_WRAP" value="5" />
-        <option name="TERNARY_OPERATION_WRAP" value="5" />
-        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-        <option name="FOR_STATEMENT_WRAP" value="5" />
-        <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-        <option name="ASSIGNMENT_WRAP" value="1" />
-        <option name="IF_BRACE_FORCE" value="1" />
-        <option name="DOWHILE_BRACE_FORCE" value="1" />
-        <option name="WHILE_BRACE_FORCE" value="1" />
-        <option name="FOR_BRACE_FORCE" value="1" />
-        <option name="FIELD_ANNOTATION_WRAP" value="0" />
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <ADDITIONAL_INDENT_OPTIONS fileType="rb">
-          <option name="INDENT_SIZE" value="2" />
-        </ADDITIONAL_INDENT_OPTIONS>
-        <codeStyleSettings language="CFML">
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="ELSE_ON_NEW_LINE" value="true" />
-          <option name="WHILE_ON_NEW_LINE" value="true" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="5" />
-          <option name="BINARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="FOR_STATEMENT_WRAP" value="5" />
-          <option name="ASSIGNMENT_WRAP" value="1" />
-          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-        </codeStyleSettings>
-        <codeStyleSettings language="ECMA Script Level 4">
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="ELSE_ON_NEW_LINE" value="true" />
-          <option name="WHILE_ON_NEW_LINE" value="true" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="FINALLY_ON_NEW_LINE" value="true" />
-          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="5" />
-          <option name="EXTENDS_LIST_WRAP" value="1" />
-          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="FOR_STATEMENT_WRAP" value="5" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-          <option name="ASSIGNMENT_WRAP" value="1" />
-          <option name="IF_BRACE_FORCE" value="1" />
-          <option name="DOWHILE_BRACE_FORCE" value="1" />
-          <option name="WHILE_BRACE_FORCE" value="1" />
-          <option name="FOR_BRACE_FORCE" value="1" />
-          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-        </codeStyleSettings>
-        <codeStyleSettings language="GSP">
-          <indentOptions>
-            <option name="INDENT_SIZE" value="2" />
-          </indentOptions>
-        </codeStyleSettings>
-        <codeStyleSettings language="Groovy">
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="ELSE_ON_NEW_LINE" value="true" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="FINALLY_ON_NEW_LINE" value="true" />
-          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
-          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-          <option name="SPACE_AFTER_TYPE_CAST" value="false" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="5" />
-          <option name="EXTENDS_LIST_WRAP" value="1" />
-          <option name="THROWS_LIST_WRAP" value="5" />
-          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-          <option name="THROWS_KEYWORD_WRAP" value="1" />
-          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_WRAP" value="5" />
-          <option name="FOR_STATEMENT_WRAP" value="5" />
-          <option name="ASSIGNMENT_WRAP" value="1" />
-          <option name="IF_BRACE_FORCE" value="1" />
-          <option name="WHILE_BRACE_FORCE" value="1" />
-          <option name="FOR_BRACE_FORCE" value="1" />
-          <option name="FIELD_ANNOTATION_WRAP" value="0" />
-          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-          <indentOptions>
-            <option name="INDENT_SIZE" value="2" />
-          </indentOptions>
-        </codeStyleSettings>
-        <codeStyleSettings language="HTML">
-          <indentOptions>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="8" />
-          </indentOptions>
-        </codeStyleSettings>
-        <codeStyleSettings language="JAVA">
-          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
-          <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="ELSE_ON_NEW_LINE" value="true" />
-          <option name="WHILE_ON_NEW_LINE" value="true" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="FINALLY_ON_NEW_LINE" value="true" />
-          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
-          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-          <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
-          <option name="SPACE_AFTER_TYPE_CAST" value="false" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="5" />
-          <option name="EXTENDS_LIST_WRAP" value="1" />
-          <option name="THROWS_LIST_WRAP" value="5" />
-          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-          <option name="THROWS_KEYWORD_WRAP" value="1" />
-          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="FOR_STATEMENT_WRAP" value="5" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-          <option name="ASSIGNMENT_WRAP" value="1" />
-          <option name="IF_BRACE_FORCE" value="1" />
-          <option name="DOWHILE_BRACE_FORCE" value="1" />
-          <option name="WHILE_BRACE_FORCE" value="1" />
-          <option name="FOR_BRACE_FORCE" value="1" />
-          <option name="FIELD_ANNOTATION_WRAP" value="0" />
-          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-          <indentOptions>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="2" />
-            <option name="TAB_SIZE" value="8" />
-          </indentOptions>
-        </codeStyleSettings>
-        <codeStyleSettings language="JSON">
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-        </codeStyleSettings>
-        <codeStyleSettings language="JSP">
-          <indentOptions>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="8" />
-          </indentOptions>
-        </codeStyleSettings>
-        <codeStyleSettings language="JavaScript">
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="ELSE_ON_NEW_LINE" value="true" />
-          <option name="WHILE_ON_NEW_LINE" value="true" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="FINALLY_ON_NEW_LINE" value="true" />
-          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="5" />
-          <option name="BINARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="FOR_STATEMENT_WRAP" value="5" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-          <option name="ASSIGNMENT_WRAP" value="1" />
-          <option name="IF_BRACE_FORCE" value="1" />
-          <option name="DOWHILE_BRACE_FORCE" value="1" />
-          <option name="WHILE_BRACE_FORCE" value="1" />
-          <option name="FOR_BRACE_FORCE" value="1" />
-          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-        </codeStyleSettings>
-        <codeStyleSettings language="Python">
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-        </codeStyleSettings>
-        <codeStyleSettings language="SQL">
-          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-        </codeStyleSettings>
-        <codeStyleSettings language="XML">
-          <indentOptions>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="8" />
-          </indentOptions>
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

AUTHORS.md

@@ -3,55 +3,293 @@ IdeaVim Authors
 
 The original author:
 
-* [Rick Maddy](mailto:rmaddy@maddyhome.com)
+* [![icon][mail]](mailto:rmaddy@maddyhome.com)
+  [![icon][github-off]](#)
+   
+  Rick Maddy    
 
-The current maintainer:
+The current maintainers:
 
-* [Andrey Vlasovskikh](mailto:andrey.vlasovskikh@gmail.com)
+* [![icon][mail]](mailto:andrey.vlasovskikh@gmail.com)
+  [![icon][github]](https://github.com/vlasovskikh)
+   
+  Andrey Vlasovskikh
+* [![icon][mail]](mailto:alexpl292@gmail.com)
+  [![icon][github]](https://github.com/AlexPl292)
+   
+  Alex Plate
 
 Previous maintainers:
 
-* [Oleg Shpynov](mailto:oleg.shpynov@jetbrains.com)
+* [![icon][mail]](mailto:oleg.shpynov@jetbrains.com)
+  [![icon][github]](https://github.com/olegs)
+   
+  Oleg Shpynov
 
 Contributors:
-
-* [Dmitry Jemerov](mailto:yole@jetbrains.com)
-* [Marquis Wang](mailto:marquis@marquiswang.com)
-* [Julien Hoarau](mailto:madgnome@gmail.com)
-* [Masanobu Imai](mailto:masanobu.imai@gmail.com)
-* [poxu](mailto:poxvuibr@gmail.com)
-* [Alexander Zolotov](mailto:alexander.zolotov@jetbrains.com)
-* [John Lindquist](mailto:johnlindquist@gmail.com)
-* [Ira Klotzko](mailto:iklotzko@ltech.com)
-* [Alex Selesse](mailto:alex@selesse.com)
-* [Dathan Bennett](mailto:dbennett@palantir.com)
-* [salaam](mailto:kphayen@gmail.com)
-* [Alexey Shmalko](mailto:rasen.dubi@gmail.com)
-* [Andrew Brookins](mailto:a.m.brookins@gmail.com)
-* [Chang Wang](mailto:changwang83@gmail.com)
-* [Jaime Sanchez](mailto:josejaime.sanchez@gmail.com)
-* [Thomas B Homburg](mailto:thomas@homburg.dk)
-* [smartbomb](mailto:smartbomb@server.fake)
-* [Tuomas Tynkkynen](mailto:tuomas.tynkkynen@iki.fi)
-* [Jackson Popkin](mailto:jackson@donorschoose.org)
-* [Teruo Kunihiro](mailto:yuyuyu1999@gmail.com)
-* [Liubov Paina](mailto:lubashka.994@mail.ru)
-* [Daniel Leong](mailto:falcone88@gmail.com)
-* [Aleksey Lagoshin](mailto:aleksey@pri-num.com)
-* [Paulo Bu](mailto:pbu_98@yahoo.com)
-* [Giorgos Gaganis](mailto:gaganis@yahoo.com)
-* [Pavel Fatin](mailto:pavel.fatin@jetbrains.com)
-* [tieTYT](mailto:tietyt@gmail.com)
-* [Nick Gieschen](mailto:nickgieschen@gmail.com)
-* [Naoto Ikeno](mailto:ikenox@gmail.com)
-* [Maximilian Luz](mailto:qzed@users.noreply.github.com)
-* [Vladimir Parfinenko](mailto:vparfinenko@excelsior-usa.com)
-* [Florian Hassmann](mailto:hassmann@hwdev.de)
-* [Jan Palus](mailto:jpalus@fastmail.com)
-* [Konstantin Petrov](mailto:kpetrov@ripe.net)
-* [Vasily Alferov](mailto:ya-ikmik2012@yandex.ru)
-* [Vitalii Karavaev](mailto:fkve97@gmail.com)
-* [John Lin](mailto:johnlinp@gmail.com)
-
+* [![icon][mail]](mailto:yole@jetbrains.com)
+  [![icon][github]](https://github.com/yole)
+   
+  Dmitry Jemerov
+* [![icon][mail]](mailto:marquis@marquiswang.com)
+  [![icon][github]](https://github.com/marquiswang)
+   
+  Marquis Wang
+* [![icon][mail]](mailto:madgnome@gmail.com)
+  [![icon][github-off]](#)
+   
+  Julien Hoarau  
+* [![icon][mail]](mailto:masanobu.imai@gmail.com)
+  [![icon][github-off]](#)
+   
+  Masanobu Imai
+* [![icon][mail]](mailto:poxvuibr@gmail.com)
+  [![icon][github]](https://github.com/poxu)
+   
+  poxu
+* [![icon][mail]](mailto:alexander.zolotov@jetbrains.com)
+  [![icon][github]](https://github.com/zolotov)
+   
+  Alexander Zolotov
+* [![icon][mail]](mailto:johnlindquist@gmail.com)
+  [![icon][github]](https://github.com/johnlindquist)
+   
+  John Lindquist
+* [![icon][mail]](mailto:iklotzko@ltech.com)
+  [![icon][github-off]](#)
+   
+  Ira Klotzko
+* [![icon][mail]](mailto:alex@selesse.com)
+  [![icon][github]](https://github.com/selesse)
+   
+  Alex Selesse
+* [![icon][mail]](mailto:dbennett@palantir.com)
+  [![icon][github-off]](#)
+   
+  Dathan Bennett
+* [![icon][mail]](mailto:kphayen@gmail.com)
+  [![icon][github-off]](#)
+   
+  salaam
+* [![icon][mail]](mailto:rasen.dubi@gmail.com)
+  [![icon][github]](https://github.com/rasendubi)
+   
+  Alexey Shmalko
+* [![icon][mail]](mailto:a.m.brookins@gmail.com)
+  [![icon][github-off]](#)
+   
+  Andrew Brookins
+* [![icon][mail]](mailto:changwang83@gmail.com)
+  [![icon][github-off]](#)
+   
+  Chang Wang
+* [![icon][mail]](mailto:josejaime.sanchez@gmail.com)
+  [![icon][github-off]](#)
+   
+  Jaime Sanchez
+* [![icon][mail]](mailto:thomas@homburg.dk)
+  [![icon][github-off]](#)
+   
+  Thomas B Homburg
+* [![icon][mail]](mailto:smartbomb@server.fake)
+  [![icon][github-off]](#)
+   
+  smartbomb
+* [![icon][mail]](mailto:tuomas.tynkkynen@iki.fi)
+  [![icon][github-off]](#)
+   
+  Tuomas Tynkkynen
+* [![icon][mail]](mailto:jackson@donorschoose.org)
+  [![icon][github-off]](#)
+   
+  Jackson Popkin
+* [![icon][mail]](mailto:yuyuyu1999@gmail.com)
+  [![icon][github-off]](#)
+   
+  Teruo Kunihiro
+* [![icon][mail]](mailto:lubashka.994@mail.ru)
+  [![icon][github-off]](#)
+   
+  Liubov Paina
+* [![icon][mail]](mailto:me@dhleong.net)
+  [![icon][github]](https://github.com/dhleong)
+   
+  Daniel Leong
+* [![icon][mail]](mailto:aleksey@pri-num.com)
+  [![icon][github-off]](#)
+   
+  Aleksey Lagoshin
+* [![icon][mail]](mailto:pbu_98@yahoo.com)
+  [![icon][github-off]](#)
+   
+  Paulo Bu
+* [![icon][mail]](mailto:gaganis@yahoo.com)
+  [![icon][github]](https://github.com/gaganis)
+   
+  Giorgos Gaganis
+* [![icon][mail]](mailto:pavel.fatin@jetbrains.com)
+  [![icon][github]](https://github.com/pavelfatin)
+   
+  Pavel Fatin
+* [![icon][mail]](mailto:tietyt@gmail.com)
+  [![icon][github-off]](#)
+   
+  tieTYT
+* [![icon][mail]](mailto:nickgieschen@gmail.com)
+  [![icon][github-off]](#)
+   
+  Nick Gieschen
+* [![icon][mail]](mailto:ikenox@gmail.com)
+  [![icon][github]](https://github.com/ikenox)
+   
+  Naoto Ikeno
+* [![icon][mail]](mailto:qzed@users.noreply.github.com)
+  [![icon][github-off]](#)
+   
+  Maximilian Luz
+* [![icon][mail]](mailto:vparfinenko@excelsior-usa.com)
+  [![icon][github-off]](#)
+   
+  Vladimir Parfinenko
+* [![icon][mail]](mailto:hassmann@hwdev.de)
+  [![icon][github-off]](#)
+   
+  Florian Hassmann
+* [![icon][mail]](mailto:jpalus@fastmail.com)
+  [![icon][github]](https://github.com/jpalus)
+   
+  Jan Palus
+* [![icon][mail]](mailto:kpetrov@ripe.net)
+  [![icon][github-off]](#)
+   
+  Konstantin Petrov
+* [![icon][mail]](mailto:ya-ikmik2012@yandex.ru)
+  [![icon][github]](https://github.com/vasalf)
+   
+  Vasily Alferov
+* [![icon][mail]](mailto:fkve97@gmail.com)
+  [![icon][github]](https://github.com/karavaevitalii)
+   
+  Vitalii Karavaev
+* [![icon][mail]](mailto:johnlinp@gmail.com)
+  [![icon][github]](https://github.com/johnlinp)
+   
+  John Lin
+* [![icon][mail]](mailto:alexpl292@gmail.com)
+  [![icon][github]](https://github.com/AlexPl292)
+   
+  Alex Plate
+* [![icon][mail]](mailto:m.t.ellis@gmail.com)
+  [![icon][github]](https://github.com/citizenmatt)
+   
+  Matt Ellis
+* [![icon][mail]](mailto:johngrib82@gmail.com)
+  [![icon][github]](https://github.com/johngrib)
+   
+  John Grib
+* [![icon][mail]](mailto:hild@b4mad.net)
+  [![icon][github-off]](#)
+   
+  Marcel Hild
+* [![icon][mail]](mailto:vedranb@gmail.com)
+  [![icon][github-off]](#)
+   
+  Vedran Budimcic
+* [![icon][mail]](mailto:andreigasparovici1@gmail.com)
+  [![icon][github]](https://github.com/andreigasparovici)
+   
+  Andrei Gasparovici
+* [![icon][mail]](mailto:qtankle@gmail.com)
+  [![icon][github]](https://github.com/dos65)
+   
+  dos65
+* [![icon][mail]](mailto:ttonyarra@gmail.com)
+  [![icon][github]](https://github.com/TonyArra)
+   
+  Tony Arra
+* [![icon][mail]](mailto:bradziolko@gmail.com)
+  [![icon][github]](https://github.com/bradziolko)
+   
+  Brad Ziolko
+* [![icon][mail]](mailto:sumoooru2@gmail.com)
+  [![icon][github]](https://github.com/sumoooru2)
+   
+  sumoooru2
+* [![icon][mail]](mailto:aqwsedrft1234@yahoo.co.jp)
+  [![icon][github]](https://github.com/gecko655)
+   
+  gecko655
+* [![icon][mail]](mailto:megna.dany@gmail.com)
+  [![icon][github]](https://github.com/danielemegna)
+   
+  Daniele Megna
+* [![icon][mail]](mailto:apottere@gmail.com)
+  [![icon][github]](https://github.com/apottere)
+   
+  Andrew Potter
+* [![icon][mail]](mailto:romain.gautier@nimamoh.net)
+  [![icon][github]](https://github.com/Nimamoh)
+   
+  Romain Gautier
+* [![icon][mail]](mailto:elliot.courant@wheniwork.com)
+  [![icon][github]](https://github.com/ECourant)
+   
+  Elliot Courant
+* [![icon][mail]](mailto:simon.rainer@fau.de)
+  [![icon][github]](https://github.com/Vvalter)
+   
+  Simon Rainer
+* [![icon][mail]](mailto:mziwisky@instructure.com)
+  [![icon][github]](https://github.com/mziwisky)
+   
+  Michael Ziwisky
+* [![icon][mail]](mailto:pierce@plasticcow.com)
+  [![icon][github]](https://github.com/thecodewarrior)
+   
+  Pierce Corcoran
+* [![icon][mail]](mailto:jonatantierno@gmail.com)
+  [![icon][github]](https://github.com/jonatantierno)
+   
+  Jonatan Tierno
+* [![icon][mail]](mailto:brendan@annable.me)
+  [![icon][github]](https://github.com/BrendanAnnable)
+   
+  Brendan Annable
+* [![icon][mail]](mailto:nerd.naveen@gmail.com)
+  [![icon][github]](https://github.com/NOLFXceptMe)
+   
+  Naveen Kumar Molleti
+* [![icon][mail]](mailto:jorgen.granseth@bekk.no)
+  [![icon][github]](https://github.com/jorgengranseth)
+   
+  Jørgen Granseth
+* [![icon][mail]](mailto:rafal@hajdacki.com)
+  [![icon][github]](https://github.com/hajdamak)
+   
+  Rafał Hajdacki
+* [![icon][mail]](mailto:igrek+github@fastem.com)
+  [![icon][github]](https://github.com/igrekster)
+   
+  igrekster
+* [![icon][mail]](mailto:lokomot476@gmail.com)
+  [![icon][github]](https://github.com/fan-tom)
+   
+  Alexey Gerasimov
+* [![icon][mail]](mailto:a.grison+github@gmail.com)
+  [![icon][github]](https://github.com/agrison)
+   
+  Alexandre Grison
+* [![icon][mail]](mailto:angel@knight-industries.com)
+  [![icon][github]](https://github.com/angelbot)
+   
+  John Weigel
+                        
 If you are a contributor and your name is not listed here, feel free to
-contact the maintainer.
+contact the maintainers.
+
+<a href="https://icons8.com">Icons by Icons8</a>
+
+[mail]: resources/icons/mail.png
+[github]: resources/icons/github.png
+
+[github-off]: resources/icons/github-off.png

CHANGES.md

@@ -8,19 +8,225 @@ Get an Early Access
 -------------------
 
 Would you like to try new features and fixes? Join the Early Access Program and
-receive EAP builds as updates! Add this URL to "Settings | Plugins |
-Browse Repositories | Manage Repositories":
-[https://plugins.jetbrains.com/plugins/eap/ideavim](https://plugins.jetbrains.com/plugins/eap/ideavim)
+receive EAP builds as updates! Use the `EAP` option in the status bar or
+add this URL to "Settings | Plugins | Manage Plugin Repositories":
+`https://plugins.jetbrains.com/plugins/eap/ideavim`
 
 It is important to distinguish EAP from traditional pre-release software.
 Please note that the quality of EAP versions may at times be way below even
 usual beta standards.
 
-
 To Be Released
 --------------
 
-...
+_Available since 0.55.1 EAP:_
+
+**Fixes:**
+* [VIM-1284](https://youtrack.jetbrains.com/issue/VIM-1284) Fix mapping of digits
+* Fix handling of counts on both operator and motion, e.g. `3d2w` deletes 6 words, instead of 32
+* Allow mapping of `<C-K>` and `<C-V>`/`<C-Q>`
+* [VIM-1899](https://youtrack.jetbrains.com/issue/VIM-1899) Add argument to `:registers` command
+* [VIM-1835](https://youtrack.jetbrains.com/issue/VIM-1835) Macros record input keystrokes instead of mapped keystrokes
+* [VIM-1900](https://youtrack.jetbrains.com/issue/VIM-1900) Ensure non-printable output for `:registers`, `:marks` and `:jumps` is encoded correctly
+
+_Available since 0.55.2 EAP:_
+
+**Features:**
+* `argtextobj.vim` plugin emulation ([argtextobj.vim](https://vim.sourceforge.io/scripts/script.php?script_id=2699))
+* `vim-textobj-entire` plugin emulation ([vim-textobj-entire](https://github.com/kana/vim-textobj-entire))
+* Support `ls/buffers/files` commands
+
+**Changes:**
+* Replace `ideastatusbar` option with `ideastatusicon`. Now you can make the icon gray.
+
+**Fixes:**
+* [VIM-1008](https://youtrack.jetbrains.com/issue/VIM-1008) Correct `ci{` behavior
+
+0.55, 2020-01-20
+--------------
+
+**Features:**
+* Surround and Commentary extensions support repeating with a dot command ([VIM-1118](https://youtrack.jetbrains.com/issue/VIM-1118))
+* Support XDG settings standard ([VIM-664](https://youtrack.jetbrains.com/issue/VIM-664))
+* Add option to remove the status bar icon ([VIM-1847](https://youtrack.jetbrains.com/issue/VIM-1847))
+
+**Fixes:**
+* [VIM-1823](https://youtrack.jetbrains.com/issue/VIM-1823) Fix multiple carets with ignorecase
+* [VIM-1053](https://youtrack.jetbrains.com/issue/VIM-1053)
+  [VIM-1038](https://youtrack.jetbrains.com/issue/VIM-1038)
+  Implement gq+motion. Support some double `g` commands (`guu`, `gUU`, `g~~`).
+* [VIM-1325](https://youtrack.jetbrains.com/issue/VIM-1325)
+  [VIM-1050](https://youtrack.jetbrains.com/issue/VIM-1050)
+  [VIM-1627](https://youtrack.jetbrains.com/issue/VIM-1627)
+  [VIM-1867](https://youtrack.jetbrains.com/issue/VIM-1867)
+  Fix bindings for active lookup
+* [VIM-1845](https://youtrack.jetbrains.com/issue/VIM-1845) Show ActionGroup popups
+* [VIM-1424](https://youtrack.jetbrains.com/issue/VIM-1424) CTRL-A doesn't have any restrictions now
+* [VIM-1454](https://youtrack.jetbrains.com/issue/VIM-1454) Fix CTRL-W with the autocompletion lookup
+* [VIM-1855](https://youtrack.jetbrains.com/issue/VIM-1855) Fix initialization error
+* [VIM-1853](https://youtrack.jetbrains.com/issue/VIM-1853) Fix marks for disposed projects
+* [VIM-1858](https://youtrack.jetbrains.com/issue/VIM-1858) Fix imap for autocomplete
+* [VIM-1362](https://youtrack.jetbrains.com/issue/VIM-1362) Search with confirm doesn't scroll down far enough
+* [VIM-1875](https://youtrack.jetbrains.com/issue/VIM-1875) Fix `isk` in `~/.ideaivmrc`
+* [VIM-1874](https://youtrack.jetbrains.com/issue/VIM-1874) Fix `set clipboard=unnamed` execution from `~/.ideavimrc`
+* [VIM-1878](https://youtrack.jetbrains.com/issue/VIM-1878) Fix `c` command after extract method action
+* [VIM-1884](https://youtrack.jetbrains.com/issue/VIM-1884) Show quickDoc during popup with `CTRL-J`
+* [VIM-987](https://youtrack.jetbrains.com/issue/VIM-987) Fix arrow keys for the NEO keyboard
+
+0.54, 2019-11-20
+--------------
+
+**Features:**
+* EasyMotion plugin emulation ([VIM-820](https://youtrack.jetbrains.com/issue/VIM-820) | [Instructions](https://github.com/JetBrains/ideavim#emulated-vim-plugins))
+* Support surrounding with a function name ([link](https://github.com/tpope/vim-surround/blob/master/doc/surround.txt#L138))
+* Add `:delmarks` command ([VIM-1720](https://youtrack.jetbrains.com/issue/VIM-1720))
+* Add IdeaVim icon to the status bar ([VIM-943](https://youtrack.jetbrains.com/issue/VIM-943))
+
+**Changes:**
+* Remove the default IdeaVim toggle shortcut (<kbd>CTRL</kbd><kbd>ALT</kbd><kbd>V</kbd>)
+* Rename `refactoring` value of `selectmode` option to `ideaselection`
+* Remove `template` value of `selectmode` option and replace it with `idearefactormode` option.
+
+**Fixes:**
+* [VIM-1766](https://youtrack.jetbrains.com/issue/VIM-1766) Fix disappearing caret in ex entry on Linux
+* [VIM-1032](https://youtrack.jetbrains.com/issue/VIM-1032) Annotations work well with relative line numbers enabled
+* [VIM-1762](https://youtrack.jetbrains.com/issue/VIM-1762) Relative line numbers respect line number theme
+* [VIM-1717](https://youtrack.jetbrains.com/issue/VIM-1717) Fix incorrect scroll location if no match with `incsearch`
+* [VIM-1757](https://youtrack.jetbrains.com/issue/VIM-1757) Fix incorrect search results when specifying offset as part of search command
+* Fix search highlights not showing after deleting last result
+* Update current line highlight during incsearch and replace operation
+* [VIM-1773](https://youtrack.jetbrains.com/issue/VIM-1773) Provide fallback error stripe colour if not defined
+* [VIM-1785](https://youtrack.jetbrains.com/issue/VIM-1785)
+  [VIM-1731](https://youtrack.jetbrains.com/issue/VIM-1731)
+  Fix some problems with yanking to clipboard
+* [VIM-1781](https://youtrack.jetbrains.com/issue/VIM-1781) Fix yanking with dollar motion
+* [VIM-1772](https://youtrack.jetbrains.com/issue/VIM-1772) Fix yanking with `:y` command
+* [VIM-1685](https://youtrack.jetbrains.com/issue/VIM-1685) Fix `ESC` for insert mode
+* [VIM-1752](https://youtrack.jetbrains.com/issue/VIM-1752) Fix `ESC` for insert mode
+* [VIM-1189](https://youtrack.jetbrains.com/issue/VIM-1189)
+  [VIM-927](https://youtrack.jetbrains.com/issue/VIM-927)
+  Fix mappings to black hole register
+* [VIM-1804](https://youtrack.jetbrains.com/issue/VIM-1804) Exit insert move after toggling IdeaVim
+* [VIM-1749](https://youtrack.jetbrains.com/issue/VIM-1749) Tag surround is finished on `>`
+* [VIM-1801](https://youtrack.jetbrains.com/issue/VIM-1801) Fix j/k motions with inline hints
+* [VIM-1800](https://youtrack.jetbrains.com/issue/VIM-1800) Improve ideamarks option
+* [VIM-1819](https://youtrack.jetbrains.com/issue/VIM-1819) Fix execution of some rider actions
+* [VIM-1604](https://youtrack.jetbrains.com/issue/VIM-1604) Add IdeaVim logo
+
+
+0.53, 2019-08-07
+--------------
+* [VIM-1711](https://youtrack.jetbrains.com/issue/VIM-1711) Search is not triggered during surround action
+* [VIM-1712](https://youtrack.jetbrains.com/issue/VIM-1712) Fix `Y` command for visual mode
+* [VIM-1713](https://youtrack.jetbrains.com/issue/VIM-1713) Surround in visual mode put caret in correct position
+* [VIM-1732](https://youtrack.jetbrains.com/issue/VIM-1732) Fix SO after enabling vim mode
+* [VIM-1710](https://youtrack.jetbrains.com/issue/VIM-1710) Fix opening empty file with "relative number" enabled
+* [VIM-1725](https://youtrack.jetbrains.com/issue/VIM-1725) Fix problems with Japanese language
+* [VIM-1648](https://youtrack.jetbrains.com/issue/VIM-1648) Fix exception while substitute with conformation
+* [VIM-1736](https://youtrack.jetbrains.com/issue/VIM-1736) Fix `` for ex panel
+* [VIM-1739](https://youtrack.jetbrains.com/issue/VIM-1739) Fix full-width characters for ex pane
+
+0.52, 2019-07-23
+--------------
+
+* Introduce [Select Mode](https://github.com/JetBrains/ideavim/wiki/Select-mode).
+
+
+* Fixed `:only` command
+* [VIM-1586](https://youtrack.jetbrains.com/issue/VIM-1586) Support `:shell` command
+* [VIM-801](https://youtrack.jetbrains.com/issue/VIM-801) Support `:tabnext` and `:tabprevious` commands
+* [VIM-1570](https://youtrack.jetbrains.com/issue/VIM-1570) Support `g<C-A>` and `g<C-X>` commands for visual mode
+* [VIM-1119](https://youtrack.jetbrains.com/issue/VIM-1119) Fixed 'e' search offset
+* [VIM-1587](https://youtrack.jetbrains.com/issue/VIM-1587) Fixed end-of-line multi line percent match in visual mode
+* [VIM-1303](https://youtrack.jetbrains.com/issue/VIM-1303) Fixed "Changing color schemes doesn't change find input"
+* [VIM-944](https://youtrack.jetbrains.com/issue/VIM-944) Fixed navigation with keypad arrows
+* [VIM-1569](https://youtrack.jetbrains.com/issue/VIM-1569) Fixed surround plugin bug by `S<tag attr="attr">`
+* [VIM-1012](https://youtrack.jetbrains.com/issue/VIM-1012) Fixed wrong tab selection after`:q`
+* [VIM-1245](https://youtrack.jetbrains.com/issue/VIM-1245) Clear switcher list after`:q`
+* [VIM-1425](https://youtrack.jetbrains.com/issue/VIM-1425) Correct `%` command
+* [VIM-1521](https://youtrack.jetbrains.com/issue/VIM-1521) Support `commentary` extension
+* [VIM-907](https://youtrack.jetbrains.com/issue/VIM-907) Fix `va(` command
+* [VIM-1067](https://youtrack.jetbrains.com/issue/VIM-1067) Fix repeating of `A` command
+* [VIM-1615](https://youtrack.jetbrains.com/issue/VIM-1615) Fix `set so=999` command and line "bouncing" with inlays
+* [VIM-1630](https://youtrack.jetbrains.com/issue/VIM-1630) Support `:tabonly` command
+* [VIM-607](https://youtrack.jetbrains.com/issue/VIM-607) Fix memory leaks
+* [VIM-1546](https://youtrack.jetbrains.com/issue/VIM-1546) Storing TAB key as input
+* [VIM-1231](https://youtrack.jetbrains.com/issue/VIM-1231) Get indent from PsiFile
+* [VIM-1633](https://youtrack.jetbrains.com/issue/VIM-1633) Fixed sequential text object commands in visual mode
+* [VIM-1105](https://youtrack.jetbrains.com/issue/VIM-1105) Added the `:command` command
+* [VIM-1090](https://youtrack.jetbrains.com/issue/VIM-1090) Fixed tag motion with duplicate tags
+* [VIM-1644](https://youtrack.jetbrains.com/issue/VIM-1644) Fixed repeat with visual mode
+* Fixed invoking IDE actions instead of command line actions with same shortcuts
+* [VIM-1550](https://youtrack.jetbrains.com/issue/VIM-1550) Fixed leaving command line mode on backspace
+* Fix insert position of `<C-R>` in ex commands
+* Command line editing caret shape and insert digraph/register feedback
+* [VIM-1419](https://youtrack.jetbrains.com/issue/VIM-1419),
+  [VIM-1493](https://youtrack.jetbrains.com/issue/VIM-1493) Correctly set focus when handling cmode mapping
+* Fix incorrect handling of subsequent key strokes after ex command line loses focus
+* [VIM-1240](https://youtrack.jetbrains.com/issue/VIM-1240) Improve UI of ex command line and output panel
+* [VIM-1485](https://youtrack.jetbrains.com/issue/VIM-1485) Remove incorrect gap between ex command line label and text
+* [VIM-1496](https://youtrack.jetbrains.com/issue/VIM-1496) Fix focus for Recent Files action
+* [VIM-1275](https://youtrack.jetbrains.com/issue/VIM-1275) "Change In Brackets" for string
+* [VIM-941](https://youtrack.jetbrains.com/issue/VIM-941) Fix tab for visual block mode
+* [VIM-1002](https://youtrack.jetbrains.com/issue/VIM-1002) Fix dot command for tab
+* [VIM-1426](https://youtrack.jetbrains.com/issue/VIM-1426) Correct `%` command
+* [VIM-1655](https://youtrack.jetbrains.com/issue/VIM-1655) Deleted word should is not yanked with Ctrl-W in insert mode
+* [VIM-1031](https://youtrack.jetbrains.com/issue/VIM-1031),
+  [VIM-1389](https://youtrack.jetbrains.com/issue/VIM-1389),
+  [VIM-1666](https://youtrack.jetbrains.com/issue/VIM-1666) Fix `<BS>` for digraphs
+* [VIM-1628](https://youtrack.jetbrains.com/issue/VIM-1628) Fix dead keys for JBR11
+* [VIM-1061](https://youtrack.jetbrains.com/issue/VIM-1061) Fix `^K` for digraphs
+* [VIM-437](https://youtrack.jetbrains.com/issue/VIM-437) Support `keymode` option
+* [VIM-274](https://youtrack.jetbrains.com/issue/VIM-274) Enter select mode for refactoring
+* [VIM-510](https://youtrack.jetbrains.com/issue/VIM-510) Support `Extend Selection` for visual mode
+* [VIM-606](https://youtrack.jetbrains.com/issue/VIM-606) Fix select text with mouse in insert mode
+* [VIM-800](https://youtrack.jetbrains.com/issue/VIM-800) Fix surround with live template
+* [VIM-1013](https://youtrack.jetbrains.com/issue/VIM-1013) Fix reformat code on selection
+* [VIM-1214](https://youtrack.jetbrains.com/issue/VIM-1214) Fix insert text to empty row
+* [VIM-1452](https://youtrack.jetbrains.com/issue/VIM-1452) Fix reselect visual block
+* [VIM-1497](https://youtrack.jetbrains.com/issue/VIM-1497) Fix rename variable action
+* [VIM-1541](https://youtrack.jetbrains.com/issue/VIM-1541) Fix visual block mode problems
+* [VIM-1619](https://youtrack.jetbrains.com/issue/VIM-1619) Extract method for visual mode
+* [VIM-1616](https://youtrack.jetbrains.com/issue/VIM-1616) `I` with multicaret works correctly
+* [VIM-1631](https://youtrack.jetbrains.com/issue/VIM-1631) Fix visual block for tab character
+* [VIM-1649](https://youtrack.jetbrains.com/issue/VIM-1649) Type variable for surround live template
+* [VIM-1654](https://youtrack.jetbrains.com/issue/VIM-1654) Fix NPE while indent in visual block mode
+* [VIM-1657](https://youtrack.jetbrains.com/issue/VIM-1657) Fix vim repeat in visual block
+* [VIM-1659](https://youtrack.jetbrains.com/issue/VIM-1658) Fix selection on empty line
+* [VIM-1473](https://youtrack.jetbrains.com/issue/VIM-1473) Yanked lines are not handled as block
+  selection when clipboard is used
+* [VIM-714](https://youtrack.jetbrains.com/issue/VIM-714) Fixed problems with caret position by vertical movement
+* [VIM-635](https://youtrack.jetbrains.com/issue/VIM-635) Supported `gn` commands
+* [VIM-1535](https://youtrack.jetbrains.com/issue/VIM-1535) Use same text attributes and highlight layer as IntelliJ's own Find command
+* [VIM-1413](https://youtrack.jetbrains.com/issue/VIM-1413) Fix `smartcase` option being ignored in incremental search
+* Fix incremental search not matching with trailing options, e.g. `/Foo/+1`
+* Move the current line as well as scrolling during incremental search
+* [VIM-128](https://youtrack.jetbrains.com/issue/VIM-128) Fix `:substitute` not respecting `ignorecase` and `smartcase` options
+* Fix next/previous search commands not respecting `smartcase` override
+* Search highlights are updated when `ignorecase`, `smartcase` and `hlsearch` options are updated, and when plugin is disabled
+* Incremental search highlights all matches in file, not just first
+* Added incremental search highlights for `:substitute` command
+* Fix exception when trying to highlight last CR in file
+* Improve behavior of `<BS>` in command line entry
+* [VIM-1626](https://youtrack.jetbrains.com/issue/VIM-1626) Add `ideajoin` option
+* [VIM-959](https://youtrack.jetbrains.com/issue/VIM-959) Add `ideamarks` option
+* [VIM-608](https://youtrack.jetbrains.com/issue/VIM-608) Automatic upload files on explicit save
+* [VIM-1548](https://youtrack.jetbrains.com/issue/VIM-1548) Respect editor settings about tabs and spaces
+* [VIM-1682](https://youtrack.jetbrains.com/issue/VIM-1682) Fix backward search with OR
+* [VIM-752](https://youtrack.jetbrains.com/issue/VIM-752) Enter finishes template in normal mode
+* [VIM-1668](https://youtrack.jetbrains.com/issue/VIM-1668) Fix smart step into
+* [VIM-1697](https://youtrack.jetbrains.com/issue/VIM-1697) Fix wrong search with tab characters
+* [VIM-1700](https://youtrack.jetbrains.com/issue/VIM-1700) Fix wrong search with tab characters
+* [VIM-1698](https://youtrack.jetbrains.com/issue/VIM-1698) Paste doesn't clear clipboard
+* [VIM-1359](https://youtrack.jetbrains.com/issue/VIM-1359) Fix behavior of i_CTRL-W action
+
+0.51, 2019-02-12
+----------------
+
+* [VIM-1558](https://youtrack.jetbrains.com/issue/VIM-1558) Fixed scrolling for code with block inlays in Rider 2018.3 
+* [VIM-1187](https://youtrack.jetbrains.com/issue/VIM-1187) Improved performance of `set relativelinenumber` on large files
+* [VIM-620](https://youtrack.jetbrains.com/issue/VIM-620) Fixed handling `<C-O>` and `<Esc>` in Insert and Replace modes
+* [VIM-798](https://youtrack.jetbrains.com/issue/VIM-798) Allow arrow keys for window navigation commands
 
 
 0.50, 2018-10-18
@@ -456,7 +662,7 @@ Bug fixes:
 * VIM-312 Fixed range and caret position after `dw` on the last single-word
   line, `w` command argument for the last word in file
 * Fixed `w` motion at the last word
-* VIM-85 Bug fix for gi behaviour
+* VIM-85 Bug fix for gi behavior
 * Always move cursor at the beginning of the deleted range
 * VIM-275 Fixed edge cases for `i{` motion
 * VIM-314 Made `i{` motion characterwise, not linewise/characterwise in visual

CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+## Code of Conduct
+
+This project and the corresponding community is governed by the [JetBrains Open Source and Community Code of Conduct](https://confluence.jetbrains.com/display/ALL/JetBrains+Open+Source+and+Community+Code+of+Conduct). Please make sure you read it. 
+

CONTRIBUTING.md

@@ -0,0 +1,124 @@
+<div>
+  <a href="https://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20183&guest=1">
+    <img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20183)/statusIcon.svg?guest=1"/>
+  </a>
+  <span>2018.3 Tests</span>
+</div>
+<div>
+  <a href="https://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20191&guest=1">
+    <img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20191)/statusIcon.svg?guest=1"/>
+  </a>
+  <span>2019.1 Tests</span>
+</div>
+<div>
+  <a href="https://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20192&guest=1">
+    <img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20192)/statusIcon.svg?guest=1"/>
+  </a>
+  <span>2019.2 Tests</span>
+</div>
+<div>
+  <a href="https://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20193&guest=1">
+    <img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20193)/statusIcon.svg?guest=1"/>
+  </a>
+  <span>2019.3 Tests</span>
+</div>
+<div>
+  <a href="https://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20201&guest=1">
+    <img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20201)/statusIcon.svg?guest=1"/>
+  </a>
+  <span>2020.1 Tests</span>
+</div>
+
+
+### Where to Start
+
+In order to contribute to IdeaVim, you should have some understanding of [Kotlin](https://kotlinlang.org/) or Java.
+
+See also these docs on the IntelliJ API:
+
+* [IntelliJ architectural overview](https://www.jetbrains.org/intellij/sdk/docs/platform/fundamentals.html)
+* [IntelliJ plugin development resources](https://www.jetbrains.org/intellij/sdk/docs/welcome.html)
+
+You can start by:
+
+ - Picking relatively simple tasks that are tagged with
+[#patch_welcome](https://youtrack.jetbrains.com/issues/VIM?q=%23patch_welcome%20%23Unresolved%20sort%20by:%20votes%20)
+in the issue tracker.
+ - Read about the `@VimBehaviorDiffers` annotation and fix the corresponding functionality.
+
+
+### Development Environment
+
+1. Fork IdeaVim on GitHub and clone the repository on your local machine.
+
+2. Import the project from the existing sources in IntelliJ IDEA 2018.1 or newer (Community or
+   Ultimate), by selecting "File | New | Project from Existing Sources..." or selecting "Import
+   Project" from the Welcome screen.
+
+    * In the project wizard, select "Import project from external model | Gradle".
+
+    * Select your Java 8+ JDK as the Gradle JVM; leave other parameters unchanged.
+
+3. Run your IdeaVim plugin within IntelliJ via a Gradle task:
+
+    * Select the "View | Tool Windows | Gradle" tool window.
+    
+    * Launch "ideavim | intellij | runIde" from the tool window.
+
+4. Run IdeaVim tests via a Gradle task:
+
+    * Select the "View | Tool Windows | Gradle" tool window.
+    
+    * Launch "ideavim | verification | test" from the tool window.
+
+5. Build the plugin distribution by running `./gradlew clean buildPlugin` in the
+   terminal in your project root.
+
+    * The resulting distribution file will be located at build/distributions/IdeaVim-VERSION.zip
+
+    * You can install this file by selecting "Settings | Plugins | Install plugin
+      from disk...".
+
+### Copyright
+
+1. Go to `Preferences | Appearance & Behavior | Scopes`, press "+" button, `Shared`.  
+       Name: Copyright scope  
+       Pattern: `file[IdeaVIM.main]:com//*||file[IdeaVIM.test]:*/`
+
+2. Go to `Preferences | Editor | Copyright | Copyright Profiles` and click the "+" button.  
+       Name: IdeaVim  
+       Text:  
+       
+       IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+       Copyright (C) 2003-$today.year The IdeaVim authors
+       
+       This program is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 2 of the License, or
+       (at your option) any later version.
+       
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+       GNU General Public License for more details.
+       
+       You should have received a copy of the GNU General Public License
+       along with this program. If not, see <https://www.gnu.org/licenses/>.
+       
+3. Go to `Preferences | Editor | Copyright`, click the "+" button.  
+       Scope: Copyright scope  
+       Copyright: IdeaVim
+       
+### Testing
+
+1. Read about the `@VimBehaviorDiffers` annotation.
+
+2. Please avoid senseless text like "dhjkwaldjwa", "asdasdasd",
+"123 123 123 123", etc. Try to choose an example text that is easy to
+read and understand what is wrong if the test fails.
+For example, take a few lines from your favorite poem, or use
+"Vladimir Nabokov – A Discovery" if you don't have one.
+
+3. Test your functionality properly.
+Especially check whether your command works with:
+line start, line end, file start, file end, empty line, multiple carets, dollar motion, etc.

LICENSE.txt

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

README.md

@@ -1,37 +1,28 @@
+<img src="resources/META-INF/pluginIcon.svg" width="80" height="80" alt="icon" align="left"/>
+
 IdeaVim
-=======
+===
 
 <div>
   <a href="https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub">
-    <img src="http://jb.gg/badges/official.svg" alt="official JetBrains project"/>
+    <img src="https://jb.gg/badges/official.svg" alt="official JetBrains project"/>
+  </a>
+  <a href="https://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20201&guest=1">
+    <img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20201)/statusIcon.svg?guest=1" alt="TeamCity Build"/>
   </a>
 </div>
 
-<div>
-  <a href="http://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_Build&guest=1">
-    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_Build)/statusIcon.svg?guest=1"/>
-  </a>
-  <span>Build<span>
-</div>
-
-<div>
-  <a href="http://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20182&guest=1">
-    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20182)/statusIcon.svg?guest=1"/>
-  </a>
-  <span>Tests</span>
-</div>
-
-IdeaVim is a Vim emulation plugin for IDEs based on the IntelliJ platform.
+IdeaVim is a Vim emulation plugin for IDEs based on the IntelliJ Platform.
 IdeaVim can be used with IntelliJ IDEA, PyCharm, CLion, PhpStorm, WebStorm,
-RubyMine, AppCode, DataGrip, GoLand, Cursive, and Android Studio.
+RubyMine, AppCode, DataGrip, GoLand, Rider, Cursive, and Android Studio.
 
 Resources:
 
-* [Plugin homepage](http://plugins.jetbrains.com/plugin/164)
+* [Plugin homepage](https://plugins.jetbrains.com/plugin/164-ideavim)
 * [Changelog](CHANGES.md)
-* [Bug tracker](http://youtrack.jetbrains.com/issues/VIM)
-* [Continuous integration builds](http://teamcity.jetbrains.com/project.html?projectId=IdeaVim&guest=1)
-* [@IdeaVim](http://twitter.com/ideavim) in Twitter
+* [Bug tracker](https://youtrack.jetbrains.com/issues/VIM)
+* [Continuous integration builds](https://teamcity.jetbrains.com/project.html?projectId=IdeaVim&guest=1)
+* [@IdeaVim](https://twitter.com/ideavim) in Twitter
 
 
 Installation
@@ -47,25 +38,35 @@ shortcuts.
 
 Keyboard shortcut conflicts between the Vim emulation and the IDE can be
 resolved via "File | Settings | Editor | Vim Emulation", "File | Settings |
-Keymap" on Linux & Windows, and by "Preferences | Editor | Vim Emulation",
-"Preferences | Keymap" on macOS. They can also be resolved by key mapping
+Keymap" on Linux & Windows, and via "Preferences | Editor | Vim Emulation",
+"Preferences | Keymap" on macOS. They can also be resolved by key-mapping
 commands in your ~/.ideavimrc file.
 
 
-Get an Early Access
+Get Early Access
 -------------------
 
 Would you like to try new features and fixes? Join the Early Access Program and
-receive EAP builds as updates! Add this URL to "Settings | Plugins |
-Browse Repositories | Manage Repositories":
-[https://plugins.jetbrains.com/plugins/eap/ideavim](https://plugins.jetbrains.com/plugins/eap/ideavim)
+receive EAP builds as updates!  
+
+1. Click the IdeaVim icon in the status bar | `EAP` | `Get Early Access...`
+
+Or subscribe to EAP updates manually:
+
+1. Open `Settings | Plugins`
+2. Click the gear icon :gear:, select `Manage Plugin Repositories`, and add the following url:
+ `https://plugins.jetbrains.com/plugins/eap/ideavim`
 
 See [the changelog](CHANGES.md) for the list of hot unreleased features.
 
-It is important to distinguish EAP from traditional pre-release software.
+It is important to distinguish EAP builds from traditional pre-release software.
 Please note that the quality of EAP versions may at times be way below even
 usual beta standards.
 
+You can always leave your feedback with:
+* [@IdeaVim](https://twitter.com/ideavim) in Twitter
+* [Bug tracker](https://youtrack.jetbrains.com/issues/VIM)
+
 
 Summary of Supported Vim Features
 ---------------------------------
@@ -88,21 +89,26 @@ Supported:
 * Command line and search history
 * Window commands
 * Vim web help
+* Select mode
 
 Emulated Vim plugins:
 
+* vim-easymotion
 * vim-surround
 * vim-multiple-cursors
+* vim-commentary
+* argtextobj.vim   [To Be Released]
+* vim-textobj-entire [To Be Released]
 
 Not supported (yet):
 
 * Jump lists
-* Various less used commands
+* Various less-used commands
 
 See also:
 
 * [The list of all supported commands](src/com/maddyhome/idea/vim/package-info.java)
-* [Top features and bugs](http://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+sort+by%3A+votes)
+* [Top features and bugs](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+sort+by%3A+votes)
 
 
 Files
@@ -111,58 +117,87 @@ Files
 * ~/.ideavimrc
     * Your IdeaVim-specific Vim initialization commands
 
-You can read your ~/.vimrc file from ~/.ideavimrc using this command:
+You can read your ~/.vimrc file from ~/.ideavimrc with this command:
 
     source ~/.vimrc
 
-Note, that IdeaVim currently parses ~/.ideavimrc file via simple pattern matching,
-see [VIM-669](http://youtrack.jetbrains.com/issue/VIM-669) for proper parsing
+Note, that IdeaVim currently parses ~/.ideavimrc file via simple pattern matching.
+See [VIM-669](https://youtrack.jetbrains.com/issue/VIM-669) for proper parsing
 of VimL files.
 
 Also note that if you have overridden the `user.home` JVM option, this
-will affect where IdeaVim looks for your .ideavimrc file.  For example, if you
+will affect where IdeaVim looks for your .ideavimrc file. For example, if you
 have `-Duser.home=/my/alternate/home` then IdeaVim will source
 `/my/alternate/home/.ideavimrc` instead of `~/.ideavimrc`.
 
+Alternatively, you can set up initialization commands using [XDG](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html) standard.
+Put your settings to `$XDG_CONFIG_HOME$/ideavim/ideavimrc` file.
+
 
 Emulated Vim Plugins
 --------------------
 
 IdeaVim extensions emulate some plugins of the original Vim. In order to use
-IdeaVim extensions, you have to enable them via this command in your ~/.ideavimrc:
+IdeaVim extensions, you have to enable them via this command in your `~/.ideavimrc`:
 
     set <extension-name>
 
 Available extensions:
 
+* easymotion
+    * Setup:  
+        * Install [IdeaVim-EasyMotion](https://plugins.jetbrains.com/plugin/13360-ideavim-easymotion/)
+        and [AceJump](https://plugins.jetbrains.com/plugin/7086-acejump/) plugins.
+        * `set easymotion`
+    * Emulates [vim-easymotion](https://github.com/easymotion/vim-easymotion)
+    * Commands: All commands with the mappings are supported. See the [full list of supported commands](https://github.com/AlexPl292/IdeaVim-EasyMotion#supported-commands).
+
 * surround
+    * Setup: `set surround`
     * Emulates [vim-surround](https://github.com/tpope/vim-surround)
     * Commands: `ys`, `cs`, `ds`, `S`
+
 * multiple-cursors
+    * Setup: `set multiple-cursors`
     * Emulates [vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors)
     * Commands: `<A-n>`, `<A-x>`, `<A-p>`, `g<A-n>`
 
+* commentary
+    * Setup: `set commentary`
+    * Emulates [commentary.vim](https://github.com/tpope/vim-commentary)
+    * Commands: `gcc`, `gc + motion`, `v_gc`
+
+* argtextobj   [To Be Released]
+    * Setup: `set argtextobj`
+    * Emulates [argtextobj.vim](https://www.vim.org/scripts/script.php?script_id=2699)
+    * Additional text objects: `aa`, `ia`
+    
+* textobj-entire [To Be Released]
+    * Setup: `set textobj-entire`
+    * Emulates [vim-textobj-entire](https://github.com/kana/vim-textobj-entire)
+    * Additional text objects: `ae`, `ie`
+
 
 Changes to the IDE
 ------------------
 
 ### Undo/Redo
 
-The IdeaVim plugin uses the undo/redo functionality of the IntelliJ platform,
-so the behaviour of the `u` and `<C-R>` commands may differ from the original
+The IdeaVim plugin uses the undo/redo functionality of the IntelliJ Platform,
+so the behavior of the `u` and `<C-R>` commands may differ from the original
 Vim. Vim compatibility of undo/redo may be improved in future releases.
 
-See also [unresolved undo issues](http://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+Help+topic%3A+u).
+See also [unresolved undo issues](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+Help+topic%3A+u).
 
 ### Escape
 
-Using `<Esc>` in dialog windows remains problematic. For most dialog windows
-the Vim emulator is put into the insert mode with `<Esc>` not working. You
-should use `<C-c>` or `<C-[>` instead. In some dialog windows the normal mode is
-on by default. The usage of the Vim emulator in dialog windows is an area for
-improvements.
+Using `<Esc>` in dialog windows remains problematic. For most dialog windows,
+the Vim emulator is put into insert mode with `<Esc>` not working. You
+should use `<C-c>` or `<C-[>` instead. In some dialog windows, the normal mode is
+switched by default. The usage of the Vim emulator in dialog windows is an area for
+improvement.
 
-See also [unresolved escape issues](http://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+Help+topic%3A+i_Esc).
+See also [unresolved escape issues](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+Help+topic%3A+i_Esc).
 
 ### Executing IDE Actions
 
@@ -170,7 +205,7 @@ IdeaVim adds two commands for listing and executing arbitrary IDE actions as
 Ex commands or via `:map` command mappings:
 
 * `:actionlist [pattern]`
-    * Find IDE actions by name pattern
+    * Find IDE actions by name or keymap pattern (E.g. `:actionlist extract`, `:actionlist <C-D`)
 * `:action {name}`
     * Execute an action named `NAME`
 
@@ -182,52 +217,7 @@ For example, here `\r` is mapped to the Reformat Code action:
 Contributing
 ------------
 
-### Where to Start
-
-In order to contribute to IdeaVim you should have some understanding of Java.
-
-See also these docs on the IntelliJ API:
-
-* [IntelliJ architectural overview](http://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+Architectural+Overview)
-* [IntelliJ plugin development resources](http://confluence.jetbrains.com/display/IDEADEV/PluginDevelopment)
-
-You can start by picking relatively simple tasks that are tagged with
-[#patch_welcome](http://youtrack.jetbrains.com/issues/VIM?q=%23patch_welcome)
-in the issue tracker.
-
-
-### Development Environment
-
-1. Fork IdeaVim on GitHub and clone the repository on your local machine.
-
-2. Import the project from existing sources in IntelliJ IDEA 2018.1 or newer (Community or
-   Ultimate) using "File | New | Project from Existing Sources..." or "Import
-   Project" from the start window.
-
-    * In the project wizard select "Import project from external model | Gradle"
-
-    * Select your Java 8+ JDK as the Gradle JVM, leave other parameters unchanged
-
-3. Run your IdeaVim plugin within IntelliJ via a Gradle task
-
-    * Select "View | Tool Windows | Gradle" tool window
-    
-    * Launch "ideavim | intellij | runIde" from the tool window
-
-4. Run IdeaVim tests via a Gradle task
-
-    * Select "View | Tool Windows | Gradle" tool window
-    
-    * Launch "ideavim | verification | test" from the tool window
-
-5. Build the plugin distribution by running `./gradlew clean buildPlugin` in the
-   terminal in your project root.
-
-    * The resulting distribution file is build/distributions/IdeaVim-VERSION.zip
-
-    * You can install this file using "Settings | Plugins | Install plugin
-      from disk"
-
+See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 Authors
 -------
@@ -239,4 +229,5 @@ for a list of authors and contributors.
 License
 -------
 
-IdeaVim is licensed under the terms of the GNU Public license version 2.
+IdeaVim is licensed under the terms of the GNU Public License version 2
+or any later version.

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 
 plugins {
-  id 'org.jetbrains.intellij' version '0.3.12'
+  id 'org.jetbrains.intellij' version '0.4.16'
 }
 
 apply plugin: 'java'
@@ -36,11 +36,17 @@ intellij {
   updateSinceUntilBuild false
   downloadSources Boolean.valueOf(downloadIdeaSources)
   instrumentCode Boolean.valueOf(instrumentPluginCode)
+  intellijRepo = "https://www.jetbrains.com/intellij-repository"
+  if (!Boolean.valueOf(legacyNoJavaPlugin)) {
+    // Since 192 version of IJ java plugin should be defined separately
+    // Set `legacyNoJavaPlugin` to true if you are going to run tests under idea version < 192
+    plugins = ['java']
+  }
 
   publishPlugin {
     channels publishChannels.split(',')
     username publishUsername
-    password publishPassword
+    token publishToken
   }
 }
 
@@ -49,6 +55,34 @@ repositories {
 }
 
 dependencies {
-  compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-  compile "org.jetbrains.kotlin:kotlin-runtime:$kotlinVersion"
+  compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+  compileOnly "org.jetbrains:annotations:19.0.0"
+}
+
+compileKotlin {
+  kotlinOptions {
+    jvmTarget = javaVersion
+  }
+}
+compileTestKotlin {
+  kotlinOptions {
+    jvmTarget = javaVersion
+  }
+}
+
+tasks.register("slackEapNotification") {
+  doLast {
+    if (!slackUrl) return
+    def post = new URL(slackUrl).openConnection()
+    def message = "{\"text\":\"New EAP released: $version\"}"
+    post.setRequestMethod("POST")
+    post.setDoOutput(true)
+    post.setRequestProperty("Content-Type", "application/json")
+    post.getOutputStream().write(message.getBytes("UTF-8"))
+    def postRC = post.getResponseCode()
+    println(postRC)
+    if(postRC.equals(200)) {
+      println(post.getInputStream().getText())
+    }
+  }
 }

doc/ideajoin-examples.md

@@ -0,0 +1,51 @@
+Some examples of join command with `ideajoin` option enabled.  
+Put `set ideajoin` to your `~/.ideavimrc` to enable this functionality.
+
+1) Automatic join concatenated lines:
+
+```
+"Hello" +                 ->       "Hello world"
+" world!"
+```
+
+2) Nested if's:
+
+```
+if (a) {                  ->       if (a && b) {
+  if (b) {                             ...
+     ...                           }
+  }
+}
+```
+
+3) Remove braces from one line for / if / while:
+
+```
+if (fail) {               ->       if (fail) return;
+     return;
+}
+```
+
+4) Kotlin one line method:
+
+```
+fun myNumber(): Int {     ->       fun myNumber(): Int = 42
+    return 42
+}
+```
+
+5) Join declaration and initialization:
+
+```
+int a;                    ->       int a = 5;
+a = 5;
+```
+
+6) Chain call:
+
+```
+sb.append("a");           ->       sb.append("a").append("b");
+sb.append("b");
+```
+
+And other functions provided by the plugins.

doc/set-commands.md

@@ -1,16 +1,42 @@
 List of Supported Set Commands
 ==============================
 
-The following `:set` commands can appear in `~/.ideavimrc` or set manually in the command mode:
+The following `:set` commands can appear in `~/.ideavimrc` or be set manually in the command mode:
 
-    'clipboard'      'cb'    clipboard options
-    'digraph'        'dg'    enable the entering of digraphs in Insert mode
-    'gdefault'       'gd'    the ":substitute" flag 'g' is default on
-    'history'        'hi'    number of command-lines that are remembered
-    'hlsearch'       'hls'   highlight matches with last search pattern
-    'ignorecase'     'ic'    ignore case in search patterns
-    'iskeyword'      'isk'   defines keywords for commands like 'w', '*', etc.
-    'incsearch'      'is'    show where search pattern typed so far matches
+    'clipboard'      'cb'       clipboard options
+                                Standard clipboard options plus 
+                                
+                                `ideaput`  (default on)   - IdeaVim ONLY
+                                enable native idea paste action for put operations
+    
+    'digraph'        'dg'       enable the entering of digraphs in Insert mode
+    'gdefault'       'gd'       the ":substitute" flag 'g' is by default
+    'history'        'hi'       number of command-lines that are remembered
+    'hlsearch'       'hls'      highlight matches with the last search pattern
+    'ignorecase'     'ic'       ignore case in search patterns
+    'iskeyword'      'isk'      defines keywords for commands like 'w', '*', etc.
+    'incsearch'      'is'       show where search pattern typed so far matches
+    
+    `keymodel`       `km`       String (default "continueselect,stopselect")
+
+                 List of comma separated words, which enable special things that keys
+                 can do. These values can be used:
+                   startsel           Using a shifted special[1] key starts selection (either
+                                      Select mode or Visual mode, depending on "key" being
+                                      present in 'selectmode').
+                   stopsel            Using a NOT-shifted special[1] key stops selection.
+                                      Automatically enables `stopselect` and `stopvisual`
+                   stopselect         Using a NOT-shifted special[1] key stops     - IdeaVim ONLY
+                                      select mode and removes selection.
+                   stopvisual         Using a NOT-shifted special[1] key stops     - IdeaVim ONLY
+                                      visual mode and removes selection.
+                   continueselect     Using a shifted arrow key doesn't       - IdeaVim ONLY
+                                      start selection, but in select mode
+                                      acts like startsel is enabled
+                   continuevisual     Using a shifted arrow key doesn't       - IdeaVim ONLY
+                                      start selection, but in visual mode
+                                      acts like startsel is enabled
+    
     'matchpairs'     'mps'   pairs of characters that "%" can match
     'nrformats'      'nf'    number formats recognized for CTRL-A command
     'number'         'nu'    print the line number in front of each line
@@ -18,15 +44,91 @@ The following `:set` commands can appear in `~/.ideavimrc` or set manually in th
                              the cursor
     'scroll'         'scr'   lines to scroll with CTRL-U and CTRL-D
     'scrolljump'     'sj'    minimum number of lines to scroll
-    'scrolloff'      'so'    minimum nr. of lines above and below cursor
+    'scrolloff'      'so'    minimum number of lines above and below the cursor
     'selection'      'sel'   what type of selection to use
-    'showmode'       'smd'   message on status line to show current mode
-    'sidescroll'     'ss'    minimum number of columns to scroll horizontal
-    'sidescrolloff'  'siso'  min. nr. of columns to left and right of cursor
-    'smartcase'      'scs'   no ignore case when pattern has uppercase
-    'timeout'        'to'    use timeout for mapped key sequences
-    'timeoutlen'     'tm'    time that is waited for a mapped key sequence
-    'undolevels'     'ul'    maximum number of changes that can be undone
-    'viminfo'        'vi'    information to remember after restart
-    'visualbell'     'vb'    use visual bell instead of beeping
-    'wrapscan'       'ws'    searches wrap around the end of the file
+
+    `selectmode`     `slm`   String (default "")
+
+                 This is a comma-separated list of words, which specify when to start
+                 Select mode instead of Visual mode, when a selection is started.
+                 Possible values:
+                   mouse           when using the mouse
+                   key             when using shifted special[1] keys
+                   cmd             when using "v", "V", or <C-V>
+                   ideaselection   when IDE sets a selection      - IdeaVim ONLY
+                                   (examples: extend selection, wrap with while, etc.)
+
+                   Deprecated values:
+                   template        ~~please use `idearefactormode` option~~
+                                   when starting a template       - IdeaVim ONLY
+                   refactoring     ~~please use ideaselection~~
+                                   same as ideaselection          - IdeaVim ONLY
+
+    'showmode'       'smd'       message on the status line to show current mode
+    'sidescroll'     'ss'        minimum number of columns to scroll horizontally
+    'sidescrolloff'  'siso'      min. number of columns to left and right of cursor
+    'smartcase'      'scs'       no ignore case when pattern is uppercase
+    'timeout'        'to'        use timeout for mapped key sequences
+    'timeoutlen'     'tm'        timeout duration for a mapped key sequence
+    'undolevels'     'ul'        maximum number of changes that can be undone
+    'viminfo'        'vi'        information to remember after restart
+    'visualbell'     'vb'        use visual bell instead of beeping
+    'wrapscan'       'ws'        searches wrap around the end of file
+    
+    
+    
+    IdeaVim only commands:
+
+    `ideamarks`      `ideamarks` Boolean (default true)
+    
+                     If true, creation of global mark will trigger creation of IDE's bookmark
+                     and vice versa.
+                     
+    `idearefactormode` `idearefactormode` String(default "select")
+    
+                 Define the mode that would be enabled during
+                 the refactoring (renaming, live template, introduce variable, etc)
+                 
+                 Use one of the following values:
+                 - keep  - keep the mode that was enabled before starting a refactoring
+                 - select - start refactoring in select mode
+                 - visual - start refactoring in visual mode
+                 
+                 This option has effect if you are in normal, insert or replace mode before refactoring start.
+                 Visual or select mode are not changed.
+    
+    
+    `ideajoin`      `ideajoin` Boolean (default false)
+    
+                  If true, join command will be performed via IDE
+                  See wiki/`ideajoin` examples
+
+    `ideastatusbar`  `ideastatusbar` Boolean (default true)
+                  DEPRECATED. Please use `ideastatusicon`
+    
+                  If false, IdeaVim icon won't be shown in the status bar.
+                  Works only from `~/.ideavimrc` after the IDE restart.
+                  
+    `ideastatusicon`  `ideastatusicon` String(default "enabled")    [To Be Released]
+    
+                 Define the behavior of IdeaVim icon in the status bar.
+                 
+                 Use one of the following values:
+                 - enabled - icon is shown in the status bar
+                 - gray - use the gray version of the icon
+                 - disabled - hide the icon
+                 
+                  Works only from `~/.ideavimrc` after the IDE restart.
+                  
+    `lookupkeys`    `lookupkeys`   List of strings
+    
+                  List of keys that should be processed by the IDE during the active lookup (autocompletion).
+                  For example, <Tab> and <Enter> are used by the IDE to finish the lookup,
+                        but <C-W> should be passed to IdeaVim.
+                  Default value: 
+                        "<Tab>", "<Down>", "<Up>", "<Enter>", "<Left>", "<Right>",
+                        "<C-Down>", "<C-Up>", "<PageUp>", "<PageDown>",
+                        "<C-J>", "<C-Q>"
+
+    ----------
+    [1] - cursor keys, <End>, <Home>, <PageUp> and <PageDown>

gradle.properties

@@ -1,9 +1,16 @@
-ideaVersion IC-2018.2.5
-downloadIdeaSources true
-instrumentPluginCode true
-version SNAPSHOT
-javaVersion 1.8
-kotlinVersion 1.2.71
-publishUsername username
-publishPassword password
-publishChannels eap
+# suppress inspection "UnusedProperty" for whole file
+
+ideaVersion=201-EAP-SNAPSHOT
+downloadIdeaSources=true
+instrumentPluginCode=true
+version=SNAPSHOT
+javaVersion=1.8
+kotlinVersion=1.3.61
+publishUsername=username
+publishToken=token
+publishChannels=eap
+# Since 192 version of IJ java plugin should be defined separately
+# Set this value to true if you are going to run tests under idea version < 192
+legacyNoJavaPlugin=false
+
+slackUrl=

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Dec 29 11:00:46 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -1,84 +1,100 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

index.txt

@@ -1,191 +0,0 @@
-*index.txt*
-
-
-                  IDEAVIM REFERENCE MANUAL       based on Vim Reference Manual
-
-                                                                *index*
-This file contains a list of commands that are covered with tests, for each
-mode, with a tag and a short description. The lists are sorted on ASCII value.
-
-Tip: When looking for certain functionality, use a search command.  E.g.,
-to look for deleting something, use: "/delete".
-
-1. Insert mode                          |insert-index|
-2. Normal mode                          |normal-index|
-   2.1. Text objects                    |objects|
-   2.3. Square bracket commands         |[|
-3. Visual mode                          |visual-index|
-5. EX commands                          |ex-cmd-index|
-
-==============================================================================
-1. Insert mode                                          *insert-index*
-
-tag             char            action in Insert mode   ~
------------------------------------------------------------------------
-|i_CTRL-K|      CTRL-K {char1} {char2}
-                                enter digraph
-|i_CTRL-O|      CTRL-O          execute a single command and return to insert
-                                mode
-|i_CTRL-R|      CTRL-R {0-9a-z"%#*:=}
-                                insert the contents of a register
-|i_CTRL-W|      CTRL-W          delete word before the cursor
-
-==============================================================================
-2. Normal mode                                          *normal-index*
-
-CHAR     any non-blank character
-WORD     a sequence of non-blank characters
-N        a number entered before the command
-{motion} a cursor movement command
-Nmove    the text that is moved over with a {motion}
-SECTION  a section that possibly starts with '}' instead of '{'
-
-note: 1 = cursor movement command; 2 = can be undone/redone
-
-tag             char          note action in Normal mode        ~
-------------------------------------------------------------------------------
-|quote|         "{a-zA-Z0-9.%#:-"}  use register {a-zA-Z0-9.%#:-"} for next
-                                   delete, yank or put (uppercase to append)
-                                   ({.%#:} only work with put)
-|%|             %               1  find the next (curly/square) bracket on
-                                   this line and go to its match, or go to
-                                   matching comment bracket, or go to matching
-                                   preprocessor directive.
-|/|             /{pattern}<CR>  1  search forward for the Nth occurrence of
-                                   {pattern}
-|count|         0               1  cursor to the first char of the line
-|count|         1                  prepend to command to give a count
-|count|         2                       "
-|count|         3                       "
-|count|         4                       "
-|count|         5                       "
-|count|         6                       "
-|count|         7                       "
-|count|         8                       "
-|count|         9                       "
-|F|             F{char}         1  cursor to the Nth occurrence of {char} to
-                                   the left
-|O|             O               2  begin a new line above the cursor and
-                                   insert text, repeat N times
-|P|             ["x]P           2  put the text [from buffer x] before the
-                                   cursor N times
-|T|             T{char}         1  cursor till after Nth occurrence of {char}
-                                   to the left
-|Y|             ["x]Y              yank N lines [into buffer x]; synonym for
-                                   "yy"
-|c|             ["x]c{motion}   2  delete Nmove text [into buffer x] and start
-                                   insert
-|cc|            ["x]cc          2  delete N lines [into buffer x] and start
-|d|             ["x]d{motion}   2  delete Nmove text [into buffer x]
-|f|             f{char}         1  cursor to Nth occurrence of {char} to the
-                                   right
-|i|             i               2  insert text before the cursor N times
-|p|             ["x]p           2  put the text [from register x] after the
-                                   cursor N times
-|q|             q{0-9a-zA-Z"}      record typed characters into named register
-                                   {0-9a-zA-Z"} (uppercase to append)
-|q|             q                  (while recording) stops recording
-|t|             t{char}         1  cursor till before Nth occurrence of {char}
-                                   to the right
-|y|             ["x]y{motion}      yank Nmove text [into buffer x]
-|yy|            ["x]yy             yank N lines [into buffer x]
-|~|             ~               2  'tildeop' off: switch case of N characters
-                                   under cursor and move the cursor N
-                                   characters to the right
-
-==============================================================================
-2.1 Text objects                                                *objects*
-
-These can be used after an operator or in Visual mode to select an object.
-
-tag             command            action in op-pending and Visual mode ~
-------------------------------------------------------------------------------
-|v_aquote|      a"                 double quoted string
-|v_a'|          a'                 single quoted string
-|v_a(|          a(                 same as ab
-|v_a)|          a)                 same as ab
-|v_a<|          a<                 "a <>" from '<' to the matching '>'
-|v_a>|          a>                 same as a<
-|v_aB|          aB                 "a Block" from "[{" to "]}" (with brackets)
-|v_aW|          aW                 "a WORD" (with white space)
-|v_a[|          a[                 "a []" from '[' to the matching ']'
-|v_a]|          a]                 same as a[
-|v_a`|          a`                 string in backticks
-|v_ab|          ab                 "a block" from "[(" to "])" (with braces)
-|v_ap|          ap                 "a paragraph" (with white space)
-|v_as|          as                 "a sentence" (with white space)
-|v_aw|          aw                 "a word" (with white space)
-|v_a{|          a{                 same as aB
-|v_a}|          a}                 same as aB
-|v_iquote|      i"                 double quoted string without the quotes
-|v_i'|          i'                 single quoted string without the quotes
-|v_i(|          i(                 same as ib
-|v_i)|          i)                 same as ib
-|v_i<|          i<                 "inner <>" from '<' to the matching '>'
-|v_i>|          i>                 same as i<
-|v_iB|          iB                 "inner Block" from "[{" and "]}"
-|v_iW|          iW                 "inner WORD"
-|v_i[|          i[                 "inner []" from '[' to the matching ']'
-|v_i]|          i]                 same as i[
-|v_i`|          i`                 string in backticks without the backticks
-|v_ib|          ib                 "inner block" from "[(" to "])"
-|v_ip|          ip                 "inner paragraph"
-|v_is|          is                 "inner sentence"
-|v_iw|          iw                 "inner word"
-|v_i{|          i{                 same as iB
-|v_i}|          i}                 same as iB
-
-==============================================================================
-2.3 Square bracket commands                                     *[* *]*
-
-tag             char          note action in Normal mode        ~
-------------------------------------------------------------------------------
-|[(|            [(              1  cursor N times back to unmatched '('
-|[{|            [{              1  cursor N times back to unmatched '{'
-|])|            ])              1  cursor N times forward to unmatched ')'
-|]}|            ]}              1  cursor N times forward to unmatched '}'
-
-==============================================================================
-2.4 Commands starting with 'g'                                          *g*
-
-tag             char          note action in Normal mode        ~
-------------------------------------------------------------------------------
-|gg|            gg              1  cursor to line N, default first line
-|gi|            gi              2  like "i", but first move to the |'^| mark
-
-==============================================================================
-3. Visual mode                                          *visual-index*
-
-Most commands in Visual mode are the same as in Normal mode.  The ones listed
-here are those that are different.
-
-tag             command       note action in Visual mode        ~
-------------------------------------------------------------------------------
-|v_y|           y                  yank the highlighted area
-
-==============================================================================
-4. Command-line editing                                 *ex-edit-index*
-
-Get to the command-line with the ':', '!', '/' or '?' commands.
-Normal characters are inserted at the current cursor position.
-"Completion" below refers to context-sensitive completion.  It will complete
-file names, tags, commands etc. as appropriate.
-
-tag             command       action in Command-line editing mode       ~
-------------------------------------------------------------------------------
-|c_CTRL-R|      CTRL-R {0-9a-z"%#*:= CTRL-F CTRL-P CTRL-W CTRL-A}
-                                insert the contents of a register or object
-                                under the cursor as if typed
-
-==============================================================================
-5. EX commands                                  *ex-cmd-index*
-
-This is a brief but complete listing of all the ":" commands, without
-mentioning any arguments.  The optional part of the command name is inside [].
-The commands are sorted on the non-optional part of their name.
-
-tag           command         action ~
-------------------------------------------------------------------------------
-|:display|      :di[splay]      display registers
-|:registers|    :reg[isters]    display the contents of registers
-|:substitute|   :s[ubstitute]   find and replace text

resources/META-INF/includes/ApplicationServices.xml

@@ -0,0 +1,23 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.MotionGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.ChangeGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.CommandGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.MarkGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.RegisterGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.FileGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.SearchGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.ProcessGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.MacroGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.DigraphGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.HistoryGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.KeyGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.WindowGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.EditorGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.visual.VisualMotionGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.copy.YankGroup"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.copy.PutGroup"/>
+
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.NotificationService"/>
+  </extensions>
+</idea-plugin>

resources/META-INF/includes/VimActions.xml

@@ -0,0 +1,347 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="IdeaVIM">
+    <!-- Motions -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.tabs.MotionPreviousTabAction" mappingModes="NXO" keys="gT"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.tabs.MotionNextTabAction" mappingModes="NXO" keys="gt"/>
+    <!-- Left/Right -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionColumnAction" mappingModes="NXO" keys="|"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstColumnAction" mappingModes="NXO" keys="0"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstColumnInsertModeAction" mappingModes="I" keys="«Home»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstScreenColumnAction" mappingModes="NXO" keys="g0,g«Home»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstNonSpaceAction" mappingModes="NXO" keys="^"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstScreenNonSpaceAction" mappingModes="NXO" keys="g^"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLastColumnAction" mappingModes="NXO" keys="$"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLastColumnInsertAction" mappingModes="I" keys="«End»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLastScreenColumnAction" mappingModes="NXO" keys="g$,g«End»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLastMatchCharAction" mappingModes="NXO" keys=";"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLastMatchCharReverseAction" mappingModes="NXO" keys="«COMMA»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLastNonSpaceAction" mappingModes="NXO" keys="g_"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftAction" mappingModes="NXO" keys="h"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftInsertModeAction" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftWrapAction" mappingModes="NXO" keys="«BS»,«C-H»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftMatchCharAction" mappingModes="NXO" keys="F"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftTillMatchCharAction" mappingModes="NXO" keys="T"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionMiddleColumnAction" mappingModes="NXO" keys="gm"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionRightAction" mappingModes="NXO" keys="l"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionRightInsertAction" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionRightWrapAction" mappingModes="NXO" keys=" "/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionRightMatchCharAction" mappingModes="NXO" keys="f"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionRightTillMatchCharAction" mappingModes="NXO" keys="t"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionHomeAction" mappingModes="NV" keys="«Home»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionShiftHomeAction" mappingModes="NV" keys="«S-Home»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionEndAction" mappingModes="NVO" keys="«End»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionShiftEndAction" mappingModes="NV" keys="«S-End»"/>
+    <!-- Up/Down -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionDownAction" mappingModes="NXO" keys="j"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionDownCtrlNAction" mappingModes="NXO" keys="«C-N»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionDownNotLineWiseAction" mappingModes="NXO" keys="gj,g«Down»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionDownFirstNonSpaceAction" mappingModes="NXO" keys="+,«C-M»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.EnterNormalAction" mappingModes="NXO" keys="«CR»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionDownLess1FirstNonSpaceAction" mappingModes="NXO" keys="_"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineFirstAction" mappingModes="NXO" keys="gg,«C-Home»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineFirstInsertAction" mappingModes="I" keys="«C-Home»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineLastAction" mappingModes="NXO" keys="G"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineLastEndAction" mappingModes="NXO" keys="«C-End»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineLastEndInsertAction" mappingModes="I" keys="«C-End»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionPercentOrMatchAction" mappingModes="NXO" keys="%"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionUpAction" mappingModes="NXO" keys="k"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionUpCtrlPAction" mappingModes="NXO" keys="«C-P»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionUpNotLineWiseAction" mappingModes="NXO" keys="gk,g«Up»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionUpFirstNonSpaceAction" mappingModes="NXO" keys="-"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionArrowDownAction" mappingModes="NVO"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionArrowUpAction" mappingModes="NVO"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionArrowLeftAction" mappingModes="NXO"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionArrowRightAction" mappingModes="NXO"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.LookupDownAction" mappingModes="I" keys="«C-N»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.LookupUpAction" mappingModes="I" keys="«C-P»"/>
+    <!-- Text -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionCamelEndLeftAction" mappingModes="NXO" keys="]b"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionCamelEndRightAction" mappingModes="NXO" keys="]w"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionCamelLeftAction" mappingModes="NXO" keys="[b"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionCamelRightAction" mappingModes="NXO" keys="[w"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionNthCharacterAction" mappingModes="NXO" keys="go"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionWordEndLeftAction" mappingModes="NXO" keys="ge"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionBigWordEndLeftAction" mappingModes="NXO" keys="gE"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionWordEndRightAction" mappingModes="NXO" keys="e"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionBigWordEndRightAction" mappingModes="NXO" keys="E"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionWordLeftAction" mappingModes="NXO" keys="b"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionWordLeftInsertAction" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionBigWordLeftAction" mappingModes="NXO" keys="B,«C-Left»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionWordRightAction" mappingModes="NXO" keys="w"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionWordRightInsertAction" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionBigWordRightAction" mappingModes="NXO" keys="W,«C-Right»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionSentenceNextStartAction" mappingModes="NXO" keys=")"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionSentencePreviousStartAction" mappingModes="NXO" keys="("/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionSentenceNextEndAction" mappingModes="NXO" keys="g)"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionSentencePreviousEndAction" mappingModes="NXO" keys="g("/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionParagraphNextAction" mappingModes="NXO" keys="}"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionParagraphPreviousAction" mappingModes="NXO" keys="{"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedBraceCloseAction" mappingModes="NXO" keys="]}"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedBraceOpenAction" mappingModes="NXO" keys="[{"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedParenCloseAction" mappingModes="NXO" keys="])"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedParenOpenAction" mappingModes="NXO" keys="[("/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionSectionBackwardEndAction" mappingModes="NXO" keys="[]"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionSectionBackwardStartAction" mappingModes="NXO" keys="[["/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionSectionForwardEndAction" mappingModes="NXO" keys="]]"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionSectionForwardStartAction" mappingModes="NXO" keys="]["/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionMethodPreviousEndAction" mappingModes="NXO" keys="[M"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionMethodPreviousStartAction" mappingModes="NXO" keys="[m"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionMethodNextEndAction" mappingModes="NXO" keys="]M"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.text.MotionMethodNextStartAction" mappingModes="NXO" keys="]m"/>
+    <!-- Text Objects -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterWordAction" mappingModes="XO" keys="aw"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBigWordAction" mappingModes="XO" keys="aW"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerWordAction" mappingModes="XO" keys="iw"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBigWordAction" mappingModes="XO" keys="iW"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockAngleAction" mappingModes="XO" keys="i>,i&lt;"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBraceAction" mappingModes="XO" keys="iB,i{,i}"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBracketAction" mappingModes="XO" keys="i[,i]"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockParenAction" mappingModes="XO" keys="ib,i(,i)"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockDoubleQuoteAction" mappingModes="XO" keys='i"'/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockSingleQuoteAction" mappingModes="XO" keys="i'"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBackQuoteAction" mappingModes="XO" keys="i`"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockTagAction" mappingModes="XO" keys="it"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockAngleAction" mappingModes="XO" keys="a&lt;,a>"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBraceAction" mappingModes="XO" keys="aB,a{,a}"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBracketAction" mappingModes="XO" keys="a[,a]"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockParenAction" mappingModes="XO" keys="ab,a(,a)"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockDoubleQuoteAction" mappingModes="XO" keys='a"'/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockSingleQuoteAction" mappingModes="XO" keys="a'"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBackQuoteAction" mappingModes="XO" keys="a`"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockTagAction" mappingModes="XO" keys="at"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerParagraphAction" mappingModes="XO" keys="ip"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterParagraphAction" mappingModes="XO" keys="ap"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionInnerSentenceAction" mappingModes="XO" keys="is"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.object.MotionOuterSentenceAction" mappingModes="XO" keys="as"/>
+    <!-- Marks -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionMarkAction" mappingModes="NX" keys="m"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkAction" mappingModes="XO" keys="`"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkNoSaveJumpAction" mappingModes="XO" keys="g`"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkLineAction" mappingModes="XO" keys="'"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkLineNoSaveJumpAction" mappingModes="XO" keys="g'"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkAction" mappingModes="N" keys="`"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkNoSaveJumpAction" mappingModes="N" keys="g`"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkLineAction" mappingModes="N" keys="'"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkLineNoSaveJumpAction" mappingModes="N" keys="g'"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionJumpNextAction" mappingModes="N" keys="«C-I»,«Tab»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionJumpPreviousAction" mappingModes="N" keys="«C-O»,«C-T»"/>
+    <!-- Screen -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionFirstScreenLineAction" mappingModes="NXO" keys="H"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionLastScreenLineAction" mappingModes="NXO" keys="L"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionMiddleScreenLineAction" mappingModes="NXO" keys="M"/>
+    <!-- Scroll -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLinePageStartAction" mappingModes="NXO" keys="z+"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLineStartAction" mappingModes="NXO" keys="z«CR»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLineAction" mappingModes="NXO" keys="zt"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollHalfPageDownAction" mappingModes="NXO" keys="«C-D»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollHalfPageUpAction" mappingModes="NXO" keys="«C-U»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLineAction" mappingModes="NXO" keys="zb"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLinePageStartAction" mappingModes="NXO" keys="z^"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLineStartAction" mappingModes="NXO" keys="z-"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLineDownAction" mappingModes="NXO" keys="«C-E»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLineUpAction" mappingModes="NXO" keys="«C-Y»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollMiddleScreenLineAction" mappingModes="NXO" keys="zz"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollMiddleScreenLineStartAction" mappingModes="NXO" keys="z."/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageDownAction" mappingModes="NXO" keys="«C-F»,«PageDown»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageDownInsertModeAction" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageUpAction" mappingModes="NXO" keys="«C-B»,«PageUp»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageUpInsertModeAction" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenColumnAction" mappingModes="NXO" keys="zs"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenColumnAction" mappingModes="NXO" keys="ze"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollColumnLeftAction" mappingModes="NXO" keys="zl,z«Right»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollColumnRightAction" mappingModes="NXO" keys="zh,z«Left»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionShiftDownAction" mappingModes="NV" keys="«S-Down»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.updown.MotionShiftUpAction" mappingModes="NV" keys="«S-Up»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionShiftRightAction" mappingModes="NV" keys="«S-Right»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.leftright.MotionShiftLeftAction" mappingModes="NV" keys="«S-Left»"/>
+    <!-- Visual -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.visual.VisualExitModeAction" mappingModes="X" keys="«Esc»,«C-[»,«C-C»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.visual.VisualToggleCharacterModeAction" mappingModes="NX" keys="v"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.visual.VisualToggleLineModeAction" mappingModes="NX" keys="V"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.visual.VisualToggleBlockModeAction" mappingModes="NX" keys="«C-q»,«C-v»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.visual.VisualSwapEndsAction" mappingModes="X" keys="o"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.visual.VisualSwapEndsBlockAction" mappingModes="X" keys="O"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.visual.VisualSelectPreviousAction" mappingModes="N" keys="gv"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.visual.VisualSwapSelectionsAction" mappingModes="X" keys="gv"/>
+
+    <!-- Select-->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.SelectEnableCharacterModeAction" mappingModes="N" keys="gh"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.SelectEnableLineModeAction" mappingModes="N" keys="gH"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.SelectEnableBlockModeAction" mappingModes="N" keys="g«C-h»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.motion.SelectMotionRightAction" mappingModes="S" keys="«Right»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.motion.SelectMotionLeftAction" mappingModes="S" keys="«Left»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.SelectToggleVisualMode" mappingModes="V" keys="«C-G»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.SelectEnterAction" mappingModes="S" keys="«enter»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.SelectEscapeAction" mappingModes="S" keys="«esc»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.select.SelectDeleteAction" mappingModes="S" keys="«BS»,«DEL»"/>
+
+    <!-- Insert -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertAfterCursorAction" mappingModes="N" keys="a"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertAfterLineEndAction" mappingModes="N" keys="A"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertAtPreviousInsertAction" mappingModes="N" keys="gi"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertBeforeCursorAction" mappingModes="N" keys="i,«Insert»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertBeforeFirstNonBlankAction" mappingModes="N" keys="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertCharacterAboveCursorAction" mappingModes="I" keys="«C-Y»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertCharacterBelowCursorAction" mappingModes="I" keys="«C-E»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertDeleteInsertedTextAction" mappingModes="I" keys="«C-U»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertDeletePreviousWordAction" mappingModes="I" keys="«C-W»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertEnterAction" mappingModes="I" keys="«C-M»,«CR»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertExitModeAction" mappingModes="I" keys="«C-[»,«C-C»,«Esc»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertLineStartAction" mappingModes="N" keys="gI"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertNewLineAboveAction" mappingModes="N" keys="O"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertNewLineBelowAction" mappingModes="N" keys="o"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertPreviousInsertAction" mappingModes="I" keys="«C-A»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertPreviousInsertExitAction" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertRegisterAction" mappingModes="I" keys="«C-R»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertInsertAction" mappingModes="I" keys="«Ins»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.InsertSingleCommandAction" mappingModes="I" keys="«C-O»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.VisualBlockInsertAction" mappingModes="X" keys="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.VisualBlockAppendAction" mappingModes="X" keys="A"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.StartInsertDigraphAction" mappingModes="IC" keys="«C-K»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.insert.StartInsertLiteralAction" mappingModes="IC" keys="«C-V»,«C-Q»"/>
+
+    <!-- Delete -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteCharacterAction" mappingModes="N" keys="«DEL»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteCharacterLeftAction" mappingModes="N" keys="X"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteCharacterRightAction" mappingModes="N" keys="x"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteEndOfLineAction" mappingModes="N" keys="D"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteJoinLinesAction" mappingModes="N" keys="gJ"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteJoinLinesSpacesAction" mappingModes="N" keys="J"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteJoinVisualLinesAction" mappingModes="X" keys="gJ"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteJoinVisualLinesSpacesAction" mappingModes="X" keys="J"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteMotionAction" mappingModes="N" keys="d"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteVisualAction" mappingModes="X" keys="d,x,«Del»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteVisualLinesAction" mappingModes="X" keys="X"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.delete.DeleteVisualLinesEndAction" mappingModes="X" keys="D"/>
+
+    <!-- Change -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCaseLowerMotionAction" mappingModes="N" keys="gu"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCaseLowerVisualAction" mappingModes="X" keys="u"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleCharacterAction" mappingModes="N" keys="~"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleMotionAction" mappingModes="N" keys="g~"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleVisualAction" mappingModes="X" keys="~"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCaseUpperMotionAction" mappingModes="N" keys="gU"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCaseUpperVisualAction" mappingModes="X" keys="U"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCharacterAction" mappingModes="N" keys="r"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeCharactersAction" mappingModes="N" keys="s"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeEndOfLineAction" mappingModes="N" keys="C"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeLineAction" mappingModes="N" keys="S"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeMotionAction" mappingModes="N" keys="c"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.number.ChangeNumberIncAction" mappingModes="N" keys="«C-A»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.number.ChangeNumberDecAction" mappingModes="N" keys="«C-X»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.number.ChangeVisualNumberIncAction" mappingModes="X" keys="«C-A»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.number.ChangeVisualNumberDecAction" mappingModes="X" keys="«C-X»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.number.ChangeVisualNumberAvalancheIncAction" mappingModes="X" keys="g«C-A»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.number.ChangeVisualNumberAvalancheDecAction" mappingModes="X" keys="g«C-X»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeReplaceAction" mappingModes="N" keys="R"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeVisualAction" mappingModes="X" keys="c,s"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeVisualCharacterAction" mappingModes="X" keys="r"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeVisualLinesAction" mappingModes="X" keys="R,S"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeVisualLinesEndAction" mappingModes="X" keys="C"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.FilterMotionAction" mappingModes="N" keys="!"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.FilterVisualLinesAction" mappingModes="X" keys="!"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.AutoIndentLinesVisualAction" mappingModes="X" keys="="/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ReformatCodeVisualAction" mappingModes="X" keys="gq"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ReformatCodeMotionAction" mappingModes="N" keys="gq"/>
+
+    <!-- Shift -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.shift.AutoIndentMotionAction" mappingModes="N" keys="="/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.shift.ShiftLeftLinesAction" mappingModes="I" keys="«C-D»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.shift.ShiftLeftMotionAction" mappingModes="N" keys="&lt;"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.shift.ShiftLeftVisualAction" mappingModes="X" keys="&lt;"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.shift.ShiftRightLinesAction" mappingModes="I" keys="«C-T»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.shift.ShiftRightMotionAction" mappingModes="N" keys=">"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.shift.ShiftRightVisualAction" mappingModes="X" keys=">"/>
+
+    <!-- Copy -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutTextAfterCursorAction" mappingModes="N" keys="p"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorAction" mappingModes="N" keys="P"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutTextAfterCursorNoIndentAction" mappingModes="N" keys="]p"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorNoIndentAction" mappingModes="N" keys="[P,]P,[p"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutTextAfterCursorActionMoveCursor" mappingModes="N" keys="gp"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorActionMoveCursor" mappingModes="N" keys="gP"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.SelectRegisterAction" mappingModes="NXO" keys='"'/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.YankLineAction" mappingModes="N" keys="Y"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.YankMotionAction" mappingModes="N" keys="y"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.YankVisualAction" mappingModes="X" keys="y"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.YankVisualLinesAction" mappingModes="X" keys="Y"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutVisualTextAction" mappingModes="X" keys="p,P"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutVisualTextNoIndentAction" mappingModes="X" keys="[p,]p,]P,[P"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.copy.PutVisualTextMoveCursorAction" mappingModes="X" keys="gp,gP"/>
+
+    <!-- File -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.file.FileSaveCloseAction" mappingModes="N" keys="ZQ,ZZ"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.file.FilePreviousAction" mappingModes="N"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.file.FileGetAsciiAction" mappingModes="N" keys="ga"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.file.FileGetHexAction" mappingModes="N" keys="g8"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.file.FileGetFileInfoAction" mappingModes="N" keys="«C-G»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.file.FileGetLocationInfoAction" mappingModes="NX" keys="g«C-G»"/>
+
+    <!-- Window -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.VerticalSplitAction" mappingModes="N" keys="«C-W»v,«C-W»«C-V»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.HorizontalSplitAction" mappingModes="N" keys="«C-W»s,«C-W»S,«C-W»«C-S»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.CloseWindowAction" mappingModes="N" keys="«C-W»c"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.WindowOnlyAction" mappingModes="N" keys="«C-W»o,«C-W»«C-O»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.WindowNextAction" mappingModes="N" keys="«C-W»w,«C-W»«C-W»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.WindowPrevAction" mappingModes="N" keys="«C-W»W"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.WindowLeftAction" mappingModes="N" keys="«C-W»h,«C-W»«C-H»,«C-W»«Left»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.WindowRightAction" mappingModes="N" keys="«C-W»l,«C-W»«C-L»,«C-W»«Right»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.WindowUpAction" mappingModes="N" keys="«C-W»k,«C-W»«C-K»,«C-W»«Up»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.window.WindowDownAction" mappingModes="N" keys="«C-W»j,«C-W»«C-J»,«C-W»«Down»"/>
+
+    <!-- Search -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.SearchEntryFwdAction" mappingModes="NXO" keys="/"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.SearchEntryRevAction" mappingModes="NXO" keys="?"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.SearchAgainNextAction" mappingModes="NXO" keys="n"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.SearchAgainPreviousAction" mappingModes="NXO" keys="N"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.SearchWholeWordForwardAction" mappingModes="NXO" keys="*"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.SearchWholeWordBackwardAction" mappingModes="NXO" keys="#"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.SearchWordForwardAction" mappingModes="NXO" keys="g*"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.SearchWordBackwardAction" mappingModes="NXO" keys="g#"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.search.GotoDeclarationAction" mappingModes="NX" keys="gD,gd,«C-]»"/>
+
+    <!-- Macro -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.macro.ToggleRecordingAction" mappingModes="NX" keys="q"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.macro.PlaybackRegisterAction" mappingModes="N" keys="@"/>
+
+    <!-- Command Line -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.ex.ProcessExEntryAction" mappingModes="C"/>
+
+    <!-- Other -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeLastSearchReplaceAction" mappingModes="N" keys="&amp;"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.change.ChangeLastGlobalSearchReplaceAction" mappingModes="N" keys="g&amp;"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.RepeatChangeAction" mappingModes="N" keys="."/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.ExEntryAction" mappingModes="NXO" keys=":"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.ResetModeAction" mappingModes="ALL" keys="«C-\»«C-N»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.RedoAction" mappingModes="N" keys="«C-R»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.UndoAction" mappingModes="N"/>
+
+    <!-- Keys -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.change.OperatorAction" mappingModes="N" keys="g@"/>
+
+    <!-- Visual Selection of last Search Pattern (gn) -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.gn.VisualSelectNextSearch" mappingModes="NX" keys="gn"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.gn.VisualSelectPreviousSearch" mappingModes="NX" keys="gN"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.gn.GnNextTextObject" mappingModes="O" keys="gn"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.gn.GnPreviousTextObject" mappingModes="O" keys="gN"/>
+
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.CtrlDownAction" mappingModes="N" keys="«C-Down»"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.CtrlUpAction" mappingModes="N" keys="«C-Up»"/>
+
+    <!-- Folds -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.fold.VimCollapseAllRegions" mappingModes="NX" keys="zM"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.fold.VimCollapseRegion" mappingModes="NX" keys="zc"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.fold.VimCollapseRegionRecursively" mappingModes="NX" keys="zC"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.fold.VimExpandAllRegions" mappingModes="NX" keys="zR"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.fold.VimExpandRegion" mappingModes="NX" keys="zo"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.fold.VimExpandRegionRecursively" mappingModes="NX" keys="zO"/>
+
+    <!-- Editor Actions -->
+    <vimAction implementation="com.maddyhome.idea.vim.action.editor.VimEditorBackSpace" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.editor.VimEditorDelete" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.editor.VimEditorDown" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.editor.VimEditorTab" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.editor.VimEditorUp" mappingModes="I"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.editor.VimQuickJavaDoc" mappingModes="N" keys="K"/>
+  </extensions>
+</idea-plugin>

resources/META-INF/includes/VimExCommands.xml

@@ -0,0 +1,65 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="IdeaVIM">
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ActionListHandler" names="actionlist"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.AsciiHandler" names="as[cii]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.CmdFilterHandler" names="!"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.CmdHandler" names="com[mand]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.CmdClearHandler" names="comc[lear]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.CopyTextHandler" names="co[py],t"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DelCmdHandler" names="delc[ommand]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DeleteLinesHandler" names="d[elete]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DeleteMarksHandler" names="delm[arks]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DigraphHandler" names="dig[raphs]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DumpLineHandler" names="dump[line]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.EditFileHandler" names="bro[wse],e[dit]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ActionHandler" names="action"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.EchoHandler" names="ec[ho]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ExitHandler" names="qa[ll],quita[ll],wqa[ll],xa[ll]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.FindClassHandler" names="cla[ss]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.FindFileHandler" names="fin[d]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.FindSymbolHandler" names="sym[bol]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.GotoCharacterHandler" names="go[to]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.HelpHandler" names="h[elp]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.HistoryHandler" names="his[tory]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.JoinLinesHandler" names="j[oin]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.JumpsHandler" names="ju[mps]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.LetHandler" names="let"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.MapHandler"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.MarkHandler" names="ma[rk],k"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.MarksHandler" names="marks"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.MoveTextHandler" names="m[ove]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.NextFileHandler" names="n[ext]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.NoHLSearchHandler" names="noh[lsearch]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.OnlyHandler" names="on[ly]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PreviousFileHandler" names="N[ext],prev[ious]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PromptFindHandler" names="pro[mptfind]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PromptReplaceHandler" names="promptr[epl]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PutLinesHandler" names="pu[t]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.QuitHandler" names="q[uit],clo[se],hid[e]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.RedoHandler" names="red[o]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.RegistersHandler" names="di[splay],reg[isters]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.RepeatHandler" names="@"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SelectFileHandler" names="argu[ment]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SelectFirstFileHandler" names="fir[st],rew[ind]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SelectLastFileHandler" names="la[st]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SetHandler" names="se[t]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ShiftLeftHandler"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ShiftRightHandler"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SourceHandler" names="so[urce]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SortHandler" names="sor[t]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SplitHandler" names="vs[plit],sp[lit]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SubstituteHandler" names="s[ubstitute],&amp;,~"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.UndoHandler" names="u[ndo]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WriteAllHandler" names="wa[ll]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WriteHandler" names="w[rite]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WriteNextFileHandler" names="wn[ext]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WritePreviousFileHandler" names="wN[ext],wp[revious]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WriteQuitHandler" names="wq,exi[t],x[it]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.YankLinesHandler" names="y[ank]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ShellHandler" names="sh[ell]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.NextTabHandler" names="tabn[ext]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PreviousTabHandler" names="tabp[revious],tabN[ext]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.TabOnlyHandler" names="tabo[nly]"/>
+    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.BufferListHandler" names="buffers,ls,files"/>
+  </extensions>
+</idea-plugin>

resources/META-INF/includes/VimExtensions.xml

@@ -0,0 +1,9 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="IdeaVIM">
+    <vimExtension implementation="com.maddyhome.idea.vim.extension.surround.VimSurroundExtension"/>
+    <vimExtension implementation="com.maddyhome.idea.vim.extension.multiplecursors.VimMultipleCursorsExtension"/>
+    <vimExtension implementation="com.maddyhome.idea.vim.extension.commentary.CommentaryExtension"/>
+    <vimExtension implementation="com.maddyhome.idea.vim.extension.textobjentire.VimTextObjEntireExtension"/>
+    <vimExtension implementation="com.maddyhome.idea.vim.extension.argtextobj.VimArgTextObjExtension"/>
+  </extensions>
+</idea-plugin>

resources/META-INF/plugin.xml

@@ -1,35 +1,11 @@
-<idea-plugin url="http://plugins.jetbrains.com/plugin/164">
+<idea-plugin url="https://plugins.jetbrains.com/plugin/164" xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>IdeaVim</name>
   <id>IdeaVIM</id>
   <change-notes><![CDATA[
-      <p>0.50:</p>
       <ul>
-        <li>Moved "Vim Emulation" settings into "File | Settings | Editor"</li>
-        <li>Support for vim-multiple-cursors commands <code>&lt;A-n&gt;</code>, <code>&lt;A-x&gt;</code>, <code>&lt;A-p&gt;</code>, <code>g&lt;A-n&gt;</code> (put <code>set multiple-cursors</code> into your ~/.ideavimrc to enable it)</li>
-        <li>Support for running Vim commands for multiple cursors</li>
-        <li>The <a href="https://github.com/JetBrains/ideavim/blob/master/src/com/maddyhome/idea/vim/package-info.java">index of supported commands</a> on the GitHub page</li>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.49:</p>
-      <ul>
-        <li>Enabled zero-latency typing for Vim emulation</li>
-        <li>Support for <code>iskeyword</code> option</li>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.48:</p>
-      <ul>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.47:</p>
-      <ul>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.46:</p>
-      <ul>
-        <li>Support for <code>incsearch</code> option for showing search results while typing</li>
-        <li>Support for <code>it</code> and <code>at</code> tag block selection</li>
-        <li>Support for vim-surround commands <code>ys</code>, <code>cs</code>, <code>ds</code>, <code>S</code>, enable it with <code>set surround</code> in your ~/.ideavimrc</li>
-        <li>Support for <code>={motion}</code> formatting command</li>
+        <li>Support argtextobj.vim plugin emulation</li>
+        <li>Support vim-textobj-entire plugin emulation</li>
+        <li>Support ls/buffers/files command</li>
         <li>Various bug fixes</li>
       </ul>
       <p>See also the complete <a href="https://github.com/JetBrains/ideavim/blob/master/CHANGES.md">changelog</a>.</p>
@@ -40,13 +16,15 @@
       <p>See also:</p>
       <ul>
         <li><a href="https://github.com/JetBrains/ideavim">GitHub repository</a>: documentation and contributing</li>
-        <li><a href="http://youtrack.jetbrains.com/issues/VIM">Issue tracker</a>: feature requests and bug reports</li>
+        <li><a href="https://youtrack.jetbrains.com/issues/VIM">Issue tracker</a>: feature requests and bug reports</li>
       </ul>
     ]]></description>
   <version>SNAPSHOT</version>
   <vendor>JetBrains</vendor>
 
-  <idea-version since-build="181.0"/>
+  <!-- Please search for "[VERSION UPDATE]" in project in case you update the since-build version -->
+  <!-- Check for [Version Update] tag in YouTrack as well -->
+  <idea-version since-build="183.4284.148"/>
 
   <!-- Mark the plugin as compatible with RubyMine and other products based on the IntelliJ platform -->
   <depends>com.intellij.modules.lang</depends>
@@ -54,306 +32,49 @@
 
   <application-components>
     <component>
-      <implementation-class>com.maddyhome.idea.vim.VimPlugin</implementation-class>
+      <implementation-class>com.maddyhome.idea.vim.DynamicLoaderStopper</implementation-class>
     </component>
   </application-components>
 
   <extensionPoints>
-    <extensionPoint qualifiedName="IdeaVIM.vimExtension" interface="com.maddyhome.idea.vim.extension.VimExtension"/>
+    <extensionPoint name="vimExtension" interface="com.maddyhome.idea.vim.extension.VimExtension" dynamic="true"/>
+
+    <!--    For internal use only -->
+    <extensionPoint name="vimExCommand" beanClass="com.maddyhome.idea.vim.ex.ExBeanClass" dynamic="true">
+      <with attribute="implementation" implements="com.maddyhome.idea.vim.ex.CommandHandler"/>
+    </extensionPoint>
+    <!--    For internal use only -->
+    <extensionPoint name="vimAction" beanClass="com.maddyhome.idea.vim.handler.ActionBeanClass" dynamic="true">
+      <with attribute="implementation" implements="com.maddyhome.idea.vim.handler.EditorActionHandlerBase"/>
+    </extensionPoint>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationConfigurable groupId="editor" instance="com.maddyhome.idea.vim.ui.VimEmulationConfigurable"/>
+    <projectService serviceImplementation="com.maddyhome.idea.vim.group.NotificationService"/>
+    <statusBarWidgetProvider implementation="com.maddyhome.idea.vim.StatusBarIconProvider"/>
+
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.VimLocalConfig"/>
+    <applicationService serviceImplementation="com.maddyhome.idea.vim.VimPlugin"/>
+
+    <postStartupActivity implementation="com.maddyhome.idea.vim.PluginStartup"/>
   </extensions>
 
-  <extensions defaultExtensionNs="IdeaVIM">
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.surround.VimSurroundExtension"/>
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.multiplecursors.VimMultipleCursorsExtension"/>
-  </extensions>
+  <xi:include href="/META-INF/includes/ApplicationServices.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
+  <xi:include href="/META-INF/includes/VimActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/includes/VimExCommands.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/includes/VimExtensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <actions>
-    <action id="VimPluginToggle" class="com.maddyhome.idea.vim.action.VimPluginToggleAction" text="Vim Emulator" description="Toggle the Vim Plugin On/Off">
-      <keyboard-shortcut first-keystroke="control alt V" keymap="$default"/>
+    <action id="VimPluginToggle" class="com.maddyhome.idea.vim.action.VimPluginToggleAction" text="Vim Emulator" description="Toggle the vim plugin On/off">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
 
-    <!-- Motions -->
-    <action id="VimMotionPreviousTab" class="com.maddyhome.idea.vim.action.motion.tabs.MotionPreviousTabAction" text="Move to Previous Tab"/>
-    <action id="VimMotionNextTab" class="com.maddyhome.idea.vim.action.motion.tabs.MotionNextTabAction" text="Move to Next Tab"/>
-    <!-- Left/Right -->
-    <action id="VimMotionColumn" class="com.maddyhome.idea.vim.action.motion.leftright.MotionColumnAction" text="Move to Column"/>
-    <action id="VimMotionFirstColumn" class="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstColumnAction" text="Start of Line"/>
-    <action id="VimMotionFirstScreenColumn" class="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstScreenColumnAction" text="Start of Screen Line"/>
-    <action id="VimMotionFirstNonSpace" class="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstNonSpaceAction" text="First Character of Line"/>
-    <action id="VimMotionFirstScreenNonSpace" class="com.maddyhome.idea.vim.action.motion.leftright.MotionFirstScreenNonSpaceAction" text="First Character of Screen Line"/>
-    <action id="VimMotionLastColumn" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLastColumnAction" text="End of Line"/>
-    <action id="VimMotionLastScreenColumn" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLastScreenColumnAction" text="End of Screen Line"/>
-    <action id="VimMotionLastMatchChar" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLastMatchCharAction" text="Repeat Last Character Match"/>
-    <action id="VimMotionLastMatchCharReverse" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLastMatchCharReverseAction" text="Repeat Last Character Match in Reverse"/>
-    <action id="VimMotionLastNonSpace" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLastNonSpaceAction" text="Last Character of Line"/>
-    <action id="VimMotionLeft" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftAction" text="Left"/>
-    <action id="VimMotionLeftWrap" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftWrapAction" text="Left"/>
-    <action id="VimMotionLeftMatchChar" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftMatchCharAction" text="Move Left to Character"/>
-    <action id="VimMotionLeftTillMatchChar" class="com.maddyhome.idea.vim.action.motion.leftright.MotionLeftTillMatchCharAction" text="Move Left till Character"/>
-    <action id="VimMotionMiddleColumn" class="com.maddyhome.idea.vim.action.motion.leftright.MotionMiddleColumnAction" text="Middle of Screen"/>
-    <action id="VimMotionRight" class="com.maddyhome.idea.vim.action.motion.leftright.MotionRightAction" text="Right"/>
-    <action id="VimMotionRightWrap" class="com.maddyhome.idea.vim.action.motion.leftright.MotionRightWrapAction" text="Right"/>
-    <action id="VimMotionRightMatchChar" class="com.maddyhome.idea.vim.action.motion.leftright.MotionRightMatchCharAction" text="Move Right to Character"/>
-    <action id="VimMotionRightTillMatchChar" class="com.maddyhome.idea.vim.action.motion.leftright.MotionRightTillMatchCharAction" text="Move Right till Character"/>
-    <!-- Up/Down -->
-    <action id="VimMotionDown" class="com.maddyhome.idea.vim.action.motion.updown.MotionDownAction" text="Down"/>
-    <action id="VimMotionDownFirstNonSpace" class="com.maddyhome.idea.vim.action.motion.updown.MotionDownFirstNonSpaceAction" text="Down to First non-Space"/>
-    <action id="VimMotionDownLess1FirstNonSpace" class="com.maddyhome.idea.vim.action.motion.updown.MotionDownLess1FirstNonSpaceAction" text="Down to First non-Space"/>
-    <action id="VimMotionGotoLineFirst" class="com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineFirstAction" text="Goto Line"/>
-    <action id="VimMotionGotoLineLast" class="com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineLastAction" text="Goto Line"/>
-    <action id="VimMotionGotoLineLastEnd" class="com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineLastEndAction" text="Goto Line End"/>
-    <action id="VimMotionPercentOrMatch" class="com.maddyhome.idea.vim.action.motion.updown.MotionPercentOrMatchAction" text="Percent Down or Match"/>
-    <action id="VimMotionUp" class="com.maddyhome.idea.vim.action.motion.updown.MotionUpAction" text="Up"/>
-    <action id="VimMotionUpFirstNonSpace" class="com.maddyhome.idea.vim.action.motion.updown.MotionUpFirstNonSpaceAction" text="Up to First non-Space"/>
-    <!-- Text -->
-    <action id="VimMotionCamelEndLeft" class="com.maddyhome.idea.vim.action.motion.text.MotionCamelEndLeftAction" text="Camel Word End Left"/>
-    <action id="VimMotionCamelEndRight" class="com.maddyhome.idea.vim.action.motion.text.MotionCamelEndRightAction" text="Camel Word End Right"/>
-    <action id="VimMotionCamelLeft" class="com.maddyhome.idea.vim.action.motion.text.MotionCamelLeftAction" text="Camel Word Left"/>
-    <action id="VimMotionCamelRight" class="com.maddyhome.idea.vim.action.motion.text.MotionCamelRightAction" text="Camel Word Right"/>
-    <action id="VimMotionNthCharacter" class="com.maddyhome.idea.vim.action.motion.text.MotionNthCharacterAction" text="Nth Character"/>
-    <action id="VimMotionWordEndLeft" class="com.maddyhome.idea.vim.action.motion.text.MotionWordEndLeftAction" text="Word End Left"/>
-    <action id="VimMotionBigWordEndLeft" class="com.maddyhome.idea.vim.action.motion.text.MotionBigWordEndLeftAction" text="BigWord End Left"/>
-    <action id="VimMotionWordEndRight" class="com.maddyhome.idea.vim.action.motion.text.MotionWordEndRightAction" text="Word End Right"/>
-    <action id="VimMotionBigWordEndRight" class="com.maddyhome.idea.vim.action.motion.text.MotionBigWordEndRightAction" text="BigWord End Right"/>
-    <action id="VimMotionWordLeft" class="com.maddyhome.idea.vim.action.motion.text.MotionWordLeftAction" text="Word Left"/>
-    <action id="VimMotionBigWordLeft" class="com.maddyhome.idea.vim.action.motion.text.MotionBigWordLeftAction" text="BigWord Left"/>
-    <action id="VimMotionWordRight" class="com.maddyhome.idea.vim.action.motion.text.MotionWordRightAction" text="Word Right"/>
-    <action id="VimMotionBigWordRight" class="com.maddyhome.idea.vim.action.motion.text.MotionBigWordRightAction" text="BigWord Right"/>
-    <action id="VimMotionSentenceStartNext" class="com.maddyhome.idea.vim.action.motion.text.MotionSentenceNextStartAction" text="Next Sentence Start"/>
-    <action id="VimMotionSentenceStartPrevious" class="com.maddyhome.idea.vim.action.motion.text.MotionSentencePreviousStartAction" text="Previous Sentence Start"/>
-    <action id="VimMotionSentenceEndNext" class="com.maddyhome.idea.vim.action.motion.text.MotionSentenceNextEndAction" text="Next Sentence End"/>
-    <action id="VimMotionSentenceEndPrevious" class="com.maddyhome.idea.vim.action.motion.text.MotionSentencePreviousEndAction" text="Previous Sentence End"/>
-    <action id="VimMotionParagraphNext" class="com.maddyhome.idea.vim.action.motion.text.MotionParagraphNextAction" text="Next Paragraph"/>
-    <action id="VimMotionParagraphPrevious" class="com.maddyhome.idea.vim.action.motion.text.MotionParagraphPreviousAction" text="Previous Paragraph"/>
-    <action id="VimMotionUnmatchedBraceClose" class="com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedBraceCloseAction" text="Unmatched }"/>
-    <action id="VimMotionUnmatchedBraceOpen" class="com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedBraceOpenAction" text="Unmatched {"/>
-    <action id="VimMotionUnmatchedParenClose" class="com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedParenCloseAction" text="Unmatched )"/>
-    <action id="VimMotionUnmatchedParenOpen" class="com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedParenOpenAction" text="Unmatched ("/>
-    <action id="VimMotionSectionBackwardEnd" class="com.maddyhome.idea.vim.action.motion.text.MotionSectionBackwardEndAction" text="Section End Backward"/>
-    <action id="VimMotionSectionBackwardStart" class="com.maddyhome.idea.vim.action.motion.text.MotionSectionBackwardStartAction" text="Section Start Backward"/>
-    <action id="VimMotionSectionForwardEnd" class="com.maddyhome.idea.vim.action.motion.text.MotionSectionForwardEndAction" text="Section End Forward"/>
-    <action id="VimMotionSectionForwardStart" class="com.maddyhome.idea.vim.action.motion.text.MotionSectionForwardStartAction" text="Section Start Forward"/>
-    <action id="VimMotionMethodBackwardEnd" class="com.maddyhome.idea.vim.action.motion.text.MotionMethodPreviousEndAction" text="Previous Method End"/>
-    <action id="VimMotionMethodBackwardStart" class="com.maddyhome.idea.vim.action.motion.text.MotionMethodPreviousStartAction" text="Previous Method Start"/>
-    <action id="VimMotionMethodForwardEnd" class="com.maddyhome.idea.vim.action.motion.text.MotionMethodNextEndAction" text="Next Method End"/>
-    <action id="VimMotionMethodForwardStart" class="com.maddyhome.idea.vim.action.motion.text.MotionMethodNextStartAction" text="Next Method Start"/>
-    <!-- Text Objects -->
-    <action id="VimMotionTextOuterWord" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterWordAction" text="Select outer word"/>
-    <action id="VimMotionTextOuterBigWord" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBigWordAction" text="Select outer WORD"/>
-    <action id="VimMotionTextInnerWord" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerWordAction" text="Select inner word"/>
-    <action id="VimMotionTextInnerBigWord" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBigWordAction" text="Select inner WORD"/>
-    <action id="VimMotionInnerBlockAngle" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockAngleAction" text="Select inner &lt; block"/>
-    <action id="VimMotionInnerBlockBrace" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBraceAction" text="Select inner { block"/>
-    <action id="VimMotionInnerBlockBracket" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBracketAction" text="Select inner [ block"/>
-    <action id="VimMotionInnerBlockParen" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockParenAction" text="Select inner ( block"/>
-    <action id="VimMotionInnerBlockDoubleQuote" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockDoubleQuoteAction" text="Select inner double quote block"/>
-    <action id="VimMotionInnerBlockSingleQuote" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockSingleQuoteAction" text="Select inner single quote block"/>
-    <action id="VimMotionInnerBlockBackQuote" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBackQuoteAction" text="Select inner back quote block"/>
-    <action id="VimMotionInnerBlockTag" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockTagAction" text="Select inner &gt;&lt; block &gt;/&lt;"/>
-    <action id="VimMotionOuterBlockAngle" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockAngleAction" text="Select outer &lt; block"/>
-    <action id="VimMotionOuterBlockBrace" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBraceAction" text="Select outer { block"/>
-    <action id="VimMotionOuterBlockBracket" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBracketAction" text="Select outer [ block"/>
-    <action id="VimMotionOuterBlockParen" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockParenAction" text="Select outer ( block"/>
-    <action id="VimMotionOuterBlockDoubleQuote" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockDoubleQuoteAction" text="Select outer double quote block"/>
-    <action id="VimMotionOuterBlockSingleQuote" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockSingleQuoteAction" text="Select outer single quote block"/>
-    <action id="VimMotionOuterBlockBackQuote" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBackQuoteAction" text="Select outer back quote block"/>
-    <action id="VimMotionOuterBlockTag" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockTagAction" text="Select outer &gt;&lt; block &gt;/&lt;"/>
-    <action id="VimMotionInnerParagraph" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerParagraphAction" text="Select Inner Paragraph"/>
-    <action id="VimMotionOuterParagraph" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterParagraphAction" text="Select Outer Paragraph"/>
-    <action id="VimMotionInnerSentence" class="com.maddyhome.idea.vim.action.motion.object.MotionInnerSentenceAction" text="Select Inner Sentence"/>
-    <action id="VimMotionOuterSentence" class="com.maddyhome.idea.vim.action.motion.object.MotionOuterSentenceAction" text="Select Outer Sentence"/>
-    <!-- Marks -->
-    <action id="VimMotionMark" class="com.maddyhome.idea.vim.action.motion.mark.MotionMarkAction" text="Mark"/>
-    <action id="VimMotionGotoFileMark" class="com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkAction" text="Goto Mark"/>
-    <action id="VimMotionGotoFileMarkLine" class="com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkLineAction" text="Goto Mark Line"/>
-    <action id="VimMotionGotoMark" class="com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkAction" text="Goto Mark"/>
-    <action id="VimMotionGotoMarkLine" class="com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkLineAction" text="Goto Mark Line"/>
-    <action id="VimMotionJumpNext" class="com.maddyhome.idea.vim.action.motion.mark.MotionJumpNextAction" text="Goto Next Jump"/>
-    <action id="VimMotionJumpPrevious" class="com.maddyhome.idea.vim.action.motion.mark.MotionJumpPreviousAction" text="Goto Previous Jump"/>
-    <action id="VimForward" class="com.maddyhome.idea.vim.action.motion.mark.MotionJumpNextAction" text="Forward"/>
-    <action id="VimBack" class="com.maddyhome.idea.vim.action.motion.mark.MotionJumpPreviousAction" text="Back"/>
-    <!-- Screen -->
-    <action id="VimMotionFirstScreenLine" class="com.maddyhome.idea.vim.action.motion.screen.MotionFirstScreenLineAction" text="First Screen Line"/>
-    <action id="VimMotionLastScreenLine" class="com.maddyhome.idea.vim.action.motion.screen.MotionLastScreenLineAction" text="Last Screen Line"/>
-    <action id="VimMotionMiddleScreenLine" class="com.maddyhome.idea.vim.action.motion.screen.MotionMiddleScreenLineAction" text="Middle Screen Line"/>
-    <!-- Scroll -->
-    <action id="VimMotionScrollFirstScreenLinePageStart" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLinePageStartAction" text="Scroll Line to Top"/>
-    <action id="VimMotionScrollFirstScreenLineStart" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLineStartAction" text="Scroll Line to Top"/>
-    <action id="VimMotionScrollFirstScreenLine" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLineAction" text="Scroll Line to Top"/>
-    <action id="VimMotionScrollHalfPageDown" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollHalfPageDownAction" text="Scroll Half Page Down"/>
-    <action id="VimMotionScrollHalfPageUp" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollHalfPageUpAction" text="Scroll Half Page Up"/>
-    <action id="VimMotionScrollLastScreenLine" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLineAction" text="Scroll Line to Bottom"/>
-    <action id="VimMotionScrollLastScreenLinePageStart" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLinePageStartAction" text="Scroll Line to Bottom"/>
-    <action id="VimMotionScrollLastScreenLineStart" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLineStartAction" text="Scroll Line to Bottom"/>
-    <action id="VimMotionScrollLineDown" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLineDownAction" text="Scroll Line Down"/>
-    <action id="VimMotionScrollLineUp" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLineUpAction" text="Scroll Line Up"/>
-    <action id="VimMotionScrollMiddleScreenLine" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollMiddleScreenLineAction" text="Scroll Line to Middle"/>
-    <action id="VimMotionScrollMiddleScreenLineStart" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollMiddleScreenLineStartAction" text="Scroll Line to Middle"/>
-    <action id="VimMotionScrollPageDown" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageDownAction" text="Scroll Page Down"/>
-    <action id="VimMotionScrollPageUp" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageUpAction" text="Scroll Page Up"/>
-    <action id="VimMotionScrollFirstScreenColumn" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenColumnAction" text="Scroll Column to first column"/>
-    <action id="VimMotionScrollLastScreenColumn" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenColumnAction" text="Scroll Column to last column"/>
-    <action id="VimMotionScrollColumnLeft" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollColumnLeftAction" text="Scroll Column Left"/>
-    <action id="VimMotionScrollColumnRight" class="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollColumnRightAction" text="Scroll Column Right"/>
-    <!-- Visual -->
-    <action id="VimVisualExitMode" class="com.maddyhome.idea.vim.action.motion.visual.VisualExitModeAction" text="Exit Visual Mode"/>
-    <action id="VimVisualToggleCharacterMode" class="com.maddyhome.idea.vim.action.motion.visual.VisualToggleCharacterModeAction" text="Toggle Character Selection"/>
-    <action id="VimVisualToggleLineMode" class="com.maddyhome.idea.vim.action.motion.visual.VisualToggleLineModeAction" text="Toggle Line Selection"/>
-    <action id="VimVisualToggleBlockMode" class="com.maddyhome.idea.vim.action.motion.visual.VisualToggleBlockModeAction" text="Toggle Block Selection"/>
-    <action id="VimVisualSwapEnds" class="com.maddyhome.idea.vim.action.motion.visual.VisualSwapEndsAction" text="Swap Visual Selection Ends"/>
-    <action id="VimVisualSwapEndsBlock" class="com.maddyhome.idea.vim.action.motion.visual.VisualSwapEndsBlockAction" text="Swap Visual Selection Ends"/>
-    <action id="VimVisualSelectPrevious" class="com.maddyhome.idea.vim.action.motion.visual.VisualSelectPreviousAction" text="Visual Select Previous"/>
-    <action id="VimVisualSwapSelections" class="com.maddyhome.idea.vim.action.motion.visual.VisualSwapSelectionsAction" text="Swap Visual Selection Ends"/>
+    <!-- Internal -->
+    <action id="VimInternalAddInlays" class="com.maddyhome.idea.vim.action.internal.AddInlaysAction" text="Add Test Inlays | IdeaVim Internal" internal="true"/>
 
-    <!-- Insert -->
-    <action id="VimInsertAfterCursor" class="com.maddyhome.idea.vim.action.change.insert.InsertAfterCursorAction" text="Insert After Cursor"/>
-    <action id="VimInsertAfterLineEnd" class="com.maddyhome.idea.vim.action.change.insert.InsertAfterLineEndAction" text="Insert After Line End"/>
-    <action id="VimInsertAtPreviousInsert" class="com.maddyhome.idea.vim.action.change.insert.InsertAtPreviousInsertAction" text="Insert Before Cursor"/>
-    <action id="VimInsertBeforeCursor" class="com.maddyhome.idea.vim.action.change.insert.InsertBeforeCursorAction" text="Insert Before Cursor"/>
-    <action id="VimInsertBeforeFirstNonBlank" class="com.maddyhome.idea.vim.action.change.insert.InsertBeforeFirstNonBlankAction" text="Insert Before First non-Blank"/>
-    <action id="VimInsertCharacterAboveCursor" class="com.maddyhome.idea.vim.action.change.insert.InsertCharacterAboveCursorAction" text="Insert Character Above Cursor"/>
-    <action id="VimInsertCharacterBelowCursor" class="com.maddyhome.idea.vim.action.change.insert.InsertCharacterBelowCursorAction" text="Insert Character Below Cursor"/>
-    <action id="VimInsertDeleteInsertedText" class="com.maddyhome.idea.vim.action.change.insert.InsertDeleteInsertedTextAction" text="Delete Inserted Text"/>
-    <action id="VimInsertDeletePreviousWord" class="com.maddyhome.idea.vim.action.change.insert.InsertDeletePreviousWordAction" text="Delete Previous Word"/>
-    <action id="VimInsertEnter" class="com.maddyhome.idea.vim.action.change.insert.InsertEnterAction" text="Enter"/>
-    <action id="VimInsertExitMode" class="com.maddyhome.idea.vim.action.change.insert.InsertExitModeAction" text="Exit Insert Mode"/>
-    <action id="VimInsertLineStart" class="com.maddyhome.idea.vim.action.change.insert.InsertLineStartAction" text="Insert at Line Start"/>
-    <action id="VimInsertNewLineAbove" class="com.maddyhome.idea.vim.action.change.insert.InsertNewLineAboveAction" text="Insert New Line Above"/>
-    <action id="VimInsertNewLineBelow" class="com.maddyhome.idea.vim.action.change.insert.InsertNewLineBelowAction" text="Insert New Line Below"/>
-    <action id="VimInsertPreviousInsert" class="com.maddyhome.idea.vim.action.change.insert.InsertPreviousInsertAction" text="Insert Previous Text"/>
-    <action id="VimInsertPreviousInsertExit" class="com.maddyhome.idea.vim.action.change.insert.InsertPreviousInsertExitAction" text="Insert Previous Text"/>
-    <action id="VimInsertRegister" class="com.maddyhome.idea.vim.action.change.insert.InsertRegisterAction" text="Insert Register"/>
-    <action id="VimInsertReplaceToggle" class="com.maddyhome.idea.vim.action.change.insert.InsertInsertAction" text="Toggle Insert/Replace"/>
-    <action id="VimInsertSingleCommand" class="com.maddyhome.idea.vim.action.change.insert.InsertSingleCommandAction" text="Execute Command"/>
-    <action id="VimVisualBlockInsert" class="com.maddyhome.idea.vim.action.change.insert.VisualBlockInsertAction" text="Visual Block Insert"/>
-    <action id="VimVisualBlockAppend" class="com.maddyhome.idea.vim.action.change.insert.VisualBlockAppendAction" text="Visual Block Append"/>
-
-    <!-- Delete -->
-    <action id="VimDeleteCharacter" class="com.maddyhome.idea.vim.action.change.delete.DeleteCharacterAction" text="Delete Character"/>
-    <action id="VimDeleteCharacterLeft" class="com.maddyhome.idea.vim.action.change.delete.DeleteCharacterLeftAction" text="Delete Character Left"/>
-    <action id="VimDeleteCharacterRight" class="com.maddyhome.idea.vim.action.change.delete.DeleteCharacterRightAction" text="Delete Character Right"/>
-    <action id="VimDeleteEndOfLine" class="com.maddyhome.idea.vim.action.change.delete.DeleteEndOfLineAction" text="Delete End-of-Line"/>
-    <action id="VimDeleteJoinLines" class="com.maddyhome.idea.vim.action.change.delete.DeleteJoinLinesAction" text="Delete Join Lines"/>
-    <action id="VimDeleteJoinLinesSpaces" class="com.maddyhome.idea.vim.action.change.delete.DeleteJoinLinesSpacesAction" text="Delete Join Lines"/>
-    <action id="VimDeleteJoinVisualLines" class="com.maddyhome.idea.vim.action.change.delete.DeleteJoinVisualLinesAction" text="Delete Join Lines"/>
-    <action id="VimDeleteJoinVisualLinesSpaces" class="com.maddyhome.idea.vim.action.change.delete.DeleteJoinVisualLinesSpacesAction" text="Delete Join Lines"/>
-    <action id="VimDeleteLine" class="com.maddyhome.idea.vim.action.change.delete.DeleteLineAction" text="Delete Line"/>
-    <action id="VimDeleteMotion" class="com.maddyhome.idea.vim.action.change.delete.DeleteMotionAction" text="Delete Motion"/>
-    <action id="VimDeleteVisual" class="com.maddyhome.idea.vim.action.change.delete.DeleteVisualAction" text="Delete Selection"/>
-    <action id="VimDeleteVisualLines" class="com.maddyhome.idea.vim.action.change.delete.DeleteVisualLinesAction" text="Delete Selected Lines"/>
-    <action id="VimDeleteVisualLinesEnd" class="com.maddyhome.idea.vim.action.change.delete.DeleteVisualLinesEndAction" text="Delete Selected Lines"/>
-
-    <!-- Change -->
-    <action id="VimChangeCaseLowerMotion" class="com.maddyhome.idea.vim.action.change.change.ChangeCaseLowerMotionAction" text="Change Motion to Lower Case"/>
-    <action id="VimChangeCaseLowerVisual" class="com.maddyhome.idea.vim.action.change.change.ChangeCaseLowerVisualAction" text="Change Motion to Lower Case"/>
-    <action id="VimChangeCaseToggleCharacter" class="com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleCharacterAction" text="Change Toggle Case"/>
-    <action id="VimChangeCaseToggleMotion" class="com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleMotionAction" text="Change Motion Toggle Case"/>
-    <action id="VimChangeCaseToggleVisual" class="com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleVisualAction" text="Change Motion Toggle Case"/>
-    <action id="VimChangeCaseUpperMotion" class="com.maddyhome.idea.vim.action.change.change.ChangeCaseUpperMotionAction" text="Change Motion to Upper Case"/>
-    <action id="VimChangeCaseUpperVisual" class="com.maddyhome.idea.vim.action.change.change.ChangeCaseUpperVisualAction" text="Change Motion to Upper Case"/>
-    <action id="VimChangeCharacter" class="com.maddyhome.idea.vim.action.change.change.ChangeCharacterAction" text="Change Character"/>
-    <action id="VimChangeCharacters" class="com.maddyhome.idea.vim.action.change.change.ChangeCharactersAction" text="Change Characters"/>
-    <action id="VimChangeEndOfLine" class="com.maddyhome.idea.vim.action.change.change.ChangeEndOfLineAction" text="Change to End-of-Line"/>
-    <action id="VimChangeLine" class="com.maddyhome.idea.vim.action.change.change.ChangeLineAction" text="Change Line"/>
-    <action id="VimChangeMotion" class="com.maddyhome.idea.vim.action.change.change.ChangeMotionAction" text="Change Motion"/>
-    <action id="VimChangeNumberInc" class="com.maddyhome.idea.vim.action.change.change.ChangeNumberIncAction" text="Increment Number"/>
-    <action id="VimChangeNumberDec" class="com.maddyhome.idea.vim.action.change.change.ChangeNumberDecAction" text="Decrement Number"/>
-    <action id="VimChangeReplace" class="com.maddyhome.idea.vim.action.change.change.ChangeReplaceAction" text="Replace"/>
-    <action id="VimChangeVisual" class="com.maddyhome.idea.vim.action.change.change.ChangeVisualAction" text="Change Motion"/>
-    <action id="VimChangeVisualCharacter" class="com.maddyhome.idea.vim.action.change.change.ChangeVisualCharacterAction" text="Change Motion"/>
-    <action id="VimChangeVisualLines" class="com.maddyhome.idea.vim.action.change.change.ChangeVisualLinesAction" text="Change Motion"/>
-    <action id="VimChangeVisualLinesEnd" class="com.maddyhome.idea.vim.action.change.change.ChangeVisualLinesEndAction" text="Change Motion"/>
-    <action id="VimFilterMotion" class="com.maddyhome.idea.vim.action.change.change.FilterMotionAction" text="Filter Lines"/>
-    <action id="VimFilterCountLines" class="com.maddyhome.idea.vim.action.change.change.FilterCountLinesAction" text="Filter Lines"/>
-    <action id="VimFilterVisualLines" class="com.maddyhome.idea.vim.action.change.change.FilterVisualLinesAction" text="Filter Visual Lines"/>
-    <action id="VimAutoIndentVisual" class="com.maddyhome.idea.vim.action.change.change.AutoIndentLinesVisualAction" text="Auto Indent Selection"/>
-    <action id="VimReformatVisual" class="com.maddyhome.idea.vim.action.change.change.ReformatCodeVisualAction" text="Reformat Selection"/>
-
-    <!-- Shift -->
-    <action id="VimAutoIndentLines" class="com.maddyhome.idea.vim.action.change.shift.AutoIndentLinesAction" text="Auto Indent Lines"/>
-    <action id="VimAutoIndentMotion" class="com.maddyhome.idea.vim.action.change.shift.AutoIndentMotionAction" text="Auto Indent Lines"/>
-    <action id="VimShiftLeftLines" class="com.maddyhome.idea.vim.action.change.shift.ShiftLeftLinesAction" text="Shift Lines Left"/>
-    <action id="VimShiftLeftMotion" class="com.maddyhome.idea.vim.action.change.shift.ShiftLeftMotionAction" text="Shift Motion Left"/>
-    <action id="VimShiftLeftVisual" class="com.maddyhome.idea.vim.action.change.shift.ShiftLeftVisualAction" text="Shift Visual Left"/>
-    <action id="VimShiftRightLines" class="com.maddyhome.idea.vim.action.change.shift.ShiftRightLinesAction" text="Shift Lines Right"/>
-    <action id="VimShiftRightMotion" class="com.maddyhome.idea.vim.action.change.shift.ShiftRightMotionAction" text="Shift Motion Right"/>
-    <action id="VimShiftRightVisual" class="com.maddyhome.idea.vim.action.change.shift.ShiftRightVisualAction" text="Shift Visual Right"/>
-
-    <!-- Copy -->
-    <action id="VimCopyPutTextAfterCursor" class="com.maddyhome.idea.vim.action.copy.PutTextAfterCursorAction" text="Put Text"/>
-    <action id="VimCopyPutTextBeforeCursor" class="com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorAction" text="Put Text"/>
-    <action id="VimCopyPutTextAfterCursorNoIndent" class="com.maddyhome.idea.vim.action.copy.PutTextAfterCursorNoIndentAction" text="Put Text"/>
-    <action id="VimCopyPutTextBeforeCursorNoIndent" class="com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorNoIndentAction" text="Put Text"/>
-    <action id="VimCopyPutTextAfterCursorMoveCursor" class="com.maddyhome.idea.vim.action.copy.PutTextAfterCursorActionMoveCursor" text="Put Text"/>
-    <action id="VimCopyPutTextBeforeCursorMoveCursor" class="com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorActionMoveCursor" text="Put Text"/>
-    <action id="VimCopySelectRegister" class="com.maddyhome.idea.vim.action.copy.SelectRegisterAction" text="Select Register"/>
-    <action id="VimCopyYankLine" class="com.maddyhome.idea.vim.action.copy.YankLineAction" text="Yank Line"/>
-    <action id="VimCopyYankMotion" class="com.maddyhome.idea.vim.action.copy.YankMotionAction" text="Yank Motion"/>
-    <action id="VimCopyYankVisual" class="com.maddyhome.idea.vim.action.copy.YankVisualAction" text="Yank Motion"/>
-    <action id="VimCopyYankVisualLines" class="com.maddyhome.idea.vim.action.copy.YankVisualLinesAction" text="Yank Motion"/>
-    <action id="VimVisualPutText" class="com.maddyhome.idea.vim.action.copy.PutVisualTextAction" text="Paste over Selection"/>
-    <action id="VimVisualPutTextNoIndent" class="com.maddyhome.idea.vim.action.copy.PutVisualTextNoIndentAction" text="Paste over Selection"/>
-    <action id="VimVisualPutTextMoveCursor" class="com.maddyhome.idea.vim.action.copy.PutVisualTextMoveCursorAction" text="Paste over Selection"/>
-
-    <!-- File -->
-    <action id="VimFileSaveClose" class="com.maddyhome.idea.vim.action.file.FileSaveCloseAction" text="Save and Close Editor"/>
-    <action id="VimFilePrevious" class="com.maddyhome.idea.vim.action.file.FilePreviousAction" text="Selects Previous Editor"/>
-    <action id="VimFileGetAscii" class="com.maddyhome.idea.vim.action.file.FileGetAsciiAction" text="Get ASCII Info"/>
-    <action id="VimFileGetHex" class="com.maddyhome.idea.vim.action.file.FileGetHexAction" text="Get Hex Info"/>
-    <action id="VimFileGetFileInfo" class="com.maddyhome.idea.vim.action.file.FileGetFileInfoAction" text="Get File Info"/>
-    <action id="VimFileGetLocationInfo" class="com.maddyhome.idea.vim.action.file.FileGetLocationInfoAction" text="Get Location Info"/>
-
-    <!-- Window -->
-    <action id="VimWindowSplitVertical" class="com.maddyhome.idea.vim.action.window.VerticalSplitAction" text="Split window vertically"/>
-    <action id="VimWindowSplitHorizontal" class="com.maddyhome.idea.vim.action.window.HorizontalSplitAction" text="Split window horizontally"/>
-    <action id="VimWindowClose" class="com.maddyhome.idea.vim.action.window.CloseWindowAction" text="Close current window"/>
-    <action id="VimWindowOnly" class="com.maddyhome.idea.vim.action.window.WindowOnlyAction" text="Close all windows except current"/>
-    <action id="VimWindowNext" class="com.maddyhome.idea.vim.action.window.WindowNextAction" text="Select next window"/>
-    <action id="VimWindowPrev" class="com.maddyhome.idea.vim.action.window.WindowPrevAction" text="Select previous window"/>
-    <action id="VimWindowLeft" class="com.maddyhome.idea.vim.action.window.WindowLeftAction" text="Go to left window"/>
-    <action id="VimWindowRight" class="com.maddyhome.idea.vim.action.window.WindowRightAction" text="Go to right window"/>
-    <action id="VimWindowUp" class="com.maddyhome.idea.vim.action.window.WindowUpAction" text="Go to window up"/>
-    <action id="VimWindowDown" class="com.maddyhome.idea.vim.action.window.WindowDownAction" text="Go to window down"/>
-
-    <!-- Search -->
-    <action id="VimSearchFwdEntry" class="com.maddyhome.idea.vim.action.motion.search.SearchEntryFwdAction" text="Search Forward"/>
-    <action id="VimSearchRevEntry" class="com.maddyhome.idea.vim.action.motion.search.SearchEntryRevAction" text="Search Backward"/>
-    <action id="VimSearchAgainNext" class="com.maddyhome.idea.vim.action.motion.search.SearchAgainNextAction" text="Search Again"/>
-    <action id="VimSearchAgainPrevious" class="com.maddyhome.idea.vim.action.motion.search.SearchAgainPreviousAction" text="Search Again"/>
-    <action id="VimSearchWholeWordForward" class="com.maddyhome.idea.vim.action.motion.search.SearchWholeWordForwardAction" text="Search Again"/>
-    <action id="VimSearchWholeWordBackward" class="com.maddyhome.idea.vim.action.motion.search.SearchWholeWordBackwardAction" text="Search Again"/>
-    <action id="VimSearchWordForward" class="com.maddyhome.idea.vim.action.motion.search.SearchWordForwardAction" text="Search Again"/>
-    <action id="VimSearchWordBackward" class="com.maddyhome.idea.vim.action.motion.search.SearchWordBackwardAction" text="Search Again"/>
-    <action id="VimGotoDeclaration" class="com.maddyhome.idea.vim.action.motion.search.GotoDeclarationAction" text="Goto Declaration"/>
-
-    <!-- Macro -->
-    <action id="VimToggleRecording" class="com.maddyhome.idea.vim.action.macro.ToggleRecordingAction" text="Record Keystrokes"/>
-    <action id="VimPlaybackRegister" class="com.maddyhome.idea.vim.action.macro.PlaybackRegisterAction" text="Playback Register"/>
-    <action id="VimPlaybackLastRegister" class="com.maddyhome.idea.vim.action.macro.PlaybackLastRegisterAction" text="Playback Last Register"/>
-
-    <!-- Command Line -->
-    <action id="VimExBackspace" class="com.maddyhome.idea.vim.action.ex.BackspaceAction" text="Backspace"/>
-    <action id="VimProcessExEntry" class="com.maddyhome.idea.vim.action.ex.ProcessExEntryAction" text="Process Ex Entry"/>
-    <action id="VimProcessExKey" class="com.maddyhome.idea.vim.action.ex.ProcessExKeyAction" text="Process Ex Key"/>
-    <action id="VimCancelExEntry" class="com.maddyhome.idea.vim.action.ex.CancelExEntryAction" text="Cancel Ex Entry"/>
-
-    <!-- Other -->
-    <action id="VimLastSearchReplace" class="com.maddyhome.idea.vim.action.change.change.ChangeLastSearchReplaceAction" text="Repeat Last :s"/>
-    <action id="VimLastGlobalSearchReplace" class="com.maddyhome.idea.vim.action.change.change.ChangeLastGlobalSearchReplaceAction" text="Repeat Last :s"/>
-    <action id="VimRepeatChange" class="com.maddyhome.idea.vim.action.change.RepeatChangeAction" text="Repeat Change"/>
-    <action id="VimRepeatExCommand" class="com.maddyhome.idea.vim.action.change.RepeatExCommandAction" text="Repeat Ex Command"/>
-    <action id="VimExEntry" class="com.maddyhome.idea.vim.action.ExEntryAction" text="Enter Ex Command"/>
-    <action id="VimResetMode" class="com.maddyhome.idea.vim.action.ResetModeAction" text="Reset Mode"/>
-    <action id="VimRedo" class="com.maddyhome.idea.vim.action.change.RedoAction" text="Redo"/>
-    <action id="VimUndo" class="com.maddyhome.idea.vim.action.change.UndoAction" text="Undo"/>
-
-    <!-- Keys -->
     <action id="VimShortcutKeyAction" class="com.maddyhome.idea.vim.action.VimShortcutKeyAction" text="Shortcuts"/>
-    <action id="VimOperatorAction" class="com.maddyhome.idea.vim.action.change.OperatorAction" text="Operator"/>
+    <action id="VimActions" class="com.maddyhome.idea.vim.VimActions" text="Vim Actions"/>
   </actions>
 </idea-plugin>

resources/META-INF/pluginIcon.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <defs>
+    <linearGradient id="ideavim_plugin-a" x1="-6.748%" x2="47.286%" y1="33.61%" y2="85.907%">
+      <stop offset="0%" stop-color="#3BEA62"/>
+      <stop offset="100%" stop-color="#087CFA"/>
+    </linearGradient>
+  </defs>
+  <polygon fill="url(#ideavim_plugin-a)" fill-rule="evenodd" points="28.019 4 15.988 24.119 15.988 4 4 4 4 36 17.953 36 36 4"/>
+</svg>

resources/icons/github.svg

@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path
+      d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/>
+</svg>

resources/icons/ideavim.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 40 40">
+  <defs>
+    <linearGradient id="ideavim_plugin-a" x1="-6.748%" x2="47.286%" y1="33.61%" y2="85.907%">
+      <stop offset="0%" stop-color="#3BEA62"/>
+      <stop offset="100%" stop-color="#087CFA"/>
+    </linearGradient>
+  </defs>
+  <polygon fill="url(#ideavim_plugin-a)" fill-rule="evenodd" points="28.019 4 15.988 24.119 15.988 4 4 4 4 36 17.953 36 36 4"/>
+</svg>

resources/icons/ideavim_disabled.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 40 40">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="28.019 4 15.988 24.119 15.988 4 4 4 4 36 17.953 36 36 4"/>
+</svg>

resources/icons/ideavim_disabled_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 40 40">
+  <polygon fill="#AFB1B3" fill-rule="evenodd" points="28.019 4 15.988 24.119 15.988 4 4 4 4 36 17.953 36 36 4"/>
+</svg>

resources/icons/twitter.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26" width="16" height="16" fill="#000000">
+  <path fill="#1DA1F2" d="M 25.855469 5.574219 C 24.914063 5.992188 23.902344 6.273438 22.839844 6.402344 C 23.921875 5.75 24.757813 4.722656 25.148438 3.496094 C 24.132813 4.097656 23.007813 4.535156 21.8125 4.769531 C 20.855469 3.75 19.492188 3.113281 17.980469 3.113281 C 15.082031 3.113281 12.730469 5.464844 12.730469 8.363281 C 12.730469 8.773438 12.777344 9.175781 12.867188 9.558594 C 8.503906 9.339844 4.636719 7.246094 2.046875 4.070313 C 1.59375 4.847656 1.335938 5.75 1.335938 6.714844 C 1.335938 8.535156 2.261719 10.140625 3.671875 11.082031 C 2.808594 11.054688 2 10.820313 1.292969 10.425781 C 1.292969 10.449219 1.292969 10.46875 1.292969 10.492188 C 1.292969 13.035156 3.101563 15.15625 5.503906 15.640625 C 5.0625 15.761719 4.601563 15.824219 4.121094 15.824219 C 3.78125 15.824219 3.453125 15.792969 3.132813 15.730469 C 3.800781 17.8125 5.738281 19.335938 8.035156 19.375 C 6.242188 20.785156 3.976563 21.621094 1.515625 21.621094 C 1.089844 21.621094 0.675781 21.597656 0.265625 21.550781 C 2.585938 23.039063 5.347656 23.90625 8.3125 23.90625 C 17.96875 23.90625 23.25 15.90625 23.25 8.972656 C 23.25 8.742188 23.246094 8.515625 23.234375 8.289063 C 24.261719 7.554688 25.152344 6.628906 25.855469 5.574219"/>
+</svg>

resources/icons/youtrack.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16" height="16" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.083" y1="16.2945" x2="64.1058" y2="42.2878" gradientTransform="matrix(1 0 0 -1 0 71.0471)">
+				<stop  offset="0" style="stop-color:#7863AB"/>
+				<stop  offset="0.1649" style="stop-color:#6572B6"/>
+				<stop  offset="0.3776" style="stop-color:#538FCC"/>
+				<stop  offset="0.5401" style="stop-color:#3DA5DD"/>
+				<stop  offset="0.6317" style="stop-color:#35ADE3"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_1_);" d="M66.9,47.5c-0.2-0.2-13.1-12.6-13.1-12.6s9.8-10.4,12.4-13c0.8-0.8,1.5-1.6,2-2.6
+				c3.6-6.1,1.5-13.9-4.6-17.5c-4.5-2.6-10.1-2.2-14.1,0.8c-0.7,0.5-1.3,1-1.9,1.6C47.3,4.6,33.7,17,21.9,27.8l22.1,14L20.8,67.9
+				c-1.4,1-2.8,1.6-4.3,1.9c0.3,0,0.5,0,0.8-0.1c4.6-0.7,43.9-7.3,45.8-7.7c2.3-0.4,4.4-1.8,5.7-3.9C71,54.5,70,50,66.9,47.5z"/>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="30.31" y1="42.9162" x2="1.0679" y2="68.7442" gradientTransform="matrix(1 0 0 -1 0 71.0471)">
+				<stop  offset="0" style="stop-color:#7863AB"/>
+				<stop  offset="7.176042e-002" style="stop-color:#895EA7"/>
+				<stop  offset="0.2523" style="stop-color:#C34F9D"/>
+				<stop  offset="0.3901" style="stop-color:#ED3995"/>
+				<stop  offset="0.4677" style="stop-color:#EE3B8B"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_2_);" d="M45.9,30.5c-0.4-2.7-1.8-4.9-3.8-6.5C40,22.4,23.8,5.6,22,3.7C19.2,1,15.2-0.5,11.1,0.2
+				C4.1,1.2-0.8,7.8,0.3,14.8c0.5,3.5,2.5,6.5,5.1,8.4c2.6,2,23,16,24.3,17c2.1,1.6,4.9,2.5,7.7,2C42.9,41.2,46.8,36,45.9,30.5z"/>
+		</g>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="4.9829" y1="12.3617" x2="74.0226" y2="55.8638" gradientTransform="matrix(1 0 0 -1 0 71.0471)">
+			<stop  offset="0" style="stop-color:#7863AB"/>
+			<stop  offset="0.1649" style="stop-color:#6572B6"/>
+			<stop  offset="0.3776" style="stop-color:#538FCC"/>
+			<stop  offset="0.5401" style="stop-color:#3DA5DD"/>
+			<stop  offset="0.6317" style="stop-color:#35ADE3"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_3_);" d="M23,67.8c0.1,0,23.3-26.1,23.3-26.1L22.9,26.9c-8.3,7.6-16,14.5-17.8,16.2
+			c-1.1,1-2.2,2.3-3,3.7c-4.3,7.4-1.8,16.8,5.6,21.1C10.7,69.6,17.5,71.7,23,67.8z"/>
+	</g>
+	<g>
+		<rect x="13.4" y="13.4" style="fill:#231F20;" width="43.2" height="43.2"/>
+		<rect x="17.4" y="48.5" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
+		<polygon style="fill:#FFFFFF;" points="23.8,29.9 17,19.1 21.6,19.1 25.8,26.2 30.2,19.1 34.7,19.1 27.8,29.8 27.8,37 23.8,37 		
+			"/>
+		<polygon style="fill:#FFFFFF;" points="41.6,22.7 36.1,22.7 36.1,19.1 51,19.1 51,22.7 45.5,22.7 45.5,37 41.6,37 		"/>
+	</g>
+</g>
+</svg>

resources/messages.properties

@@ -1,9 +1,29 @@
+#
+# IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+# Copyright (C) 2003-2020 The IdeaVim authors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+
 notexcmd=Not an editor command: {0}
 intbadcmd=Internal error - invalid command: {0}
 e_backslash=E10: \\ should be followed by /, ? or &
 e_badrange=Unexpected character ''{0}'' in range
 e_norange=No range allowed
+e_rangereq=Range required
 e_argreq=Argument required
+e_argforb=Argument forbidden
 e_noprev=E34: No previous command
 e_nopresub=E33: No previous substitute regular expression
 E191=E191: Argument must be a letter or forward/backward quote
@@ -48,4 +68,5 @@ E385=E385: search hit BOTTOM without match for: {0}
 e_patnotf2=Pattern not found: {0}
 unkopt=Unknown option: {0}
 e_invarg=Invalid argument: {0}
+E475=E475: Invalid argument: {0}
 E774=E774: 'operatorfunc' is empty

settings.gradle

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
+ * Copyright (C) 2003-2020 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,18 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.maddyhome.idea.vim.common;
-
-import com.intellij.openapi.editor.LogicalPosition;
-
-/**
- *
- */
-public class CharacterPosition extends LogicalPosition {
-  public CharacterPosition(int line, int col) {
-    super(line, col);
-  }
-}
+rootProject.name = 'IdeaVIM'

src/com/maddyhome/idea/vim/DynamicLoaderStopper.kt

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
+ * Copyright (C) 2003-2020 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,13 +13,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.maddyhome.idea.vim.key;
+package com.maddyhome.idea.vim
 
 /**
- * Marker interface for all key/action tree nodes
+ * This class prevents dynamic loading of IdeaVim plugin
  */
-public interface Node {
-}
+class DynamicLoaderStopper

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
+ * Copyright (C) 2003-2020 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,14 +13,21 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package com.maddyhome.idea.vim;
 
+import com.intellij.codeInsight.lookup.LookupManager;
+import com.intellij.codeInsight.template.TemplateManager;
+import com.intellij.codeInsight.template.TemplateManagerListener;
+import com.intellij.find.FindManager;
+import com.intellij.find.FindModelListener;
+import com.intellij.ide.bookmarks.BookmarksListener;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.ShortcutSet;
+import com.intellij.openapi.actionSystem.ex.AnActionListener;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
@@ -30,37 +37,38 @@ import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
 import com.intellij.openapi.editor.event.*;
 import com.intellij.openapi.fileEditor.FileEditorManagerListener;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectManager;
-import com.intellij.openapi.project.ProjectManagerListener;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.util.messages.MessageBusConnection;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseListener;
+import java.beans.PropertyChangeListener;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author vlan
  */
 public class EventFacade {
-  @NotNull private static final EventFacade ourInstance = new EventFacade();
+  private static final @NotNull EventFacade ourInstance = new EventFacade();
 
-  @Nullable private TypedActionHandler myOriginalTypedActionHandler;
+  private @Nullable TypedActionHandler myOriginalTypedActionHandler;
+  private Map<Project, MessageBusConnection> connections = new HashMap<>();
 
   private EventFacade() {
   }
 
-  @NotNull
-  public static EventFacade getInstance() {
+  public static @NotNull EventFacade getInstance() {
     return ourInstance;
   }
 
-  public void addProjectManagerListener(@NotNull ProjectManagerListener listener) {
-    ProjectManager.getInstance().addProjectManagerListener(listener);
-  }
-
-  public void setupTypedActionHandler(@NotNull TypedActionHandler handler) {
+  public void setupTypedActionHandler(@NotNull VimTypedActionHandler handler) {
     final TypedAction typedAction = getTypedAction();
     myOriginalTypedActionHandler = typedAction.getRawHandler();
+
     typedAction.setupRawHandler(handler);
   }
 
@@ -75,15 +83,40 @@ public class EventFacade {
     action.registerCustomShortcutSet(shortcutSet, component);
   }
 
+  public void registerCustomShortcutSet(@NotNull AnAction action, @NotNull ShortcutSet shortcutSet,
+                                        @Nullable JComponent component, @NotNull Disposable disposable) {
+    action.registerCustomShortcutSet(shortcutSet, component, disposable);
+  }
+
   public void unregisterCustomShortcutSet(@NotNull AnAction action, @Nullable JComponent component) {
     action.unregisterCustomShortcutSet(component);
   }
 
-  public void addFileEditorManagerListener(@NotNull Project project, @NotNull FileEditorManagerListener listener) {
-    final MessageBusConnection connection = project.getMessageBus().connect();
+  public void connectFileEditorManagerListener(@NotNull Project project, @NotNull FileEditorManagerListener listener) {
+    final MessageBusConnection connection = getConnection(project);
     connection.subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, listener);
   }
 
+  public void connectAnActionListener(@NotNull Project project, @NotNull AnActionListener listener) {
+    final MessageBusConnection connection = getConnection(project);
+    connection.subscribe(AnActionListener.TOPIC, listener);
+  }
+
+  public void connectTemplateStartedListener(@NotNull Project project, @NotNull TemplateManagerListener listener) {
+    final MessageBusConnection connection = getConnection(project);
+    connection.subscribe(TemplateManager.TEMPLATE_STARTED_TOPIC, listener);
+  }
+
+  public void connectBookmarkListener(@NotNull Project project, @NotNull BookmarksListener bookmarksListener) {
+    final MessageBusConnection connection = getConnection(project);
+    connection.subscribe(BookmarksListener.TOPIC, bookmarksListener);
+  }
+
+  public void connectFindModelListener(@NotNull Project project, @NotNull FindModelListener findModelListener) {
+    final MessageBusConnection connection = getConnection(project);
+    connection.subscribe(FindManager.FIND_MODEL_TOPIC, findModelListener);
+  }
+
   public void addDocumentListener(@NotNull Document document, @NotNull DocumentListener listener) {
     document.addDocumentListener(listener);
   }
@@ -96,6 +129,12 @@ public class EventFacade {
     EditorFactory.getInstance().addEditorFactoryListener(listener, parentDisposable);
   }
 
+  public void removeEditorFactoryListener(@NotNull EditorFactoryListener listener) {
+    // Listener is removed not only if application is disposed
+    //noinspection deprecation
+    EditorFactory.getInstance().removeEditorFactoryListener(listener);
+  }
+
   public void addEditorMouseListener(@NotNull Editor editor, @NotNull EditorMouseListener listener) {
     editor.addEditorMouseListener(listener);
   }
@@ -104,6 +143,14 @@ public class EventFacade {
     editor.removeEditorMouseListener(listener);
   }
 
+  public void addComponentMouseListener(@NotNull Component component, @NotNull MouseListener mouseListener) {
+    component.addMouseListener(mouseListener);
+  }
+
+  public void removeComponentMouseListener(@NotNull Component component, @NotNull MouseListener mouseListener) {
+    component.removeMouseListener(mouseListener);
+  }
+
   public void addEditorMouseMotionListener(@NotNull Editor editor, @NotNull EditorMouseMotionListener listener) {
     editor.addEditorMouseMotionListener(listener);
   }
@@ -120,8 +167,32 @@ public class EventFacade {
     editor.getSelectionModel().removeSelectionListener(listener);
   }
 
-  @NotNull
-  private TypedAction getTypedAction() {
+  public void registerLookupListener(@NotNull Project project, @NotNull PropertyChangeListener propertyChangeListener) {
+    LookupManager.getInstance(project).addPropertyChangeListener(propertyChangeListener, project);
+  }
+
+  public void removeLookupListener(@NotNull Project project, @NotNull PropertyChangeListener propertyChangeListener) {
+    LookupManager.getInstance(project).removePropertyChangeListener(propertyChangeListener);
+  }
+
+  public void disableBusConnection() {
+    connections.values().forEach(MessageBusConnection::disconnect);
+    connections.clear();
+  }
+
+  private MessageBusConnection getConnection(Project project) {
+    if (!connections.containsKey(project)) {
+      final MessageBusConnection connection = project.getMessageBus().connect();
+      connections.put(project, connection);
+      Disposer.register(project, () -> {
+        connection.disconnect();
+        connections.remove(project);
+      });
+    }
+    return connections.get(project);
+  }
+
+  private @NotNull TypedAction getTypedAction() {
     return EditorActionManager.getInstance().getTypedAction();
   }
 }

src/com/maddyhome/idea/vim/PluginStartup.kt

@@ -0,0 +1,48 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.maddyhome.idea.vim
+
+import com.intellij.openapi.project.DumbAware
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.startup.StartupActivity
+import com.maddyhome.idea.vim.listener.VimListenerManager
+
+/**
+ * @author Alex Plate
+ *
+ * [VERSION UPDATE] 193+ Use StartupActivity.DumbAware
+ */
+class PluginStartup : StartupActivity, DumbAware {
+
+  private var firstInitializationOccurred = false
+
+  override fun runActivity(project: Project) {
+    if (firstInitializationOccurred && VimPlugin.isEnabled()) {
+      // This code should be executed on every project open
+      // Project listeners are self-disposable, so there is no need to unregister them on project close
+      VimListenerManager.ProjectListeners.add(project)
+    }
+
+    if (firstInitializationOccurred) return
+    firstInitializationOccurred = true
+
+    // This code should be executed once
+    VimPlugin.getInstance().initialize()
+  }
+}

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
+ * Copyright (C) 2003-2020 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,760 +13,92 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 package com.maddyhome.idea.vim;
 
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
-import com.maddyhome.idea.vim.action.VimCommandAction;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.MappingMode;
+import com.intellij.openapi.extensions.ExtensionPointListener;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.extensions.PluginDescriptor;
 import com.maddyhome.idea.vim.group.KeyGroup;
-import com.maddyhome.idea.vim.key.Shortcut;
+import com.maddyhome.idea.vim.handler.ActionBeanClass;
+import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
+import com.maddyhome.idea.vim.key.MappingOwner;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.event.KeyEvent;
 
 public class RegisterActions {
+
+  public static final ExtensionPointName<ActionBeanClass> VIM_ACTIONS_EP =
+    ExtensionPointName.create("IdeaVIM.vimAction");
+  private static boolean initialRegistration = false;
+
+  static {
+    // IdeaVim doesn't support contribution to VIM_ACTIONS_EP extension point, so technically we can skip this update,
+    //   but let's support dynamic plugins in a more classic way and reload actions on every EP change.
+    // TODO: [VERSION UPDATE] since 191 use
+    //  ExtensionPoint.addExtensionPointListener(ExtensionPointListener<T>, boolean, Disposable)
+    // TODO: [VERSION UPDATE] since 201 use
+    //  ExtensionPoint.addExtensionPointListener(ExtensionPointChangeListener, boolean, Disposable)
+    VIM_ACTIONS_EP.getPoint(null).addExtensionPointListener(new ExtensionPointListener<ActionBeanClass>() {
+      @Override
+      public void extensionAdded(@NotNull ActionBeanClass extension, PluginDescriptor pluginDescriptor) {
+        // Suppress listener before the `VimPlugin.turnOn()` function execution. This logic should be rewritten after
+        //   version update (or earlier).
+        if (!initialRegistration) return;
+        unregisterActions();
+        registerActions();
+      }
+
+      @Override
+      public void extensionRemoved(@NotNull ActionBeanClass extension, PluginDescriptor pluginDescriptor) {
+        if (!initialRegistration) return;
+        unregisterActions();
+        registerActions();
+      }
+    });
+  }
+
   /**
    * Register all the key/action mappings for the plugin.
    */
   public static void registerActions() {
     registerVimCommandActions();
-
-    registerInsertModeActions();
-    registerNormalModeActions();
-    registerNVOModesActions();
-    registerCommandLineActions();
-    registerVariousModesActions();
+    registerEmptyShortcuts();
+    initialRegistration = true;
   }
 
-  private static void registerVimCommandActions() {
-    final ActionManagerEx manager = ActionManagerEx.getInstanceEx();
-    for (String actionId : manager.getPluginActions(VimPlugin.getPluginId())) {
-      final AnAction action = manager.getAction(actionId);
-      if (action instanceof VimCommandAction) {
-        VimPlugin.getKey().registerCommandAction((VimCommandAction)action, actionId);
-      }
+  public static @Nullable EditorActionHandlerBase findAction(@NotNull String id) {
+    return VIM_ACTIONS_EP.extensions().filter(vimActionBean -> vimActionBean.getActionId().equals(id)).findFirst()
+      .map(ActionBeanClass::getAction).orElse(null);
+  }
+
+  public static @NotNull EditorActionHandlerBase findActionOrDie(@NotNull String id) {
+    EditorActionHandlerBase action = findAction(id);
+    if (action == null) throw new RuntimeException("Action " + id + " is not registered");
+    return action;
+  }
+
+  public static void unregisterActions() {
+    KeyGroup keyGroup = VimPlugin.getKeyIfCreated();
+    if (keyGroup != null) {
+      keyGroup.unregisterCommandActions();
     }
   }
 
-  private static void registerVariousModesActions() {
-    final KeyGroup parser = VimPlugin.getKey();
-    parser.registerAction(MappingMode.NV, "VimVisualToggleLineMode", Command.Type.OTHER_READONLY, Command.FLAG_MOT_LINEWISE,
-                          new Shortcut('V'));
-    parser.registerAction(MappingMode.NV, "VimVisualToggleBlockMode", Command.Type.OTHER_READONLY,
-                          Command.FLAG_MOT_BLOCKWISE,
-                          new Shortcut[]{new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_MASK)),
-                            new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_MASK))}
-    );
-    parser.registerAction(MappingMode.NV, "VimMotionMark", Command.Type.OTHER_READONLY, new Shortcut('m'),
-                          Argument.Type.CHARACTER);
-    parser.registerAction(MappingMode.NV, "VimGotoDeclaration", Command.Type.OTHER_READONLY, Command.FLAG_SAVE_JUMP,
-                          new Shortcut[]{new Shortcut("gD"), new Shortcut("gd"),
-                            // TODO: <C-]> is a tag command similar to gD, the tag stack is not implemented
-                            new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, KeyEvent.CTRL_MASK)),}
-    );
-    parser.registerAction(MappingMode.NV, "VimFileGetLocationInfo", Command.Type.OTHER_READONLY, new Shortcut(
-                            new KeyStroke[]{KeyStroke.getKeyStroke('g'),
-                              KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_MASK)})
-    );
-    parser.registerAction(MappingMode.NV, "CollapseAllRegions", Command.Type.OTHER_READONLY, new Shortcut("zM"));
-    parser.registerAction(MappingMode.NV, "CollapseRegion", Command.Type.OTHER_READONLY, new Shortcut("zc"));
-    parser.registerAction(MappingMode.NV, "CollapseRegionRecursively", Command.Type.OTHER_READONLY, new Shortcut("zC"));
-    parser.registerAction(MappingMode.NV, "ExpandAllRegions", Command.Type.OTHER_READONLY, new Shortcut("zR"));
-    parser.registerAction(MappingMode.NV, "ExpandRegion", Command.Type.OTHER_READONLY, new Shortcut("zo"));
-    parser.registerAction(MappingMode.NV, "ExpandRegionRecursively", Command.Type.OTHER_READONLY, new Shortcut("zO"));
-    parser.registerAction(MappingMode.NV, "VimToggleRecording",
-                          Command.Type.OTHER_READONLY,
-                          Command.FLAG_NO_ARG_RECORDING,
-                          new Shortcut('q'), Argument.Type.CHARACTER);
-
-    // Text Object Actions for Visual and Operator Pending Modes
-    parser.registerAction(MappingMode.VO, "VimMotionGotoFileMark", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP, new Shortcut('`'),
-                          Argument.Type.CHARACTER);
-    parser.registerAction(MappingMode.VO, "VimMotionGotoFileMarkLine", Command.Type.MOTION,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP, new Shortcut('\''),
-                          Argument.Type.CHARACTER);
-    parser.registerAction(MappingMode.VO, "VimMotionGotoFileMark", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE,
-                          new Shortcut("g`"), Argument.Type.CHARACTER);
-    parser.registerAction(MappingMode.VO, "VimMotionGotoFileMarkLine", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE,
-                          new Shortcut("g'"), Argument.Type.CHARACTER);
-    parser.registerAction(MappingMode.VO, "VimMotionTextOuterWord", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE, new Shortcut("aw"));
-    parser.registerAction(MappingMode.VO, "VimMotionTextOuterBigWord", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE, new Shortcut("aW"));
-    parser.registerAction(MappingMode.VO, "VimMotionTextInnerWord", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE, new Shortcut("iw"));
-    parser.registerAction(MappingMode.VO, "VimMotionTextInnerBigWord", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE, new Shortcut("iW"));
-    parser.registerAction(MappingMode.VO, "VimMotionInnerParagraph", Command.Type.MOTION,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_TEXT_BLOCK, new Shortcut("ip"));
-    parser.registerAction(MappingMode.VO, "VimMotionOuterParagraph", Command.Type.MOTION,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_TEXT_BLOCK, new Shortcut("ap"));
-    parser.registerAction(MappingMode.VO, "VimMotionInnerSentence",
-                          Command.Type.MOTION,
-                          Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut("is"));
-    parser.registerAction(MappingMode.VO, "VimMotionOuterSentence", Command.Type.MOTION,
-                          Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK, new Shortcut("as"));
-    parser.registerAction(MappingMode.VO, "VimMotionInnerBlockAngle", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("i<"), new Shortcut("i>")}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionInnerBlockBrace", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("iB"), new Shortcut("i{"), new Shortcut("i}")}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionInnerBlockBracket", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("i["), new Shortcut("i]")}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionInnerBlockParen", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("ib"), new Shortcut("i("), new Shortcut("i)")}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionInnerBlockDoubleQuote", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("i\""),}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionInnerBlockSingleQuote", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("i'"),}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionInnerBlockBackQuote", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("i`"),}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionOuterBlockAngle",
-                          Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK, new Shortcut[]{
-        new Shortcut("a<"),
-        new Shortcut("a>")
-      });
-    parser.registerAction(MappingMode.VO, "VimMotionInnerBlockTag", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("it")}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionOuterBlockBrace", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("aB"), new Shortcut("a{"), new Shortcut("a}")}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionOuterBlockBracket", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("a["), new Shortcut("a]")}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionOuterBlockParen", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("ab"), new Shortcut("a("), new Shortcut("a)")}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionOuterBlockDoubleQuote", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("a\""),}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionOuterBlockSingleQuote", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("a'"),}
-    );
-    parser.registerAction(MappingMode.VO, "VimMotionOuterBlockBackQuote", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK, new Shortcut[]{
-      new Shortcut("a`"),
-    });
-    parser.registerAction(MappingMode.VO, "VimMotionOuterBlockTag", Command.Type.MOTION,
-                          Command.FLAG_MOT_CHARACTERWISE | Command.FLAG_MOT_INCLUSIVE | Command.FLAG_TEXT_BLOCK,
-                          new Shortcut[]{new Shortcut("at")}
-    );
-    parser.registerAction(MappingMode.NO, "VimResetMode", Command.Type.RESET, new Shortcut(new KeyStroke[]{
-      KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SLASH, KeyEvent.CTRL_MASK),
-      KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_MASK)
-    }));
+  private static void registerVimCommandActions() {
+    KeyGroup parser = VimPlugin.getKey();
+    VIM_ACTIONS_EP.extensions().forEach(parser::registerCommandAction);
   }
 
-  private static void registerCommandLineActions() {
+  private static void registerEmptyShortcuts() {
     final KeyGroup parser = VimPlugin.getKey();
-    parser
-      .registerAction(MappingMode.C, "VimProcessExEntry", Command.Type.OTHER_READ_WRITE, Command.FLAG_COMPLETE_EX,
-                      new Shortcut[]{new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)),
-                        new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_MASK)),
-                        new Shortcut(KeyStroke.getKeyStroke((char)0x0a)),
-                        new Shortcut(KeyStroke.getKeyStroke((char)0x0d))});
-  }
 
-  /**
-   * Register normal, visual, operator pending modes actions.
-   */
-  private static void registerNVOModesActions() {
-    final KeyGroup parser = VimPlugin.getKey();
-    parser.registerAction(MappingMode.NVO, "VimCopySelectRegister", Command.Type.SELECT_REGISTER, Command.FLAG_EXPECT_MORE,
-                          new Shortcut('"'), Argument.Type.CHARACTER);
-
-    // Motion Actions
-    // TODO - add ['
-    // TODO - add [`
-    // TODO - add ]'
-    // TODO - add ]`
-    // TODO - add zj
-    // TODO - add zk
-
-    parser.registerAction(MappingMode.NVO, "VimMotionNextTab", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut("gt"));
-    parser.registerAction(MappingMode.NVO, "VimMotionPreviousTab", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut("gT"));
-    parser.registerAction(MappingMode.NVO, "VimMotionCamelEndLeft", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut("]b"));
-    parser.registerAction(MappingMode.NVO, "VimMotionCamelEndRight", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut("]w"));
-    parser.registerAction(MappingMode.NVO, "VimMotionCamelLeft", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE,
-                          new Shortcut("[b"));
-    parser.registerAction(MappingMode.NVO, "VimMotionCamelRight", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE,
-                          new Shortcut("[w"));
-    parser.registerAction(MappingMode.NVO, "VimMotionColumn", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE,
-                          new Shortcut('|'));
-    parser.registerAction(MappingMode.NVO, "VimMotionDown", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE, new Shortcut[]{
-      new Shortcut('j'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_MASK)),
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionDown", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut("gj"),
-      new Shortcut(new KeyStroke[]{KeyStroke.getKeyStroke('g'), KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0)})
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionDownFirstNonSpace", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE, new Shortcut[]{
-      new Shortcut('+'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_MASK))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionDownLess1FirstNonSpace", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE,
-                          new Shortcut('_'));
-    parser.registerAction(MappingMode.NVO, "VimMotionFirstColumn", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut('0'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionFirstScreenColumn", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut("g0"),
-      new Shortcut(new KeyStroke[]{KeyStroke.getKeyStroke('g'), KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0)})
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionFirstNonSpace", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut('^')
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionFirstScreenNonSpace", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut("g^")
-    });
-    parser
-      .registerAction(MappingMode.NVO, "VimMotionFirstScreenLine", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut[]{
-                        new Shortcut('H')
-                      });
-    parser
-      .registerAction(MappingMode.NVO, "VimMotionGotoLineFirst", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut[]{
-                        new Shortcut("gg"),
-                        new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_HOME, KeyEvent.CTRL_MASK))
-                      });
-    parser
-      .registerAction(MappingMode.NVO, "VimMotionGotoLineLast", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut('G'));
-    parser
-      .registerAction(MappingMode.NVO, "VimMotionGotoLineLastEnd", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_END, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.NVO, "VimMotionLastColumn", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE, new Shortcut[]{
-      new Shortcut('$'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_END, 0))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionLastScreenColumn", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE, new Shortcut[]{
-      new Shortcut("g$"),
-      new Shortcut(new KeyStroke[]{KeyStroke.getKeyStroke('g'), KeyStroke.getKeyStroke(KeyEvent.VK_END, 0)})
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionLastMatchChar", Command.Type.MOTION,
-                          new Shortcut(';'));
-    parser.registerAction(MappingMode.NVO, "VimMotionLastMatchCharReverse", Command.Type.MOTION,
-                          new Shortcut(','));
-    parser.registerAction(MappingMode.NVO, "VimMotionLastNonSpace", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut("g_"));
-    parser
-      .registerAction(MappingMode.NVO, "VimMotionLastScreenLine", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut('L'));
-    parser.registerAction(MappingMode.NVO, "VimMotionLeft", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut('h'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionLeftMatchChar", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_ALLOW_DIGRAPH,
-                          new Shortcut('F'), Argument.Type.DIGRAPH);
-    parser.registerAction(MappingMode.NVO, "VimMotionLeftTillMatchChar", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_ALLOW_DIGRAPH,
-                          new Shortcut('T'), Argument.Type.DIGRAPH);
-    parser.registerAction(MappingMode.NVO, "VimMotionLeftWrap", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_MASK))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionMiddleColumn", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut("gm"));
-    parser.registerAction(MappingMode.NVO, "VimMotionMiddleScreenLine", Command.Type.MOTION,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut('M'));
-    parser
-      .registerAction(MappingMode.NVO, "VimMotionNthCharacter", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut("go"));
-    // This represents two commands and one is linewise and the other is inclusive - the handler will fix it
-    parser.registerAction(MappingMode.NVO, "VimMotionPercentOrMatch", Command.Type.MOTION, Command.FLAG_SAVE_JUMP,
-                          new Shortcut('%'));
-    parser.registerAction(MappingMode.NVO, "VimMotionRight", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut('l'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionRightMatchChar", Command.Type.MOTION,
-                          Command.FLAG_MOT_INCLUSIVE | Command.FLAG_ALLOW_DIGRAPH,
-                          new Shortcut('f'), Argument.Type.DIGRAPH);
-    parser.registerAction(MappingMode.NVO, "VimMotionRightTillMatchChar", Command.Type.MOTION,
-                          Command.FLAG_MOT_INCLUSIVE | Command.FLAG_ALLOW_DIGRAPH,
-                          new Shortcut('t'), Argument.Type.DIGRAPH);
-    parser.registerAction(MappingMode.NVO, "VimMotionRightWrap", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE,
-                          new Shortcut(' '));
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollFirstScreenLine", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("zt")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollFirstScreenColumn", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("zs")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollFirstScreenLineStart", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut(new KeyStroke[]{KeyStroke.getKeyStroke('z'), KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)})
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollFirstScreenLinePageStart", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("z+")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollHalfPageDown", Command.Type.OTHER_READONLY, Command.FLAG_IGNORE_SCROLL_JUMP,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollHalfPageUp", Command.Type.OTHER_READONLY, Command.FLAG_IGNORE_SCROLL_JUMP,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_U, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollLastScreenLine", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("zb")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollLastScreenColumn", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("ze")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollLastScreenLineStart", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("z-")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollLastScreenLinePageStart", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("z^")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollLineDown", Command.Type.OTHER_READONLY,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollLineUp", Command.Type.OTHER_READONLY,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_Y, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollMiddleScreenLine", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("zz")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollMiddleScreenLineStart", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut("z.")
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollColumnLeft", Command.Type.OTHER_READONLY, Command.FLAG_IGNORE_SIDE_SCROLL_JUMP,
-                          new Shortcut[]{
-                            new Shortcut("zl"),
-                            new Shortcut(new KeyStroke[]{KeyStroke.getKeyStroke('z'), KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0)})
-                          });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollColumnRight", Command.Type.OTHER_READONLY, Command.FLAG_IGNORE_SIDE_SCROLL_JUMP,
-                          new Shortcut[]{
-                            new Shortcut("zh"),
-                            new Shortcut(new KeyStroke[]{KeyStroke.getKeyStroke('z'), KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0)})
-                          });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollPageDown", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.SHIFT_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_F, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionScrollPageUp", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.SHIFT_MASK))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionUp", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE, new Shortcut[]{
-      new Shortcut('k'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_P, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0)),
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionUp", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut("gk"),
-      new Shortcut(new KeyStroke[]{KeyStroke.getKeyStroke('g'), KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0)})
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionUpFirstNonSpace", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE,
-                          new Shortcut('-'));
-    parser.registerAction(MappingMode.NVO, "VimMotionWordEndLeft", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut("ge"));
-    parser.registerAction(MappingMode.NVO, "VimMotionWordEndRight", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut('e'));
-    parser.registerAction(MappingMode.NVO, "VimMotionWordLeft", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut('b'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.SHIFT_MASK))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionWordRight", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut('w'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.SHIFT_MASK))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionBigWordEndLeft", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut("gE"));
-    parser.registerAction(MappingMode.NVO, "VimMotionBigWordEndRight", Command.Type.MOTION, Command.FLAG_MOT_INCLUSIVE,
-                          new Shortcut('E'));
-    parser.registerAction(MappingMode.NVO, "VimMotionBigWordLeft", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut('B'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.CTRL_MASK))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionBigWordRight", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE, new Shortcut[]{
-      new Shortcut('W'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.CTRL_MASK))
-    });
-    parser.registerAction(MappingMode.NVO, "VimMotionSentenceStartPrevious", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut('('));
-    parser.registerAction(MappingMode.NVO, "VimMotionSentenceStartNext", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut(')'));
-    parser.registerAction(MappingMode.NVO, "VimMotionSentenceEndPrevious", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("g("));
-    parser.registerAction(MappingMode.NVO, "VimMotionSentenceEndNext", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("g)"));
-    parser.registerAction(MappingMode.NVO, "VimMotionParagraphPrevious", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut('{'));
-    parser
-      .registerAction(MappingMode.NVO, "VimMotionParagraphNext", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut('}'));
-    parser.registerAction(MappingMode.NVO, "VimMotionUnmatchedBraceOpen", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("[{"));
-    parser.registerAction(MappingMode.NVO, "VimMotionUnmatchedBraceClose", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("]}"));
-    parser.registerAction(MappingMode.NVO, "VimMotionUnmatchedParenOpen", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("[("));
-    parser.registerAction(MappingMode.NVO, "VimMotionUnmatchedParenClose", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("])"));
-    parser.registerAction(MappingMode.NVO, "VimMotionSectionBackwardEnd", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("[]"));
-    parser.registerAction(MappingMode.NVO, "VimMotionSectionBackwardStart", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("[["));
-    parser.registerAction(MappingMode.NVO, "VimMotionSectionForwardEnd", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("]]"));
-    parser.registerAction(MappingMode.NVO, "VimMotionSectionForwardStart", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("]["));
-    parser.registerAction(MappingMode.NVO, "VimMotionMethodBackwardEnd", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("[M"));
-    parser.registerAction(MappingMode.NVO, "VimMotionMethodBackwardStart", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("[m"));
-    parser.registerAction(MappingMode.NVO, "VimMotionMethodForwardEnd", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("]M"));
-    parser.registerAction(MappingMode.NVO, "VimMotionMethodForwardStart", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut("]m"));
-
-    // Misc Actions
-    parser.registerAction(MappingMode.NVO, "VimSearchFwdEntry", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SEARCH_FWD | Command.FLAG_SAVE_JUMP,
-                          new Shortcut('/'), Argument.Type.EX_STRING);
-    parser.registerAction(MappingMode.NVO, "VimSearchRevEntry", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SEARCH_REV | Command.FLAG_SAVE_JUMP,
-                          new Shortcut('?'), Argument.Type.EX_STRING);
-    parser.registerAction(MappingMode.NVO, "VimSearchAgainNext", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut('n'));
-    parser
-      .registerAction(MappingMode.NVO, "VimSearchAgainPrevious", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut('N'));
-    parser.registerAction(MappingMode.NVO, "VimExEntry", Command.Type.OTHER_READ_WRITE,
-                          new Shortcut(':'));
-    parser.registerAction(MappingMode.NVO, "VimSearchWholeWordForward", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut('*'));
-    parser.registerAction(MappingMode.NVO, "VimSearchWholeWordBackward", Command.Type.MOTION,
-                          Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut('#'));
-    parser
-      .registerAction(MappingMode.NVO, "VimSearchWordForward", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut("g*"));
-    parser
-      .registerAction(MappingMode.NVO, "VimSearchWordBackward", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut("g#"));
-  }
-
-  private static void registerNormalModeActions() {
-    final KeyGroup parser = VimPlugin.getKey();
-    // Copy/Paste Actions
-    parser.registerAction(MappingMode.N, "VimCopyPutTextBeforeCursor", Command.Type.PASTE,
-                          new Shortcut('P'));
-    parser.registerAction(MappingMode.N, "VimCopyPutTextAfterCursor", Command.Type.PASTE,
-                          new Shortcut('p'));
-    parser.registerAction(MappingMode.N, "VimCopyPutTextBeforeCursorMoveCursor", Command.Type.PASTE,
-                          new Shortcut("gP"));
-    parser.registerAction(MappingMode.N, "VimCopyPutTextAfterCursorMoveCursor", Command.Type.PASTE,
-                          new Shortcut("gp"));
-    parser.registerAction(MappingMode.N, "VimCopyPutTextBeforeCursorNoIndent", Command.Type.PASTE, new Shortcut[]{
-      new Shortcut("[P"),
-      new Shortcut("]P"),
-      new Shortcut("[p")
-    });
-    parser.registerAction(MappingMode.N, "VimCopyPutTextAfterCursorNoIndent", Command.Type.PASTE, new Shortcut[]{
-      new Shortcut("]p")
-    });
-    parser.registerAction(MappingMode.N, "VimCopyYankLine", Command.Type.COPY,
-                          new Shortcut('Y'));
-    parser.registerAction(MappingMode.N, "VimCopyYankLine", Command.Type.COPY, Command.FLAG_ALLOW_MID_COUNT,
-                          new Shortcut("yy"));
-    parser.registerAction(MappingMode.N, "VimCopyYankMotion", Command.Type.COPY, Command.FLAG_OP_PEND,
-                          new Shortcut('y'), Argument.Type.MOTION);
-
-    // Insert/Replace/Change Actions
-    parser.registerAction(MappingMode.N, "VimChangeCaseLowerMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND,
-                          new Shortcut("gu"), Argument.Type.MOTION);
-    parser.registerAction(MappingMode.N, "VimChangeCaseToggleCharacter", Command.Type.CHANGE,
-                          new Shortcut('~'));
-    parser.registerAction(MappingMode.N, "VimChangeCaseToggleMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND,
-                          new Shortcut("g~"), Argument.Type.MOTION);
-    parser.registerAction(MappingMode.N, "VimChangeCaseUpperMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND,
-                          new Shortcut("gU"), Argument.Type.MOTION);
-    parser.registerAction(MappingMode.N, "VimChangeCharacter", Command.Type.CHANGE, Command.FLAG_ALLOW_DIGRAPH,
-                          new Shortcut('r'), Argument.Type.DIGRAPH);
-    parser
-      .registerAction(MappingMode.N, "VimChangeCharacters", Command.Type.CHANGE, Command.FLAG_NO_REPEAT | Command.FLAG_MULTIKEY_UNDO,
-                      new Shortcut('s'));
-    parser
-      .registerAction(MappingMode.N, "VimChangeEndOfLine", Command.Type.CHANGE, Command.FLAG_NO_REPEAT | Command.FLAG_MULTIKEY_UNDO,
-                      new Shortcut('C'));
-    parser.registerAction(MappingMode.N, "VimChangeLine", Command.Type.CHANGE,
-                          Command.FLAG_NO_REPEAT | Command.FLAG_ALLOW_MID_COUNT | Command.FLAG_MULTIKEY_UNDO, new Shortcut[]{
-        new Shortcut("cc"),
-        new Shortcut('S')
-      });
-    parser.registerAction(MappingMode.N, "VimChangeNumberInc", Command.Type.CHANGE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.N, "VimChangeNumberDec", Command.Type.CHANGE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.N, "VimChangeMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND | Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('c'), Argument.Type.MOTION);
-    parser.registerAction(MappingMode.N, "VimChangeReplace", Command.Type.CHANGE, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('R'));
-    parser.registerAction(MappingMode.N, "VimDeleteCharacter", Command.Type.DELETE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)));
-    parser.registerAction(MappingMode.N, "VimDeleteCharacterLeft", Command.Type.DELETE,
-                          new Shortcut('X'));
-    parser.registerAction(MappingMode.N, "VimDeleteCharacterRight", Command.Type.DELETE,
-                          new Shortcut('x'));
-    parser.registerAction(MappingMode.N, "VimDeleteEndOfLine", Command.Type.DELETE,
-                          new Shortcut('D'));
-    parser.registerAction(MappingMode.N, "VimDeleteJoinLines", Command.Type.DELETE,
-                          new Shortcut("gJ"));
-    parser.registerAction(MappingMode.N, "VimDeleteJoinLinesSpaces", Command.Type.DELETE,
-                          new Shortcut('J'));
-    parser.registerAction(MappingMode.N, "VimDeleteLine", Command.Type.DELETE, Command.FLAG_ALLOW_MID_COUNT,
-                          new Shortcut("dd"));
-    parser.registerAction(MappingMode.N, "VimDeleteMotion", Command.Type.DELETE, Command.FLAG_OP_PEND,
-                          new Shortcut('d'), Argument.Type.MOTION);
-    parser.registerAction(MappingMode.N, "VimFilterCountLines", Command.Type.CHANGE,
-                          new Shortcut("!!"));
-    parser.registerAction(MappingMode.N, "VimFilterMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND,
-                          new Shortcut('!'), Argument.Type.MOTION);
-    parser.registerAction(MappingMode.N, "VimInsertAfterCursor", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('a'));
-    parser.registerAction(MappingMode.N, "VimInsertAfterLineEnd", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('A'));
-    parser.registerAction(MappingMode.N, "VimInsertAtPreviousInsert", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut("gi"));
-    parser.registerAction(MappingMode.N, "VimInsertBeforeFirstNonBlank", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('I'));
-    parser.registerAction(MappingMode.N, "VimInsertLineStart", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut("gI"));
-    parser.registerAction(MappingMode.N, "VimInsertNewLineAbove", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('O'));
-    parser.registerAction(MappingMode.N, "VimInsertNewLineBelow", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('o'));
-    // Motion Actions
-    parser
-      .registerAction(MappingMode.N, "VimMotionGotoMark", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut('`'), Argument.Type.CHARACTER);
-    parser
-      .registerAction(MappingMode.N, "VimMotionGotoMarkLine", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
-                      new Shortcut('\''), Argument.Type.CHARACTER);
-    parser.registerAction(MappingMode.N, "VimMotionGotoMark", Command.Type.MOTION, Command.FLAG_MOT_EXCLUSIVE,
-                          new Shortcut("g`"), Argument.Type.CHARACTER);
-    parser.registerAction(MappingMode.N, "VimMotionGotoMarkLine", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE,
-                          new Shortcut("g'"), Argument.Type.CHARACTER);
-    // Misc Actions
-    parser.registerAction(MappingMode.N, "VimLastSearchReplace", Command.Type.OTHER_WRITABLE,
-                          new Shortcut('&'));
-    parser.registerAction(MappingMode.N, "VimLastGlobalSearchReplace", Command.Type.OTHER_WRITABLE,
-                          new Shortcut("g&"));
-    parser.registerAction(MappingMode.N, "VimRepeatChange", Command.Type.OTHER_WRITABLE,
-                          new Shortcut('.'));
-    parser.registerAction(MappingMode.N, "VimRepeatExCommand", Command.Type.OTHER_WRITABLE,
-                          new Shortcut("@:"));
-    parser.registerAction(MappingMode.N, "QuickJavaDoc", Command.Type.OTHER_READONLY,
-                          new Shortcut('K'));
-    parser.registerAction(MappingMode.N, "VimRedo", Command.Type.OTHER_SELF_SYNCHRONIZED,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.N, "VimUndo", Command.Type.OTHER_SELF_SYNCHRONIZED, new Shortcut[]{
-      new Shortcut('u'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_UNDO, 0))
-    });
-
-    // File Actions
-    parser.registerAction(MappingMode.N, "VimFileSaveClose", Command.Type.OTHER_WRITABLE, new Shortcut[]{
-      new Shortcut("ZQ"),
-      new Shortcut("ZZ")
-    });
-    parser.registerAction(MappingMode.N, "VimFilePrevious", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_6, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_CIRCUMFLEX, KeyEvent.CTRL_MASK))
-    });
-
-    // Shift Actions
-    parser.registerAction(MappingMode.N, "VimAutoIndentLines", Command.Type.CHANGE,
-                          new Shortcut("=="));
-    parser.registerAction(MappingMode.N, "VimAutoIndentMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND,
-                          new Shortcut('='), Argument.Type.MOTION);
-    parser.registerAction(MappingMode.N, "VimShiftLeftLines", Command.Type.CHANGE,
-                          new Shortcut("<<"));
-    parser.registerAction(MappingMode.N, "VimShiftLeftMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND,
-                          new Shortcut('<'), Argument.Type.MOTION);
-    parser.registerAction(MappingMode.N, "VimShiftRightLines", Command.Type.CHANGE,
-                          new Shortcut(">>"));
-    parser.registerAction(MappingMode.N, "VimShiftRightMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND,
-                          new Shortcut('>'), Argument.Type.MOTION);
-
-    // Jump Actions
-
-    parser.registerAction(MappingMode.N, "VimMotionJumpNext", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_I, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0))
-    });
-    parser.registerAction(MappingMode.N, "VimMotionJumpPrevious", Command.Type.OTHER_READONLY,
-                          new Shortcut[] {
-                            new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_MASK)),
-                            // TODO: <C-T> is a tag command similar to <C-O>, the tag stack is not implemented
-                            new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_T, KeyEvent.CTRL_MASK))
-                          });
-
-    parser.registerAction(MappingMode.N, "VimFileGetAscii", Command.Type.OTHER_READONLY,
-                          new Shortcut("ga"));
-    parser.registerAction(MappingMode.N, "VimFileGetHex", Command.Type.OTHER_READONLY,
-                          new Shortcut("g8"));
-    parser.registerAction(MappingMode.N, "VimFileGetFileInfo", Command.Type.OTHER_READONLY,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_MASK)));
-
-    // Macro Actions
-    parser.registerAction(MappingMode.N, "VimPlaybackLastRegister", Command.Type.OTHER_WRITABLE,
-                          new Shortcut("@@"));
-    parser.registerAction(MappingMode.N, "VimPlaybackRegister", Command.Type.OTHER_WRITABLE,
-                          new Shortcut('@'), Argument.Type.CHARACTER);
-    // TODO - support for :map macros
-  }
-
-  private static void registerInsertModeActions() {
-    final KeyGroup parser = VimPlugin.getKey();
-    // Other insert actions
-    parser
-      .registerAction(MappingMode.I, "EditorBackSpace", Command.Type.INSERT, Command.FLAG_IS_BACKSPACE,
-                      new Shortcut[]{new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_MASK)),
-                        new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0))}
-      );
-    parser.registerAction(MappingMode.I, "EditorDelete", Command.Type.INSERT, Command.FLAG_SAVE_STROKE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)));
-    parser.registerAction(MappingMode.I, "EditorDown", Command.Type.INSERT, Command.FLAG_CLEAR_STROKES, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_DOWN, 0))
-    });
-    parser.registerAction(MappingMode.I, "EditorTab", Command.Type.INSERT, Command.FLAG_SAVE_STROKE, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_I, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0))
-    });
-    parser.registerAction(MappingMode.I, "EditorUp", Command.Type.INSERT, Command.FLAG_CLEAR_STROKES, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_UP, 0))
-    });
-    parser.registerAction(MappingMode.I, "VimInsertCharacterAboveCursor", Command.Type.INSERT,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_Y, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimInsertCharacterBelowCursor", Command.Type.INSERT,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimInsertDeleteInsertedText", Command.Type.INSERT, Command.FLAG_CLEAR_STROKES,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_U, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimInsertDeletePreviousWord", Command.Type.INSERT, Command.FLAG_CLEAR_STROKES,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimInsertEnter", Command.Type.INSERT, Command.FLAG_SAVE_STROKE, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0))
-    });
-    parser.registerAction(MappingMode.I, "VimInsertPreviousInsert", Command.Type.INSERT,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimInsertPreviousInsertExit", Command.Type.INSERT, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_2, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_2, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_AT, KeyEvent.CTRL_MASK))
-    });
-    parser.registerAction(MappingMode.I, "VimInsertRegister", Command.Type.INSERT,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_MASK)),
-                          Argument.Type.CHARACTER);
-    parser.registerAction(MappingMode.I, "VimInsertReplaceToggle", Command.Type.INSERT, Command.FLAG_SAVE_STROKE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0)));
-    parser.registerAction(MappingMode.I, "VimInsertSingleCommand", Command.Type.INSERT,
-                          Command.FLAG_CLEAR_STROKES | Command.FLAG_EXPECT_MORE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimMotionFirstColumn", Command.Type.INSERT, Command.FLAG_SAVE_STROKE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0)));
-    parser.registerAction(MappingMode.I, "VimMotionGotoLineFirst", Command.Type.INSERT, Command.FLAG_CLEAR_STROKES,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_HOME, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimMotionGotoLineLastEnd", Command.Type.INSERT, Command.FLAG_CLEAR_STROKES,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_END, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimMotionLastColumn", Command.Type.INSERT, Command.FLAG_SAVE_STROKE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_END, 0)));
-    parser.registerAction(MappingMode.I, "VimMotionLeft", Command.Type.INSERT, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_LEFT, 0))
-    });
-    parser.registerAction(MappingMode.I, "VimMotionRight", Command.Type.INSERT, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_RIGHT, 0))
-    });
-    parser.registerAction(MappingMode.I, "VimMotionScrollPageUp", Command.Type.INSERT, Command.FLAG_CLEAR_STROKES, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_UP, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.SHIFT_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_UP, KeyEvent.SHIFT_MASK))
-    });
-    parser.registerAction(MappingMode.I, "VimMotionScrollPageDown", Command.Type.INSERT, Command.FLAG_CLEAR_STROKES, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_DOWN, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.SHIFT_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_DOWN, KeyEvent.SHIFT_MASK))
-    });
-    parser.registerAction(MappingMode.I, "VimMotionWordLeft", Command.Type.INSERT, Command.FLAG_SAVE_STROKE, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_LEFT, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.SHIFT_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_LEFT, KeyEvent.SHIFT_MASK))
-    });
-    parser.registerAction(MappingMode.I, "VimMotionWordRight", Command.Type.INSERT, Command.FLAG_SAVE_STROKE, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_RIGHT, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.SHIFT_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_KP_RIGHT, KeyEvent.SHIFT_MASK))
-    });
-    parser.registerAction(MappingMode.I, "VimShiftLeftLines", Command.Type.INSERT, Command.FLAG_SAVE_STROKE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_MASK)));
-    parser.registerAction(MappingMode.I, "VimShiftRightLines", Command.Type.INSERT, Command.FLAG_SAVE_STROKE,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_T, KeyEvent.CTRL_MASK)));
+    // The {char1} <BS> {char2} shortcut is handled directly by KeyHandler#handleKey, so doesn't have an action. But we
+    // still need to register the shortcut, to make sure the editor doesn't swallow it.
+    parser.registerShortcutWithoutAction(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), MappingOwner.IdeaVim.INSTANCE);
   }
 }

src/com/maddyhome/idea/vim/StatusBar.kt

@@ -0,0 +1,286 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.maddyhome.idea.vim
+
+import com.intellij.ide.BrowserUtil
+import com.intellij.ide.DataManager
+import com.intellij.ide.plugins.InstalledPluginsState
+import com.intellij.ide.plugins.PluginManager
+import com.intellij.ide.plugins.PluginManagerMain
+import com.intellij.ide.plugins.RepositoryHelper
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.actionSystem.DefaultActionGroup
+import com.intellij.openapi.application.ApplicationInfo
+import com.intellij.openapi.options.ShowSettingsUtil
+import com.intellij.openapi.progress.PerformInBackgroundOption
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.progress.Task
+import com.intellij.openapi.project.DumbAwareAction
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.Messages
+import com.intellij.openapi.ui.popup.JBPopupFactory
+import com.intellij.openapi.ui.popup.ListPopup
+import com.intellij.openapi.updateSettings.impl.PluginDownloader
+import com.intellij.openapi.updateSettings.impl.UpdateChecker
+import com.intellij.openapi.updateSettings.impl.UpdateInstaller
+import com.intellij.openapi.updateSettings.impl.UpdateSettings
+import com.intellij.openapi.util.Ref
+import com.intellij.openapi.wm.StatusBar
+import com.intellij.openapi.wm.StatusBarWidget
+import com.intellij.openapi.wm.StatusBarWidgetProvider
+import com.intellij.ui.awt.RelativePoint
+import com.intellij.util.Consumer
+import com.intellij.util.text.VersionComparatorUtil
+import com.maddyhome.idea.vim.group.NotificationService
+import com.maddyhome.idea.vim.option.IdeaStatusIcon
+import com.maddyhome.idea.vim.option.OptionsManager
+import com.maddyhome.idea.vim.ui.VimEmulationConfigurable
+import icons.VimIcons
+import java.awt.Point
+import java.awt.event.MouseEvent
+import javax.swing.Icon
+import javax.swing.SwingConstants
+
+private class StatusBarIconProvider : StatusBarWidgetProvider {
+  override fun getWidget(project: Project): VimStatusBar? {
+    if (!OptionsManager.ideastatusbar.isSet) return null
+    if (OptionsManager.ideastatusicon.value == IdeaStatusIcon.disabled) return null
+    return VimStatusBar
+  }
+}
+
+object VimStatusBar : StatusBarWidget, StatusBarWidget.IconPresentation {
+
+  private var statusBar: StatusBar? = null
+
+  override fun ID(): String = "IdeaVim-Icon"
+
+  override fun install(statusBar: StatusBar) {
+    this.statusBar = statusBar
+  }
+
+  override fun dispose() {}
+
+  override fun getTooltipText() = "IdeaVim"
+
+  override fun getIcon(): Icon {
+    if (OptionsManager.ideastatusicon.value == IdeaStatusIcon.gray) return VimIcons.IDEAVIM_DISABLED
+    return if (VimPlugin.isEnabled()) VimIcons.IDEAVIM else VimIcons.IDEAVIM_DISABLED
+  }
+
+  override fun getClickConsumer() = Consumer<MouseEvent> { event ->
+    val component = event.component
+    val popup = VimActionsPopup.getPopup(DataManager.getInstance().getDataContext(component))
+    val dimension = popup.content.preferredSize
+
+    val at = Point(0, -dimension.height)
+    popup.show(RelativePoint(component, at))
+  }
+
+  // TODO [VERSION UPDATE] After 193 use `getPresentation()`
+  @Suppress("DEPRECATION", "UnstableApiUsage")
+  override fun getPresentation(type: StatusBarWidget.PlatformType): StatusBarWidget.WidgetPresentation? = this
+
+  fun update() {
+    statusBar?.updateWidget(this.ID())
+  }
+}
+
+class VimActions : DumbAwareAction() {
+
+  companion object {
+    const val actionPlace = "VimActionsPopup"
+  }
+
+  override fun actionPerformed(e: AnActionEvent) {
+    val project = e.project ?: return
+    VimActionsPopup.getPopup(e.dataContext).showCenteredInCurrentWindow(project)
+  }
+
+  override fun update(e: AnActionEvent) {
+    val project = e.project
+    e.presentation.isEnabledAndVisible = project != null && !project.isDisposed
+  }
+}
+
+private object VimActionsPopup {
+  fun getPopup(dataContext: DataContext): ListPopup {
+    val actions = getActions()
+    val popup = JBPopupFactory.getInstance()
+      .createActionGroupPopup("IdeaVim", actions,
+        dataContext, JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, false,
+        VimActions.actionPlace)
+    popup.setAdText("Version ${VimPlugin.getVersion()}", SwingConstants.CENTER)
+
+    return popup
+  }
+
+  private fun getActions(): DefaultActionGroup {
+    val actionGroup = DefaultActionGroup()
+    actionGroup.isPopup = true
+
+    actionGroup.add(ActionManager.getInstance().getAction("VimPluginToggle"))
+    actionGroup.addSeparator()
+    actionGroup.add(NotificationService.OpenIdeaVimRcAction(null))
+    actionGroup.add(ShortcutConflictsSettings)
+    actionGroup.addSeparator()
+
+    val eapGroup = DefaultActionGroup("EAP" + if (JoinEap.eapActive()) " (Active)" else "", true)
+    eapGroup.add(JoinEap)
+    eapGroup.add(HelpLink("About EAP...", "https://github.com/JetBrains/ideavim#get-early-access", null))
+    actionGroup.add(eapGroup)
+
+    val helpGroup = DefaultActionGroup("Contacts && Help", true)
+    helpGroup.add(HelpLink("Contact on Twitter", "https://twitter.com/ideavim", VimIcons.TWITTER))
+    helpGroup.add(HelpLink("Create an Issue", "https://youtrack.jetbrains.com/issues/VIM", VimIcons.YOUTRACK))
+    helpGroup.add(HelpLink("Contribute on GitHub", "https://github.com/JetBrains/ideavim", VimIcons.GITHUB))
+    actionGroup.add(helpGroup)
+
+    return actionGroup
+  }
+}
+
+private class HelpLink(
+  name: String,
+  val link: String,
+  icon: Icon?
+) : DumbAwareAction(name, null, icon) {
+  override fun actionPerformed(e: AnActionEvent) {
+    BrowserUtil.browse(link)
+  }
+}
+
+private object ShortcutConflictsSettings : DumbAwareAction("Settings...") {
+  override fun actionPerformed(e: AnActionEvent) {
+    ShowSettingsUtil.getInstance().editConfigurable(e.project, VimEmulationConfigurable())
+  }
+}
+
+private object JoinEap : DumbAwareAction() {
+  private const val EAP_LINK = "https://plugins.jetbrains.com/plugins/eap/ideavim"
+
+  fun eapActive() = EAP_LINK in UpdateSettings.getInstance().storedPluginHosts
+
+  override fun actionPerformed(e: AnActionEvent) {
+    if (eapActive()) {
+      UpdateSettings.getInstance().storedPluginHosts -= EAP_LINK
+      VimPlugin.getNotifications(e.project).notifyEapFinished()
+    } else {
+      UpdateSettings.getInstance().storedPluginHosts += EAP_LINK
+      checkForUpdates(e.project)
+    }
+  }
+
+  override fun update(e: AnActionEvent) {
+    if (eapActive()) {
+      e.presentation.text = "Finish EAP"
+    } else {
+      e.presentation.text = "Get Early Access..."
+    }
+  }
+
+  private fun checkForUpdates(project: Project?) {
+    val notificator = VimPlugin.getNotifications(project)
+
+    val pluginRef = Ref.create<PluginDownloader>()
+
+    // [VERSION UPDATE] 193+ remove suppressing
+    @Suppress("UnstableApiUsage")
+    object : Task.Backgroundable(null, "Checking for IdeaVim EAP version", true) {
+      override fun run(indicator: ProgressIndicator) {
+        val downloaders = mutableListOf<PluginDownloader>()
+        val build = ApplicationInfo.getInstance().build
+        for (host in RepositoryHelper.getPluginHosts()) {
+          val newPluginDescriptor = RepositoryHelper
+            .loadPlugins(host, null, indicator)
+            .filter { it.pluginId == VimPlugin.getPluginId() }
+            .maxWith(java.util.Comparator { o1, o2 -> VersionComparatorUtil.compare(o1.version, o2.version) })
+            ?: continue
+
+          downloaders += PluginDownloader.createDownloader(newPluginDescriptor, host, build)
+        }
+        val plugin = downloaders.maxWith(java.util.Comparator { o1, o2 -> VersionComparatorUtil.compare(o1.pluginVersion, o2.pluginVersion) })
+        pluginRef.set(plugin)
+      }
+
+      // [VERSION UPDATE] 193+ remove suppressing
+      @Suppress("MissingRecentApi", "UnstableApiUsage")
+      override fun onSuccess() {
+        val downloader: PluginDownloader = pluginRef.get() ?: run {
+          notificator.notifySubscribedToEap()
+          return
+        }
+        val currentVersion = PluginManager.getPlugin(VimPlugin.getPluginId())?.version ?: ""
+        if (VersionComparatorUtil.compare(downloader.pluginVersion, currentVersion) <= 0) {
+          notificator.notifySubscribedToEap()
+          return
+        }
+
+        val version = downloader.pluginVersion
+        val message = "Do you want to install the EAP version of IdeaVim?"
+        @Suppress("MoveVariableDeclarationIntoWhen")
+        val res = Messages.showYesNoCancelDialog(project, message, "IdeaVim $version", null)
+        when (res) {
+          Messages.YES -> updatePlugin(project, downloader)
+          Messages.NO -> notificator.notifySubscribedToEap()
+          Messages.CANCEL -> if (eapActive()) UpdateSettings.getInstance().storedPluginHosts -= EAP_LINK
+        }
+      }
+
+      override fun onCancel() {
+        notificator.notifySubscribedToEap()
+      }
+
+      override fun onThrowable(error: Throwable) {
+        notificator.notifySubscribedToEap()
+      }
+    }.queue()
+  }
+
+  private fun updatePlugin(project: Project?, downloader: PluginDownloader) {
+    val notificator = VimPlugin.getNotifications(project)
+    return object : Task.Backgroundable(null, "Plugin Updates", true, PerformInBackgroundOption.DEAF) {
+      private var updated = false
+      override fun run(indicator: ProgressIndicator) {
+        val state = InstalledPluginsState.getInstance()
+        state.onDescriptorDownload(downloader.descriptor)
+        UpdateChecker.checkAndPrepareToInstall(downloader, state, mutableMapOf(VimPlugin.getPluginId() to downloader), mutableListOf(), indicator)
+        updated = UpdateInstaller.installPluginUpdates(listOf(downloader), indicator)
+      }
+
+      override fun onSuccess() {
+        if (updated) {
+          PluginManagerMain.notifyPluginsUpdated(null)
+        } else {
+          notificator.notifyFailedToDownloadEap()
+        }
+      }
+
+      override fun onCancel() {
+        notificator.notifyFailedToDownloadEap()
+      }
+
+      override fun onThrowable(error: Throwable) {
+        notificator.notifyFailedToDownloadEap()
+      }
+    }.queue()
+  }
+}

src/com/maddyhome/idea/vim/VimLocalConfig.kt

@@ -0,0 +1,56 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.maddyhome.idea.vim
+
+import com.intellij.openapi.components.PersistentStateComponent
+import com.intellij.openapi.components.RoamingType
+import com.intellij.openapi.components.ServiceManager
+import com.intellij.openapi.components.State
+import com.intellij.openapi.components.Storage
+import org.jdom.Element
+
+/**
+ * @author Alex Plate
+ */
+
+@State(name = "VimLocalSettings", storages = [
+  Storage("\$APP_CONFIG$$/vim_local_settings.xml", roamingType = RoamingType.DISABLED, deprecated = true),
+  Storage("\$APP_CONFIG$/vim_local_settings.xml", roamingType = RoamingType.DISABLED, deprecated = true)
+])
+// TODO: 27.01.2020 [VERSION UPDATE] 2019.3 https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_services.html#light-services
+@Deprecated("The data from this class will be stored in vim_settings")
+class VimLocalConfig : PersistentStateComponent<Element> {
+  override fun getState(): Element? = null
+
+  override fun loadState(state: Element) {
+    // This is initialization of state from the legacy configuration structure.
+    // This code should be performed only once on settings migration.
+    //   After the migration is done, the file with settings gets removed and this method won't be called again.
+    VimPlugin.getMark().readData(state)
+    VimPlugin.getRegister().readData(state)
+    VimPlugin.getSearch().readData(state)
+    VimPlugin.getHistory().readData(state)
+  }
+
+  companion object {
+    fun initialize() {
+      ServiceManager.getService(VimLocalConfig::class.java)
+    }
+  }
+}

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
+ * Copyright (C) 2003-2020 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,26 +13,25 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 package com.maddyhome.idea.vim;
 
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
 import com.intellij.ide.util.PropertiesComponent;
-import com.intellij.notification.*;
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationListener;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.ApplicationComponent;
+import com.intellij.openapi.application.PermanentInstallationID;
 import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.actionSystem.EditorActionManager;
-import com.intellij.openapi.editor.actionSystem.TypedAction;
-import com.intellij.openapi.editor.event.EditorFactoryAdapter;
-import com.intellij.openapi.editor.event.EditorFactoryEvent;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.ex.KeymapManagerEx;
@@ -40,9 +39,7 @@ import com.intellij.openapi.keymap.impl.DefaultKeymap;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
-import com.intellij.openapi.project.ProjectManagerAdapter;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.updateSettings.impl.UpdateChecker;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.vfs.CharsetToolkit;
@@ -51,10 +48,15 @@ import com.intellij.openapi.wm.WindowManager;
 import com.intellij.util.io.HttpRequests;
 import com.maddyhome.idea.vim.ex.CommandParser;
 import com.maddyhome.idea.vim.ex.vimscript.VimScriptParser;
+import com.maddyhome.idea.vim.extension.VimExtensionRegistrar;
 import com.maddyhome.idea.vim.group.*;
-import com.maddyhome.idea.vim.helper.DocumentManager;
+import com.maddyhome.idea.vim.group.copy.PutGroup;
+import com.maddyhome.idea.vim.group.copy.YankGroup;
+import com.maddyhome.idea.vim.group.visual.VisualMotionGroup;
 import com.maddyhome.idea.vim.helper.MacKeyRepeat;
-import com.maddyhome.idea.vim.option.Options;
+import com.maddyhome.idea.vim.listener.VimListenerManager;
+import com.maddyhome.idea.vim.option.OptionsManager;
+import com.maddyhome.idea.vim.ui.ExEntryPanel;
 import com.maddyhome.idea.vim.ui.VimEmulationConfigurable;
 import org.jdom.Element;
 import org.jdom.JDOMException;
@@ -68,6 +70,9 @@ import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.concurrent.TimeUnit;
 
+import static com.maddyhome.idea.vim.group.EditorGroup.EDITOR_STORE_ELEMENT;
+import static com.maddyhome.idea.vim.group.KeyGroup.SHORTCUT_CONFLICTS_ELEMENT;
+
 /**
  * This plugin attempts to emulate the key binding and general functionality of Vim and gVim. See the supplied
  * documentation for a complete list of supported and unsupported Vim emulation. The code base contains some debugging
@@ -75,22 +80,17 @@ import java.util.concurrent.TimeUnit;
  * <p/>
  * This is an application level plugin meaning that all open projects will share a common instance of the plugin.
  * Registers and marks are shared across open projects so you can copy and paste between files of different projects.
- *
- * @version 0.1
  */
-@State(
-  name = "VimSettings",
-  storages = {@Storage(file = "$APP_CONFIG$/vim_settings.xml")})
-public class VimPlugin implements ApplicationComponent, PersistentStateComponent<Element> {
-  private static final String IDEAVIM_COMPONENT_NAME = "VimPlugin";
+@State(name = "VimSettings", storages = {@Storage("$APP_CONFIG$/vim_settings.xml")})
+public class VimPlugin implements PersistentStateComponent<Element>, Disposable {
   private static final String IDEAVIM_PLUGIN_ID = "IdeaVIM";
   private static final String IDEAVIM_STATISTICS_TIMESTAMP_KEY = "ideavim.statistics.timestamp";
-  public static final String IDEAVIM_NOTIFICATION_ID = "ideavim";
-  public static final String IDEAVIM_STICKY_NOTIFICATION_ID = "ideavim-sticky";
-  public static final String IDEAVIM_NOTIFICATION_TITLE = "IdeaVim";
-  public static final int STATE_VERSION = 4;
+  private static final int STATE_VERSION = 6;
+
+  private static long lastBeepTimeMillis;
 
   private boolean error = false;
+  private String message = null;
 
   private int previousStateVersion = 0;
   private String previousKeyMap = "";
@@ -100,69 +100,192 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
 
   private static final Logger LOG = Logger.getInstance(VimPlugin.class);
 
-  @NotNull private final MotionGroup motion;
-  @NotNull private final ChangeGroup change;
-  @NotNull private final CopyGroup copy;
-  @NotNull private final MarkGroup mark;
-  @NotNull private final RegisterGroup register;
-  @NotNull private final FileGroup file;
-  @NotNull private final SearchGroup search;
-  @NotNull private final ProcessGroup process;
-  @NotNull private final MacroGroup macro;
-  @NotNull private final DigraphGroup digraph;
-  @NotNull private final HistoryGroup history;
-  @NotNull private final KeyGroup key;
-  @NotNull private final WindowGroup window;
-  @NotNull private final EditorGroup editor;
+  private final @NotNull VimState state = new VimState();
 
-  public VimPlugin() {
-    motion = new MotionGroup();
-    change = new ChangeGroup();
-    copy = new CopyGroup();
-    mark = new MarkGroup();
-    register = new RegisterGroup();
-    file = new FileGroup();
-    search = new SearchGroup();
-    process = new ProcessGroup();
-    macro = new MacroGroup();
-    digraph = new DigraphGroup();
-    history = new HistoryGroup();
-    key = new KeyGroup();
-    window = new WindowGroup();
-    editor = new EditorGroup();
-
-    LOG.debug("VimPlugin ctr");
-  }
-
-  @NotNull
-  @Override
-  public String getComponentName() {
-    return IDEAVIM_COMPONENT_NAME;
-  }
-
-  @Override
-  public void initComponent() {
+  public void initialize() {
     LOG.debug("initComponent");
 
-    Notifications.Bus.register(IDEAVIM_STICKY_NOTIFICATION_ID, NotificationDisplayType.STICKY_BALLOON);
-
-    ApplicationManager.getApplication().invokeLater(new Runnable() {
-      public void run() {
-        updateState();
+    // Initialize a legacy local config.
+    if (previousStateVersion == 5) {
+      //noinspection deprecation
+      VimLocalConfig.Companion.initialize();
+    }
+    if (enabled) {
+      Application application = ApplicationManager.getApplication();
+      if (application.isUnitTestMode()) {
+        application.invokeAndWait(this::turnOnPlugin);
+      } else {
+        application.invokeLater(this::turnOnPlugin);
       }
-    });
+    }
 
-    final TypedAction typedAction = EditorActionManager.getInstance().getTypedAction();
-    EventFacade.getInstance().setupTypedActionHandler(new VimTypedActionHandler(typedAction.getRawHandler()));
+    LOG.debug("done");
+  }
 
-    // Register vim actions in command mode
-    RegisterActions.registerActions();
+  @Override
+  public void dispose() {
+    LOG.debug("disposeComponent");
+    turnOffPlugin();
+    LOG.debug("done");
+  }
 
-    // Add some listeners so we can handle special events
-    setupListeners();
+  /**
+   * @return NotificationService as applicationService if project is null and projectService otherwise
+   */
+  public static @NotNull NotificationService getNotifications(@Nullable Project project) {
+    if (project == null) {
+      return ServiceManager.getService(NotificationService.class);
+    }
+    else {
+      return ServiceManager.getService(project, NotificationService.class);
+    }
+  }
 
-    // Register ex handlers
-    CommandParser.getInstance().registerHandlers();
+  public static @NotNull VimState getVimState() {
+    return getInstance().state;
+  }
+
+
+  public static @NotNull MotionGroup getMotion() {
+    return ServiceManager.getService(MotionGroup.class);
+  }
+
+  /**
+   * Reports statistics about installed IdeaVim and enabled Vim emulation.
+   * <p>
+   * See https://github.com/go-lang-plugin-org/go-lang-idea-plugin/commit/5182ab4a1d01ad37f6786268a2fe5e908575a217
+   */
+  public static void statisticReport() {
+    final PropertiesComponent propertiesComponent = PropertiesComponent.getInstance();
+    final long lastUpdate = propertiesComponent.getOrInitLong(IDEAVIM_STATISTICS_TIMESTAMP_KEY, 0);
+    final boolean outOfDate = lastUpdate == 0 || System.currentTimeMillis() - lastUpdate > TimeUnit.DAYS.toMillis(1);
+    if (outOfDate && isEnabled()) {
+      ApplicationManager.getApplication().executeOnPooledThread(() -> {
+        try {
+          final String buildNumber = ApplicationInfo.getInstance().getBuild().asString();
+          final String version = URLEncoder.encode(getVersion(), CharsetToolkit.UTF8);
+          final String os = URLEncoder.encode(SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION, CharsetToolkit.UTF8);
+          final String uid = PermanentInstallationID.get();
+          final String url = "https://plugins.jetbrains.com/plugins/list" +
+                             "?pluginId=" +
+                             IDEAVIM_PLUGIN_ID +
+                             "&build=" +
+                             buildNumber +
+                             "&pluginVersion=" +
+                             version +
+                             "&os=" +
+                             os +
+                             "&uuid=" +
+                             uid;
+          PropertiesComponent.getInstance()
+            .setValue(IDEAVIM_STATISTICS_TIMESTAMP_KEY, String.valueOf(System.currentTimeMillis()));
+          HttpRequests.request(url).connect(request -> {
+            LOG.info("Sending statistics: " + url);
+            try {
+              JDOMUtil.load(request.getInputStream());
+            }
+            catch (JDOMException e) {
+              LOG.warn(e);
+            }
+            return null;
+          });
+        }
+        catch (IOException e) {
+          LOG.warn(e);
+        }
+      });
+    }
+  }
+
+  public static @NotNull ChangeGroup getChange() {
+    return ServiceManager.getService(ChangeGroup.class);
+  }
+
+  public static @NotNull CommandGroup getCommand() {
+    return ServiceManager.getService(CommandGroup.class);
+  }
+
+  public static @NotNull MarkGroup getMark() {
+    return ServiceManager.getService(MarkGroup.class);
+  }
+
+  public static @NotNull RegisterGroup getRegister() {
+    return ServiceManager.getService(RegisterGroup.class);
+  }
+
+  public static @Nullable RegisterGroup getRegisterIfCreated() {
+    return ServiceManager.getServiceIfCreated(RegisterGroup.class);
+  }
+
+  public static @NotNull FileGroup getFile() {
+    return ServiceManager.getService(FileGroup.class);
+  }
+
+  public static @NotNull SearchGroup getSearch() {
+    return ServiceManager.getService(SearchGroup.class);
+  }
+
+  public static @Nullable SearchGroup getSearchIfCreated() {
+    return ServiceManager.getServiceIfCreated(SearchGroup.class);
+  }
+
+  public static @NotNull ProcessGroup getProcess() {
+    return ServiceManager.getService(ProcessGroup.class);
+  }
+
+  public static @NotNull MacroGroup getMacro() {
+    return ServiceManager.getService(MacroGroup.class);
+  }
+
+  public static @NotNull DigraphGroup getDigraph() {
+    return ServiceManager.getService(DigraphGroup.class);
+  }
+
+  public static @NotNull HistoryGroup getHistory() {
+    return ServiceManager.getService(HistoryGroup.class);
+  }
+
+  public static @NotNull KeyGroup getKey() {
+    return ServiceManager.getService(KeyGroup.class);
+  }
+
+  public static @Nullable KeyGroup getKeyIfCreated() {
+    return ServiceManager.getServiceIfCreated(KeyGroup.class);
+  }
+
+  public static @NotNull WindowGroup getWindow() {
+    return ServiceManager.getService(WindowGroup.class);
+  }
+
+  public static @NotNull EditorGroup getEditor() {
+    return ServiceManager.getService(EditorGroup.class);
+  }
+
+  public static @Nullable EditorGroup getEditorIfCreated() {
+    return ServiceManager.getServiceIfCreated(EditorGroup.class);
+  }
+
+  public static @NotNull VisualMotionGroup getVisualMotion() {
+    return ServiceManager.getService(VisualMotionGroup.class);
+  }
+
+  public static @NotNull YankGroup getYank() {
+    return ServiceManager.getService(YankGroup.class);
+  }
+
+  public static @NotNull PutGroup getPut() {
+    return ServiceManager.getService(PutGroup.class);
+  }
+
+  private static @NotNull NotificationService getNotifications() {
+    return getNotifications(null);
+  }
+
+  private boolean ideavimrcRegistered = false;
+
+  private void registerIdeavimrc() {
+    if (ideavimrcRegistered) return;
+    ideavimrcRegistered = true;
 
     if (!ApplicationManager.getApplication().isUnitTestMode()) {
       final File ideaVimRc = VimScriptParser.findIdeaVimRc();
@@ -170,146 +293,21 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
         VimScriptParser.executeFile(ideaVimRc);
       }
     }
-
-    LOG.debug("done");
   }
 
-  @Override
-  public void disposeComponent() {
-    LOG.debug("disposeComponent");
-    turnOffPlugin();
-    EventFacade.getInstance().restoreTypedActionHandler();
-    LOG.debug("done");
-  }
-
-  @Override
-  public Element getState() {
-    LOG.debug("Saving state");
-
-    final Element element = new Element("ideavim");
-    // Save whether the plugin is enabled or not
-    final Element state = new Element("state");
-    state.setAttribute("version", Integer.toString(STATE_VERSION));
-    state.setAttribute("enabled", Boolean.toString(enabled));
-    element.addContent(state);
-
-    mark.saveData(element);
-    register.saveData(element);
-    search.saveData(element);
-    history.saveData(element);
-    key.saveData(element);
-    editor.saveData(element);
-
-    return element;
-  }
-
-  @Override
-  public void loadState(@NotNull final Element element) {
-    LOG.debug("Loading state");
-
-    // Restore whether the plugin is enabled or not
-    Element state = element.getChild("state");
-    if (state != null) {
-      try {
-        previousStateVersion = Integer.valueOf(state.getAttributeValue("version"));
-      }
-      catch (NumberFormatException ignored) {
-      }
-      enabled = Boolean.valueOf(state.getAttributeValue("enabled"));
-      previousKeyMap = state.getAttributeValue("keymap");
-    }
-
-    mark.readData(element);
-    register.readData(element);
-    search.readData(element);
-    history.readData(element);
-    key.readData(element);
-    editor.readData(element);
-  }
-
-  @NotNull
-  public static MotionGroup getMotion() {
-    return getInstance().motion;
-  }
-
-  @NotNull
-  public static ChangeGroup getChange() {
-    return getInstance().change;
-  }
-
-  @NotNull
-  public static CopyGroup getCopy() {
-    return getInstance().copy;
-  }
-
-  @NotNull
-  public static MarkGroup getMark() {
-    return getInstance().mark;
-  }
-
-  @NotNull
-  public static RegisterGroup getRegister() {
-    return getInstance().register;
-  }
-
-  @NotNull
-  public static FileGroup getFile() {
-    return getInstance().file;
-  }
-
-  @NotNull
-  public static SearchGroup getSearch() {
-    return getInstance().search;
-  }
-
-  @NotNull
-  public static ProcessGroup getProcess() {
-    return getInstance().process;
-  }
-
-  @NotNull
-  public static MacroGroup getMacro() {
-    return getInstance().macro;
-  }
-
-  @NotNull
-  public static DigraphGroup getDigraph() {
-    return getInstance().digraph;
-  }
-
-  @NotNull
-  public static HistoryGroup getHistory() {
-    return getInstance().history;
-  }
-
-  @NotNull
-  public static KeyGroup getKey() {
-    return getInstance().key;
-  }
-
-  @NotNull
-  public static WindowGroup getWindow() {
-    return getInstance().window;
-  }
-
-  @NotNull
-  public static EditorGroup getEditor() {
-    return getInstance().editor;
-  }
-
-  @NotNull
-  public static PluginId getPluginId() {
+  public static @NotNull PluginId getPluginId() {
     return PluginId.getId(IDEAVIM_PLUGIN_ID);
   }
 
-  @NotNull
-  public static String getVersion() {
+  // [VERSION UPDATE] 193+ remove suppress
+  @SuppressWarnings({"MissingRecentApi", "UnstableApiUsage"})
+  public static @NotNull String getVersion() {
+    final IdeaPluginDescriptor plugin = PluginManager.getPlugin(getPluginId());
     if (!ApplicationManager.getApplication().isInternal()) {
-      final IdeaPluginDescriptor plugin = PluginManager.getPlugin(getPluginId());
       return plugin != null ? plugin.getVersion() : "SNAPSHOT";
     }
     else {
-      return "INTERNAL";
+      return "INTERNAL" + (plugin != null ? " - " + plugin.getVersion() : "");
     }
   }
 
@@ -318,6 +316,8 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
   }
 
   public static void setEnabled(final boolean enabled) {
+    if (isEnabled() == enabled) return;
+
     if (!enabled) {
       getInstance().turnOffPlugin();
     }
@@ -327,12 +327,18 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     if (enabled) {
       getInstance().turnOnPlugin();
     }
+
+    VimStatusBar.INSTANCE.update();
   }
 
   public static boolean isError() {
     return getInstance().error;
   }
 
+  public static String getMessage() {
+    return getInstance().message;
+  }
+
   /**
    * Indicate to the user that an error has occurred. Just beep.
    */
@@ -340,8 +346,13 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     if (ApplicationManager.getApplication().isUnitTestMode()) {
       getInstance().error = true;
     }
-    else if (!Options.getInstance().isSet("visualbell")) {
-      Toolkit.getDefaultToolkit().beep();
+    else if (!OptionsManager.INSTANCE.getVisualbell().isSet()) {
+      // Vim only allows a beep once every half second - :help 'visualbell'
+      final long currentTimeMillis = System.currentTimeMillis();
+      if (currentTimeMillis - lastBeepTimeMillis > 500) {
+        Toolkit.getDefaultToolkit().beep();
+        lastBeepTimeMillis = currentTimeMillis;
+      }
     }
   }
 
@@ -356,6 +367,9 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
   }
 
   public static void showMessage(@Nullable String msg) {
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      getInstance().message = msg;
+    }
     ProjectManager pm = ProjectManager.getInstance();
     Project[] projects = pm.getOpenProjects();
     for (Project project : projects) {
@@ -371,41 +385,68 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     }
   }
 
-  @NotNull
-  private static VimPlugin getInstance() {
-    return (VimPlugin)ApplicationManager.getApplication().getComponent(IDEAVIM_COMPONENT_NAME);
+  public static @NotNull VimPlugin getInstance() {
+    return ServiceManager.getService(VimPlugin.class);
   }
 
   private void turnOnPlugin() {
-    KeyHandler.getInstance().fullReset(null);
+    ApplicationManager.getApplication().invokeLater(this::updateState);
 
     getEditor().turnOn();
-    getMotion().turnOn();
+    getSearch().turnOn();
+    VimListenerManager.INSTANCE.turnOn();
+
+    // Register vim actions in command mode
+    RegisterActions.registerActions();
+
+    // Register ex handlers
+    CommandParser.getInstance().registerHandlers();
+
+    // Register extensions
+    VimExtensionRegistrar.registerExtensions();
+
+    // Execute ~/.ideavimrc
+    registerIdeavimrc();
   }
 
   private void turnOffPlugin() {
     KeyHandler.getInstance().fullReset(null);
 
-    getEditor().turnOff();
-    getMotion().turnOff();
+    // Unregister vim actions in command mode
+    RegisterActions.unregisterActions();
+
+    // Unregister ex handlers
+    CommandParser.getInstance().unregisterHandlers();
+
+    EditorGroup editorGroup = getEditorIfCreated();
+    if (editorGroup != null) {
+      editorGroup.turnOff();
+    }
+    SearchGroup searchGroup = getSearchIfCreated();
+    if (searchGroup != null) {
+      searchGroup.turnOff();
+    }
+    VimListenerManager.INSTANCE.turnOff();
+    ExEntryPanel.fullReset();
   }
 
+  private boolean stateUpdated = false;
+
   private void updateState() {
+    if (stateUpdated) return;
     if (isEnabled() && !ApplicationManager.getApplication().isUnitTestMode()) {
+      stateUpdated = true;
       if (SystemInfo.isMac) {
         final MacKeyRepeat keyRepeat = MacKeyRepeat.getInstance();
         final Boolean enabled = keyRepeat.isEnabled();
-        final Boolean isKeyRepeat = editor.isKeyRepeat();
+        final Boolean isKeyRepeat = getEditor().isKeyRepeat();
         if ((enabled == null || !enabled) && (isKeyRepeat == null || isKeyRepeat)) {
-          if (Messages.showYesNoDialog("Do you want to enable repeating keys in Mac OS X on press and hold?\n\n" +
-                                       "(You can do it manually by running 'defaults write -g " +
-                                       "ApplePressAndHoldEnabled 0' in the console).", IDEAVIM_NOTIFICATION_TITLE,
-                                       Messages.getQuestionIcon()) == Messages.YES) {
-            editor.setKeyRepeat(true);
+          if (VimPlugin.getNotifications().enableRepeatingMode() == Messages.YES) {
+            getEditor().setKeyRepeat(true);
             keyRepeat.setEnabled(true);
           }
           else {
-            editor.setKeyRepeat(false);
+            getEditor().setKeyRepeat(false);
           }
         }
       }
@@ -419,115 +460,69 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
           keymap = manager.getKeymap(DefaultKeymap.getInstance().getDefaultKeymapName());
         }
         assert keymap != null : "Default keymap not found";
-        new Notification(
-          VimPlugin.IDEAVIM_STICKY_NOTIFICATION_ID,
-          VimPlugin.IDEAVIM_NOTIFICATION_TITLE,
-          String.format("IdeaVim plugin doesn't use the special \"Vim\" keymap any longer. " +
-                        "Switching to \"%s\" keymap.<br/><br/>" +
-                        "Now it is possible to set up:<br/>" +
-                        "<ul>" +
-                        "<li>Vim keys in your ~/.ideavimrc file using key mapping commands</li>" +
-                        "<li>IDE action shortcuts in \"File | Settings | Keymap\"</li>" +
-                        "<li>Vim or IDE handlers for conflicting shortcuts in <a href='#settings'>Vim Emulation</a> settings</li>" +
-                        "</ul>", keymap.getPresentableName()),
-          NotificationType.INFORMATION,
-          new NotificationListener.Adapter() {
-            @Override
-            protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) {
-              ShowSettingsUtil.getInstance().editConfigurable((Project)null, new VimEmulationConfigurable());
-            }
-          }).notify(null);
+        VimPlugin.getNotifications().specialKeymap(keymap, new NotificationListener.Adapter() {
+          @Override
+          protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) {
+            ShowSettingsUtil.getInstance().editConfigurable((Project)null, new VimEmulationConfigurable());
+          }
+        });
         manager.setActiveKeymap(keymap);
       }
       if (previousStateVersion > 0 && previousStateVersion < 4) {
-        new Notification(
-          VimPlugin.IDEAVIM_STICKY_NOTIFICATION_ID,
-          VimPlugin.IDEAVIM_NOTIFICATION_TITLE,
-          "The ~/.vimrc file is no longer read by default, use ~/.ideavimrc instead. You can read it from your " +
-          "~/.ideavimrc using this command:<br/><br/>" +
-          "<code>source ~/.vimrc</code>",
-          NotificationType.INFORMATION).notify(null);
+        VimPlugin.getNotifications().noVimrcAsDefault();
       }
     }
   }
 
-  /**
-   * This sets up some listeners so we can handle various events that occur
-   */
-  private void setupListeners() {
-    final EventFacade eventFacade = EventFacade.getInstance();
+  @Override
+  public void loadState(final @NotNull Element element) {
+    LOG.debug("Loading state");
 
-    setupStatisticsReporter(eventFacade);
-
-    DocumentManager.getInstance().addDocumentListener(new MarkGroup.MarkUpdater());
-    DocumentManager.getInstance().addDocumentListener(new SearchGroup.DocumentSearchListener());
-
-    eventFacade.addProjectManagerListener(new ProjectManagerAdapter() {
-      @Override
-      public void projectOpened(@NotNull final Project project) {
-        eventFacade.addFileEditorManagerListener(project, new MotionGroup.MotionEditorChange());
-        eventFacade.addFileEditorManagerListener(project, new FileGroup.SelectionCheck());
-        eventFacade.addFileEditorManagerListener(project, new SearchGroup.EditorSelectionCheck());
+    // Restore whether the plugin is enabled or not
+    Element state = element.getChild("state");
+    if (state != null) {
+      try {
+        previousStateVersion = Integer.parseInt(state.getAttributeValue("version"));
       }
-    });
+      catch (NumberFormatException ignored) {
+      }
+      enabled = Boolean.parseBoolean(state.getAttributeValue("enabled"));
+      previousKeyMap = state.getAttributeValue("keymap");
+    }
+
+    legacyStateLoading(element);
+    this.state.readData(element);
   }
 
-  /**
-   * Reports statistics about installed IdeaVim and enabled Vim emulation.
-   *
-   * See https://github.com/go-lang-plugin-org/go-lang-idea-plugin/commit/5182ab4a1d01ad37f6786268a2fe5e908575a217
-   */
-  private void setupStatisticsReporter(@NotNull EventFacade eventFacade) {
-    final Application application = ApplicationManager.getApplication();
-    eventFacade.addEditorFactoryListener(new EditorFactoryAdapter() {
-      @Override
-      public void editorCreated(@NotNull EditorFactoryEvent event) {
-        final PropertiesComponent propertiesComponent = PropertiesComponent.getInstance();
-        final long lastUpdate = propertiesComponent.getOrInitLong(IDEAVIM_STATISTICS_TIMESTAMP_KEY, 0);
-        final boolean outOfDate = lastUpdate == 0 ||
-                                  System.currentTimeMillis() - lastUpdate > TimeUnit.DAYS.toMillis(1);
-        if (outOfDate && isEnabled()) {
-          application.executeOnPooledThread(new Runnable() {
-            @Override
-            public void run() {
-              try {
-                final String buildNumber = ApplicationInfo.getInstance().getBuild().asString();
-                final String pluginId = IDEAVIM_PLUGIN_ID;
-                final String version = URLEncoder.encode(getVersion(), CharsetToolkit.UTF8);
-                final String os = URLEncoder.encode(SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION,
-                                                    CharsetToolkit.UTF8);
-                final String uid = UpdateChecker.getInstallationUID(PropertiesComponent.getInstance());
-                final String url =
-                  "https://plugins.jetbrains.com/plugins/list" +
-                  "?pluginId=" + pluginId +
-                  "&build=" + buildNumber +
-                  "&pluginVersion=" + version +
-                  "&os=" + os +
-                  "&uuid=" + uid;
-                PropertiesComponent.getInstance().setValue(IDEAVIM_STATISTICS_TIMESTAMP_KEY,
-                                                           String.valueOf(System.currentTimeMillis()));
-                HttpRequests.request(url).connect(new HttpRequests.RequestProcessor<Object>() {
-                    @Override
-                    public Object process(@NotNull HttpRequests.Request request) throws IOException {
-                      LOG.info("Sending statistics: " + url);
-                      try {
-                        JDOMUtil.load(request.getInputStream());
-                      }
-                      catch (JDOMException e) {
-                        LOG.warn(e);
-                      }
-                      return null;
-                    }
-                  }
-                );
-              }
-              catch (IOException e) {
-                LOG.warn(e);
-              }
-            }
-          });
-        }
-      }
-    }, application);
+  @Override
+  public Element getState() {
+    LOG.debug("Saving state");
+
+    final Element element = new Element("ideavim");
+    // Save whether the plugin is enabled or not
+    final Element state = new Element("state");
+    state.setAttribute("version", Integer.toString(STATE_VERSION));
+    state.setAttribute("enabled", Boolean.toString(enabled));
+    element.addContent(state);
+
+    this.state.saveData(element);
+
+    return element;
+  }
+
+  private void legacyStateLoading(@NotNull Element element) {
+    if (previousStateVersion > 0 && previousStateVersion < 5) {
+      // Migrate settings from 4 to 5 version
+      getMark().readData(element);
+      getRegister().readData(element);
+      getSearch().readData(element);
+      getHistory().readData(element);
+    }
+    if (element.getChild(SHORTCUT_CONFLICTS_ELEMENT) != null) {
+      getKey().readData(element);
+    }
+    if (element.getChild(EDITOR_STORE_ELEMENT) != null) {
+      getEditor().readData(element);
+    }
   }
 }

src/com/maddyhome/idea/vim/VimState.kt

@@ -0,0 +1,66 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.maddyhome.idea.vim
+
+import org.jdom.Element
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+/**
+ * @author Alex Plate
+ */
+class VimState {
+  var isIdeaJoinNotified by StateProperty("idea-join")
+  var isIdeaPutNotified by StateProperty("idea-put")
+
+  fun readData(element: Element) {
+    val notifications = element.getChild("notifications")
+    map.keys.forEach { name ->
+      notifications?.getChild(name)?.getAttributeValue("enabled")?.let {
+        map[name] = it.toBoolean()
+      }
+    }
+  }
+
+  fun saveData(element: Element) {
+    val notifications = Element("notifications")
+    element.addContent(notifications)
+
+    map.forEach { (name, value) ->
+      val child = Element(name)
+      child.setAttribute("enabled", value.toString())
+      notifications.addContent(child)
+    }
+  }
+}
+
+val map by lazy { mutableMapOf<String, Boolean>() }
+
+private class StateProperty(val xmlName: String) : ReadWriteProperty<VimState, Boolean> {
+
+  init {
+    map[xmlName] = false
+  }
+
+  override fun getValue(thisRef: VimState, property: KProperty<*>): Boolean = map.getOrPut(xmlName) { false }
+
+  override fun setValue(thisRef: VimState, property: KProperty<*>, value: Boolean) {
+    map[xmlName] = value
+  }
+}

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
+ * Copyright (C) 2003-2020 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,17 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package com.maddyhome.idea.vim;
 
-import com.intellij.codeInsight.lookup.Lookup;
-import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.actionSystem.ActionPlan;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.actionSystem.ActionPlan;
 import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
 import com.intellij.openapi.editor.actionSystem.TypedActionHandlerEx;
 import com.maddyhome.idea.vim.helper.EditorDataContext;
@@ -39,48 +37,25 @@ import javax.swing.*;
 public class VimTypedActionHandler implements TypedActionHandlerEx {
   private static final Logger logger = Logger.getInstance(VimTypedActionHandler.class.getName());
 
-  private final TypedActionHandler origHandler;
-  @NotNull private final KeyHandler handler;
+  private final @NotNull KeyHandler handler;
 
   public VimTypedActionHandler(TypedActionHandler origHandler) {
-    this.origHandler = origHandler;
     handler = KeyHandler.getInstance();
     handler.setOriginalHandler(origHandler);
   }
 
   @Override
   public void beforeExecute(@NotNull Editor editor, char charTyped, @NotNull DataContext context, @NotNull ActionPlan plan) {
-    if (isEnabled(editor)) {
-      handler.beforeHandleKey(editor, KeyStroke.getKeyStroke(charTyped), context, plan);
-    }
-    else {
-      TypedActionHandler originalHandler = KeyHandler.getInstance().getOriginalHandler();
-      if (originalHandler instanceof TypedActionHandlerEx) {
-        ((TypedActionHandlerEx)originalHandler).beforeExecute(editor, charTyped, context, plan);
-      }
-    }
+    handler.beforeHandleKey(editor, KeyStroke.getKeyStroke(charTyped), context, plan);
   }
 
   @Override
-  public void execute(@NotNull final Editor editor, final char charTyped, @NotNull final DataContext context) {
-    if (isEnabled(editor)) {
-      try {
-        handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), new EditorDataContext(editor));
-      }
-      catch (Throwable e) {
-        logger.error(e);
-      }
+  public void execute(final @NotNull Editor editor, final char charTyped, final @NotNull DataContext context) {
+    try {
+      handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), new EditorDataContext(editor));
     }
-    else {
-      origHandler.execute(editor, charTyped, context);
+    catch (Throwable e) {
+      logger.error(e);
     }
   }
-
-  private boolean isEnabled(@NotNull Editor editor) {
-    if (VimPlugin.isEnabled()) {
-      final Lookup lookup = LookupManager.getActiveLookup(editor);
-      return lookup == null || !lookup.isFocused();
-    }
-    return false;
-  }
 }

src/com/maddyhome/idea/vim/action/ComplicatedKeysAction.kt

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
+ * Copyright (C) 2003-2020 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,13 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.maddyhome.idea.vim.common;
+package com.maddyhome.idea.vim.action
 
-public class Jump extends FileLocation {
-  public Jump(int lline, int col, String filename) {
-    super(lline, col, filename);
-  }
+import javax.swing.KeyStroke
+
+interface ComplicatedKeysAction {
+  val keyStrokesSet: Set<List<KeyStroke>>
 }

src/com/maddyhome/idea/vim/action/DuplicableOperatorAction.kt

@@ -0,0 +1,34 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.maddyhome.idea.vim.action
+
+/**
+ * There are some double-character commands like `cc`, `dd`, `yy`.
+ * During the execution these commands are replaced with `c_`, `d_`, `y_`, etc.
+ *
+ * This is not any kind of workaround, this is exactly how the original vim works.
+ *   The `dd` command (and others) should not be processed as a monolith command, or it will lead to problems
+ *   like this: https://youtrack.jetbrains.com/issue/VIM-1189
+ *
+ * If some command implements this interface, and the user enters motion operator that is the same as the command itself, the
+ *   motion operator will be replaced with `_`.
+ */
+interface DuplicableOperatorAction {
+  val duplicateWith: Char
+}

src/com/maddyhome/idea/vim/action/ExEntryAction.java

@@ -1,44 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
-import org.jetbrains.annotations.NotNull;
-
-/**
- *
- */
-public class ExEntryAction extends EditorAction {
-  public ExEntryAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends EditorActionHandlerBase {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
-      VimPlugin.getProcess().startExCommand(editor, context, cmd);
-
-      return true;
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/ExEntryAction.kt

@@ -0,0 +1,33 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.VimActionHandler
+
+class ExEntryAction : VimActionHandler.SingleExecution() {
+  override val type: Command.Type = Command.Type.OTHER_READONLY
+
+  override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
+    VimPlugin.getProcess().startExCommand(editor, context, cmd)
+    return true
+  }
+}

src/com/maddyhome/idea/vim/action/ResetModeAction.java

@@ -1,41 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
-import com.maddyhome.idea.vim.KeyHandler;
-import org.jetbrains.annotations.NotNull;
-
-/**
- *
- */
-// TODO: Cannot find the corresponding Vim command. Remove it?
-public class ResetModeAction extends EditorAction {
-  public ResetModeAction() {
-    super(new EditorActionHandler() {
-      public void execute(@NotNull Editor editor, @NotNull DataContext context) {
-        KeyHandler.getInstance().fullReset(InjectedLanguageUtil.getTopLevelEditor(editor));
-      }
-    });
-  }
-}

src/com/maddyhome/idea/vim/action/ResetModeAction.kt

@@ -0,0 +1,34 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.VimActionHandler
+import com.maddyhome.idea.vim.helper.getTopLevelEditor
+
+class ResetModeAction : VimActionHandler.SingleExecution() {
+  override val type: Command.Type = Command.Type.RESET
+
+  override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
+    KeyHandler.getInstance().fullReset(editor.getTopLevelEditor())
+    return true
+  }
+}

src/com/maddyhome/idea/vim/action/VimCommandAction.java

@@ -1,80 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action;
-
-import com.google.common.collect.ImmutableSet;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.helper.StringHelper;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Action that represents a Vim command.
- *
- * Actions should be registered in resources/META-INF/plugin.xml and in package-info.java
- * inside {@link com.maddyhome.idea.vim.action}.
- *
- * @author vlan
- */
-public abstract class VimCommandAction extends EditorAction {
-  protected VimCommandAction(EditorActionHandler defaultHandler) {
-    super(defaultHandler);
-  }
-
-  @NotNull
-  public abstract Set<MappingMode> getMappingModes();
-
-  @NotNull
-  public abstract Set<List<KeyStroke>> getKeyStrokesSet();
-
-  @NotNull
-  public abstract Command.Type getType();
-
-  @NotNull
-  public Argument.Type getArgumentType() {
-    return Argument.Type.NONE;
-  }
-
-  /**
-   * Returns various binary flags for the command.
-   *
-   * These legacy flags will be refactored in future releases.
-   *
-   * @see com.maddyhome.idea.vim.command.Command
-   */
-  public int getFlags() {
-    return 0;
-  }
-
-  @NotNull
-  protected static Set<List<KeyStroke>> parseKeysSet(@NotNull String... keyStrings) {
-    final ImmutableSet.Builder<List<KeyStroke>> builder = ImmutableSet.builder();
-    for (String keyString : keyStrings) {
-      builder.add(StringHelper.parseKeys(keyString));
-    }
-    return builder.build();
-  }
-}

src/com/maddyhome/idea/vim/action/VimPluginToggleAction.java

@@ -1,50 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.ToggleAction;
-import com.intellij.openapi.project.DumbAware;
-import com.maddyhome.idea.vim.VimPlugin;
-
-/**
- * This class is used to handle the Vim Plugin enabled/disabled toggle. This is most likely used as a menu option
- * but could also be used as a toolbar item.
- */
-public class VimPluginToggleAction extends ToggleAction implements DumbAware {
-  /**
-   * Indicates if the toggle is on or off
-   *
-   * @param event The event that triggered the action
-   * @return true if the toggle is on, false if off
-   */
-  public boolean isSelected(AnActionEvent event) {
-    return VimPlugin.isEnabled();
-  }
-
-  /**
-   * Specifies whether the toggle should be on or off
-   *
-   * @param event The event that triggered the action
-   * @param b     The new state - true is on, false is off
-   */
-  public void setSelected(AnActionEvent event, boolean b) {
-    VimPlugin.setEnabled(b);
-  }
-}

src/com/maddyhome/idea/vim/action/VimPluginToggleAction.kt

@@ -0,0 +1,44 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.maddyhome.idea.vim.action
+
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.DumbAwareToggleAction
+import com.maddyhome.idea.vim.VimActions
+import com.maddyhome.idea.vim.VimPlugin
+
+/**
+ * This class is used to handle the Vim Plugin enabled/disabled toggle. This is most likely used as a menu option
+ * but could also be used as a toolbar item.
+ */
+class VimPluginToggleAction : DumbAwareToggleAction() {
+  override fun isSelected(event: AnActionEvent): Boolean = VimPlugin.isEnabled()
+
+  override fun setSelected(event: AnActionEvent, b: Boolean) {
+    VimPlugin.setEnabled(b)
+  }
+
+  override fun update(e: AnActionEvent) {
+    super.update(e)
+
+    e.presentation.text = if (VimActions.actionPlace == e.place) {
+      if (VimPlugin.isEnabled()) "Enabled" else "Enable"
+    } else "Vim Emulator"
+  }
+}

src/com/maddyhome/idea/vim/action/VimShortcutKeyAction.java

@@ -1,252 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action;
-
-import com.google.common.collect.ImmutableSet;
-import com.intellij.codeInsight.lookup.LookupManager;
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationListener;
-import com.intellij.notification.NotificationType;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.ex.util.EditorUtil;
-import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
-import com.intellij.openapi.keymap.KeymapUtil;
-import com.intellij.openapi.options.ShowSettingsUtil;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.Project;
-import com.maddyhome.idea.vim.KeyHandler;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.action.change.insert.InsertExitModeAction;
-import com.maddyhome.idea.vim.command.CommandState;
-import com.maddyhome.idea.vim.helper.EditorData;
-import com.maddyhome.idea.vim.helper.EditorDataContext;
-import com.maddyhome.idea.vim.key.ShortcutOwner;
-import com.maddyhome.idea.vim.ui.VimEmulationConfigurable;
-import one.util.streamex.StreamEx;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-import javax.swing.event.HyperlinkEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static java.awt.event.KeyEvent.*;
-
-/**
- * Handles Vim keys that are treated as action shortcuts by the IDE.
- *
- * These keys are not passed to {@link com.maddyhome.idea.vim.VimTypedActionHandler} and should be handled by actions.
- */
-public class VimShortcutKeyAction extends AnAction implements DumbAware {
-  private static final String ACTION_ID = "VimShortcutKeyAction";
-
-  @NotNull public static final Set<KeyStroke> VIM_ONLY_EDITOR_KEYS = ImmutableSet.<KeyStroke>builder()
-    .addAll(getKeyStrokes(VK_ENTER, 0))
-    .addAll(getKeyStrokes(VK_ESCAPE, 0))
-    .addAll(getKeyStrokes(VK_TAB, 0))
-    .addAll(getKeyStrokes(VK_BACK_SPACE, 0, CTRL_MASK))
-    .addAll(getKeyStrokes(VK_INSERT, 0))
-    .addAll(getKeyStrokes(VK_DELETE, 0, CTRL_MASK))
-    .addAll(getKeyStrokes(VK_UP, 0, CTRL_MASK, SHIFT_MASK))
-    .addAll(getKeyStrokes(VK_DOWN, 0, CTRL_MASK, SHIFT_MASK))
-    .addAll(getKeyStrokes(VK_LEFT, 0, CTRL_MASK, SHIFT_MASK, CTRL_MASK | SHIFT_MASK))
-    .addAll(getKeyStrokes(VK_RIGHT, 0, CTRL_MASK, SHIFT_MASK, CTRL_MASK | SHIFT_MASK))
-    .addAll(getKeyStrokes(VK_HOME, 0, CTRL_MASK, SHIFT_MASK, CTRL_MASK | SHIFT_MASK))
-    .addAll(getKeyStrokes(VK_END, 0, CTRL_MASK, SHIFT_MASK, CTRL_MASK | SHIFT_MASK))
-    .addAll(getKeyStrokes(VK_PAGE_UP, 0, SHIFT_MASK, CTRL_MASK | SHIFT_MASK))
-    .addAll(getKeyStrokes(VK_PAGE_DOWN, 0, SHIFT_MASK, CTRL_MASK | SHIFT_MASK))
-    .build();
-
-  @NotNull private static final Set<KeyStroke> NON_FILE_EDITOR_KEYS = ImmutableSet.<KeyStroke>builder()
-    .addAll(getKeyStrokes(VK_ENTER, 0))
-    .addAll(getKeyStrokes(VK_ESCAPE, 0))
-    .addAll(getKeyStrokes(VK_TAB, 0))
-    .addAll(getKeyStrokes(VK_UP, 0))
-    .addAll(getKeyStrokes(VK_DOWN, 0))
-    .build();
-
-  private static final Logger ourLogger = Logger.getInstance(VimShortcutKeyAction.class.getName());
-  private static AnAction ourInstance = null;
-
-  @Override
-  public void actionPerformed(@NotNull AnActionEvent e) {
-    final Editor editor = getEditor(e);
-    final KeyStroke keyStroke = getKeyStroke(e);
-    if (editor != null && keyStroke != null) {
-      final ShortcutOwner owner = VimPlugin.getKey().getSavedShortcutConflicts().get(keyStroke);
-      if (owner == ShortcutOwner.UNDEFINED) {
-        notifyAboutShortcutConflict(keyStroke);
-      }
-      // Should we use InjectedLanguageUtil.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
-      try {
-        KeyHandler.getInstance().handleKey(editor, keyStroke, new EditorDataContext(editor));
-      }
-      catch (Throwable throwable) {
-        ourLogger.error(throwable);
-      }
-    }
-  }
-
-  @Override
-  public void update(@NotNull AnActionEvent e) {
-    e.getPresentation().setEnabled(isEnabled(e));
-  }
-
-  @NotNull
-  public static AnAction getInstance() {
-    if (ourInstance == null) {
-      final AnAction originalAction = ActionManager.getInstance().getAction(ACTION_ID);
-      ourInstance = EmptyAction.wrap(originalAction);
-    }
-    return ourInstance;
-  }
-
-  private void notifyAboutShortcutConflict(@NotNull final KeyStroke keyStroke) {
-    VimPlugin.getKey().getSavedShortcutConflicts().put(keyStroke, ShortcutOwner.VIM);
-    final String message = String.format(
-      "Using the <b>%s</b> shortcut for Vim emulation.<br/>" +
-      "You can redefine it as an <a href='#ide'>IDE shortcut</a> or " +
-      "configure its handler in <a href='#settings'>Vim Emulation</a> settings.",
-      KeymapUtil.getShortcutText(new KeyboardShortcut(keyStroke, null)));
-    final NotificationListener listener = new NotificationListener.Adapter() {
-      @Override
-      protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) {
-        final String description = e.getDescription();
-        if ("#ide".equals(description)) {
-          VimPlugin.getKey().getSavedShortcutConflicts().put(keyStroke, ShortcutOwner.IDE);
-          notification.expire();
-        }
-        else if ("#settings".equals(description)) {
-          ShowSettingsUtil.getInstance().editConfigurable((Project)null, new VimEmulationConfigurable());
-        }
-      }
-    };
-    final Notification notification = new Notification(VimPlugin.IDEAVIM_NOTIFICATION_ID,
-                                                       VimPlugin.IDEAVIM_NOTIFICATION_TITLE,
-                                                       message,
-                                                       NotificationType.INFORMATION,
-                                                       listener);
-    notification.notify(null);
-  }
-
-  private boolean isEnabled(@NotNull AnActionEvent e) {
-    if (VimPlugin.isEnabled()) {
-      final Editor editor = getEditor(e);
-      final KeyStroke keyStroke = getKeyStroke(e);
-      if (editor != null && keyStroke != null) {
-        final int keyCode = keyStroke.getKeyCode();
-        if (LookupManager.getActiveLookup(editor) != null) {
-          return isExitInsertMode(keyStroke);
-        }
-        if (keyCode == VK_ESCAPE) {
-          return isEnabledForEscape(editor);
-        }
-        if (CommandState.inInsertMode(editor)) {
-          // XXX: <Tab> won't be recorded in macros
-          if (keyCode == VK_TAB) {
-            return false;
-          }
-          // Debug watch, Python console, etc.
-          if (NON_FILE_EDITOR_KEYS.contains(keyStroke) && !EditorData.isFileEditor(editor)) {
-            return false;
-          }
-        }
-        if (VIM_ONLY_EDITOR_KEYS.contains(keyStroke)) {
-          return true;
-        }
-        final Map<KeyStroke, ShortcutOwner> savedShortcutConflicts = VimPlugin.getKey().getSavedShortcutConflicts();
-        final ShortcutOwner owner = savedShortcutConflicts.get(keyStroke);
-        if (owner == ShortcutOwner.VIM) {
-          return true;
-        }
-        else if (owner == ShortcutOwner.IDE) {
-          return !isShortcutConflict(keyStroke);
-        }
-        else {
-          if (isShortcutConflict(keyStroke)) {
-            savedShortcutConflicts.put(keyStroke, ShortcutOwner.UNDEFINED);
-          }
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  private boolean isEnabledForEscape(@NotNull Editor editor) {
-    final CommandState.Mode mode = CommandState.getInstance(editor).getMode();
-    return isPrimaryEditor(editor) || (EditorData.isFileEditor(editor) && mode != CommandState.Mode.COMMAND);
-  }
-
-  /**
-   * Checks if the editor is a primary editor in the main editing area.
-   */
-  private boolean isPrimaryEditor(@NotNull Editor editor) {
-    final Project project = editor.getProject();
-    if (project == null) return false;
-    final FileEditorManagerEx fileEditorManager = FileEditorManagerEx.getInstanceEx(project);
-    return StreamEx.of(fileEditorManager.getAllEditors())
-      .anyMatch(fileEditor -> editor.equals(EditorUtil.getEditorEx(fileEditor)));
-  }
-
-  private boolean isExitInsertMode(@NotNull KeyStroke keyStroke) {
-    for (List<KeyStroke> keys : InsertExitModeAction.getInstance().getKeyStrokesSet()) {
-      // XXX: Currently we cannot handle <C-\><C-N> because of the importance of <C-N> for the IDE on Linux
-      if (keys.size() == 1 && keyStroke.equals(keys.get(0))) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private boolean isShortcutConflict(@NotNull KeyStroke keyStroke) {
-    return !VimPlugin.getKey().getKeymapConflicts(keyStroke).isEmpty();
-  }
-
-  @NotNull
-  private static List<KeyStroke> getKeyStrokes(int keyCode, @NotNull int... modifiers) {
-    final List<KeyStroke> keyStrokes = new ArrayList<KeyStroke>();
-    for (int modifier : modifiers) {
-      keyStrokes.add(KeyStroke.getKeyStroke(keyCode, modifier));
-    }
-    return keyStrokes;
-  }
-
-  @Nullable
-  private KeyStroke getKeyStroke(@NotNull AnActionEvent e) {
-    final InputEvent inputEvent = e.getInputEvent();
-    if (inputEvent instanceof KeyEvent) {
-      final KeyEvent keyEvent = (KeyEvent)inputEvent;
-      return KeyStroke.getKeyStrokeForEvent(keyEvent);
-    }
-    return null;
-  }
-
-  @Nullable
-  private Editor getEditor(@NotNull AnActionEvent e) {
-    return e.getData(PlatformDataKeys.EDITOR);
-  }
-}

src/com/maddyhome/idea/vim/action/VimShortcutKeyAction.kt

@@ -0,0 +1,223 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action
+
+import com.google.common.collect.ImmutableSet
+import com.intellij.codeInsight.lookup.LookupManager
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.EmptyAction
+import com.intellij.openapi.actionSystem.PlatformDataKeys
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.ex.util.EditorUtil
+import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
+import com.intellij.openapi.progress.ProcessCanceledException
+import com.intellij.openapi.project.DumbAware
+import com.intellij.openapi.util.Key
+import com.intellij.ui.KeyStrokeAdapter
+import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.helper.EditorDataContext
+import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.StringHelper
+import com.maddyhome.idea.vim.helper.inInsertMode
+import com.maddyhome.idea.vim.helper.inNormalMode
+import com.maddyhome.idea.vim.key.ShortcutOwner
+import com.maddyhome.idea.vim.listener.IdeaSpecifics.aceJumpActive
+import com.maddyhome.idea.vim.option.OptionsManager
+import java.awt.event.InputEvent
+import java.awt.event.KeyEvent
+import javax.swing.KeyStroke
+
+/**
+ * Handles Vim keys that are treated as action shortcuts by the IDE.
+ *
+ *
+ * These keys are not passed to [com.maddyhome.idea.vim.VimTypedActionHandler] and should be handled by actions.
+ */
+class VimShortcutKeyAction : AnAction(), DumbAware {
+  override fun actionPerformed(e: AnActionEvent) {
+    val editor = getEditor(e)
+    val keyStroke = getKeyStroke(e)
+    if (editor != null && keyStroke != null) {
+      val owner = VimPlugin.getKey().savedShortcutConflicts[keyStroke]
+      if (owner == ShortcutOwner.UNDEFINED) {
+        VimPlugin.getNotifications(editor.project).notifyAboutShortcutConflict(keyStroke)
+      }
+      // Should we use HelperKt.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
+      try {
+        KeyHandler.getInstance().handleKey(editor, keyStroke, EditorDataContext(editor))
+      } catch (ignored: ProcessCanceledException) {
+        // Control-flow exceptions (like ProcessCanceledException) should never be logged
+        // See {@link com.intellij.openapi.diagnostic.Logger.checkException}
+      } catch (throwable: Throwable) {
+        ourLogger.error(throwable)
+      }
+    }
+  }
+
+  override fun update(e: AnActionEvent) {
+    e.presentation.isEnabled = isEnabled(e)
+  }
+
+  private fun isEnabled(e: AnActionEvent): Boolean {
+    if (!VimPlugin.isEnabled()) return false
+    val editor = getEditor(e)
+    val keyStroke = getKeyStroke(e)
+    if (editor != null && keyStroke != null) {
+      // Workaround for smart step into
+      @Suppress("DEPRECATION")
+      val SMART_STEP_INPLACE_DATA = Key.findKeyByName("SMART_STEP_INPLACE_DATA")
+      if (SMART_STEP_INPLACE_DATA != null && editor.getUserData(SMART_STEP_INPLACE_DATA) != null) return false
+      if (aceJumpActive()) return false
+      val keyCode = keyStroke.keyCode
+      if (LookupManager.getActiveLookup(editor) != null) {
+        return LookupKeys.isEnabledForLookup(keyStroke)
+      }
+      if (keyCode == KeyEvent.VK_ESCAPE) {
+        return isEnabledForEscape(editor)
+      }
+      if (editor.inInsertMode) { // XXX: <Tab> won't be recorded in macros
+        if (keyCode == KeyEvent.VK_TAB) {
+          VimPlugin.getChange().tabAction = true
+          return false
+        }
+        // Debug watch, Python console, etc.
+        if (NON_FILE_EDITOR_KEYS.contains(keyStroke) && !EditorHelper.isFileEditor(editor)) {
+          return false
+        }
+      }
+      if (VIM_ONLY_EDITOR_KEYS.contains(keyStroke)) {
+        return true
+      }
+      val savedShortcutConflicts = VimPlugin.getKey().savedShortcutConflicts
+      return when (savedShortcutConflicts[keyStroke]) {
+        ShortcutOwner.VIM -> true
+        ShortcutOwner.IDE -> !isShortcutConflict(keyStroke)
+        else -> {
+          if (isShortcutConflict(keyStroke)) {
+            savedShortcutConflicts[keyStroke] = ShortcutOwner.UNDEFINED
+          }
+          true
+        }
+      }
+    }
+    return false
+  }
+
+  private fun isEnabledForEscape(editor: Editor): Boolean {
+    return isPrimaryEditor(editor) || EditorHelper.isFileEditor(editor) && !editor.inNormalMode
+  }
+
+  /**
+   * Checks if the editor is a primary editor in the main editing area.
+   */
+  private fun isPrimaryEditor(editor: Editor): Boolean {
+    val project = editor.project ?: return false
+    val fileEditorManager = FileEditorManagerEx.getInstanceEx(project) ?: return false
+    return fileEditorManager.allEditors.any { fileEditor -> editor == EditorUtil.getEditorEx(fileEditor) }
+  }
+
+  private fun isShortcutConflict(keyStroke: KeyStroke): Boolean {
+    return VimPlugin.getKey().getKeymapConflicts(keyStroke).isNotEmpty()
+  }
+
+  /**
+   * getDefaultKeyStroke is needed for NEO layout keyboard VIM-987
+   * but we should cache the value because on the second call (isEnabled -> actionPerformed)
+   * the event is already consumed
+   */
+  private var keyStrokeCache: Pair<KeyEvent?, KeyStroke?> = null to null
+
+  private fun getKeyStroke(e: AnActionEvent): KeyStroke? {
+    val inputEvent = e.inputEvent
+    if (inputEvent is KeyEvent) {
+      val defaultKeyStroke = KeyStrokeAdapter.getDefaultKeyStroke(inputEvent)
+      val strokeCache = keyStrokeCache
+      if (defaultKeyStroke != null) {
+        keyStrokeCache = inputEvent to defaultKeyStroke
+        return defaultKeyStroke
+      } else if (strokeCache.first === inputEvent) {
+        keyStrokeCache = null to null
+        return strokeCache.second
+      }
+      return KeyStroke.getKeyStrokeForEvent(inputEvent)
+    }
+    return null
+  }
+
+  private fun getEditor(e: AnActionEvent): Editor? = e.getData(PlatformDataKeys.EDITOR)
+
+  /**
+   * Every time the key pressed with an active lookup, there is a decision:
+   *   should this key be processed by IdeaVim, or by IDE. For example, dot and enter should be processed by IDE, but
+   *   <C-W> by IdeaVim.
+   *
+   * The list of keys that should be processed by IDE is stored in [OptionsManager.lookupKeys]. So, we should search
+   *   if the pressed key is presented in this list. The caches are used to speedup the process.
+   */
+  private object LookupKeys {
+    private var parsedLookupKeys: Set<KeyStroke> = parseLookupKeys()
+
+    init {
+      OptionsManager.lookupKeys.addOptionChangeListener { _, _ ->
+        parsedLookupKeys = parseLookupKeys()
+      }
+    }
+
+    fun isEnabledForLookup(keyStroke: KeyStroke): Boolean = keyStroke !in parsedLookupKeys
+
+    private fun parseLookupKeys() = OptionsManager.lookupKeys.values()
+      .map { StringHelper.parseKeys(it) }.filter { it.isNotEmpty() }.map { it.first() }.toSet()
+  }
+
+  companion object {
+    @JvmField
+    val VIM_ONLY_EDITOR_KEYS: Set<KeyStroke> = ImmutableSet.builder<KeyStroke>().addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0)).addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0))
+      .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0)).addAll(getKeyStrokes(KeyEvent.VK_BACK_SPACE, 0, InputEvent.CTRL_MASK))
+      .addAll(getKeyStrokes(KeyEvent.VK_INSERT, 0)).addAll(getKeyStrokes(KeyEvent.VK_DELETE, 0, InputEvent.CTRL_MASK))
+      .addAll(getKeyStrokes(KeyEvent.VK_UP, 0, InputEvent.CTRL_MASK, InputEvent.SHIFT_MASK)).addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0, InputEvent.CTRL_MASK, InputEvent.SHIFT_MASK))
+      .addAll(getKeyStrokes(KeyEvent.VK_LEFT, 0, InputEvent.CTRL_MASK, InputEvent.SHIFT_MASK, InputEvent.CTRL_MASK or InputEvent.SHIFT_MASK))
+      .addAll(getKeyStrokes(KeyEvent.VK_RIGHT, 0, InputEvent.CTRL_MASK, InputEvent.SHIFT_MASK, InputEvent.CTRL_MASK or InputEvent.SHIFT_MASK))
+      .addAll(getKeyStrokes(KeyEvent.VK_HOME, 0, InputEvent.CTRL_MASK, InputEvent.SHIFT_MASK, InputEvent.CTRL_MASK or InputEvent.SHIFT_MASK))
+      .addAll(getKeyStrokes(KeyEvent.VK_END, 0, InputEvent.CTRL_MASK, InputEvent.SHIFT_MASK, InputEvent.CTRL_MASK or InputEvent.SHIFT_MASK))
+      .addAll(getKeyStrokes(KeyEvent.VK_PAGE_UP, 0, InputEvent.SHIFT_MASK, InputEvent.CTRL_MASK or InputEvent.SHIFT_MASK))
+      .addAll(getKeyStrokes(KeyEvent.VK_PAGE_DOWN, 0, InputEvent.SHIFT_MASK, InputEvent.CTRL_MASK or InputEvent.SHIFT_MASK)).build()
+
+    private const val ACTION_ID = "VimShortcutKeyAction"
+
+    private val NON_FILE_EDITOR_KEYS: Set<KeyStroke> = ImmutableSet.builder<KeyStroke>()
+      .addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0))
+      .addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0))
+      .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0))
+      .addAll(getKeyStrokes(KeyEvent.VK_UP, 0))
+      .addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0))
+      .build()
+
+    private val ourLogger = Logger.getInstance(VimShortcutKeyAction::class.java.name)
+
+    @JvmStatic
+    val instance: AnAction by lazy {
+      EmptyAction.wrap(ActionManager.getInstance().getAction(ACTION_ID))
+    }
+
+    private fun getKeyStrokes(keyCode: Int, vararg modifiers: Int) = modifiers.map { KeyStroke.getKeyStroke(keyCode, it) }
+  }
+}

src/com/maddyhome/idea/vim/action/change/OperatorAction.java

@@ -1,99 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.maddyhome.idea.vim.KeyHandler;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.action.VimCommandAction;
-import com.maddyhome.idea.vim.command.*;
-import com.maddyhome.idea.vim.common.TextRange;
-import com.maddyhome.idea.vim.group.MotionGroup;
-import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
-import com.maddyhome.idea.vim.helper.MessageHelper;
-import com.maddyhome.idea.vim.key.OperatorFunction;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author vlan
- */
-public class OperatorAction extends VimCommandAction {
-  protected OperatorAction() {
-    super(new EditorActionHandlerBase() {
-      @Override
-      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
-        final OperatorFunction operatorFunction = VimPlugin.getKey().getOperatorFunction();
-        if (operatorFunction != null) {
-          final Argument argument = cmd.getArgument();
-          if (argument != null) {
-            final Command motion = argument.getMotion();
-            if (motion != null) {
-              final TextRange range = MotionGroup
-                .getMotionRange(editor, editor.getCaretModel().getPrimaryCaret(), context, cmd.getCount(),
-                                cmd.getRawCount(), argument, true);
-              if (range != null) {
-                VimPlugin.getMark().setChangeMarks(editor, range);
-                final SelectionType selectionType = SelectionType.fromCommandFlags(motion.getFlags());
-                KeyHandler.getInstance().reset(editor);
-                return operatorFunction.apply(editor, context, selectionType);
-              }
-            }
-          }
-          return false;
-        }
-        VimPlugin.showMessage(MessageHelper.message("E774"));
-        return false;
-      }
-    });
-  }
-
-  @NotNull
-  @Override
-  public Set<MappingMode> getMappingModes() {
-    return MappingMode.N;
-  }
-
-  @NotNull
-  @Override
-  public Set<List<KeyStroke>> getKeyStrokesSet() {
-    return parseKeysSet("g@");
-  }
-
-  @NotNull
-  @Override
-  public Command.Type getType() {
-    return Command.Type.OTHER_SELF_SYNCHRONIZED;
-  }
-
-  @NotNull
-  @Override
-  public Argument.Type getArgumentType() {
-    return Argument.Type.MOTION;
-  }
-
-  @Override
-  public int getFlags() {
-    return Command.FLAG_OP_PEND;
-  }
-}

src/com/maddyhome/idea/vim/action/change/OperatorAction.kt

@@ -0,0 +1,63 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.SelectionType
+import com.maddyhome.idea.vim.group.MotionGroup
+import com.maddyhome.idea.vim.handler.VimActionHandler
+import com.maddyhome.idea.vim.helper.MessageHelper
+import com.maddyhome.idea.vim.helper.commandState
+
+/**
+ * @author vlan
+ */
+class OperatorAction : VimActionHandler.SingleExecution() {
+  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
+
+  override val argumentType: Argument.Type = Argument.Type.MOTION
+
+  override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
+    val operatorFunction = VimPlugin.getKey().operatorFunction
+    if (operatorFunction != null) {
+      val argument = cmd.argument
+      if (argument != null) {
+        if (!editor.commandState.isDotRepeatInProgress) {
+          VimRepeater.Extension.argumentCaptured = argument
+        }
+        val motion = argument.motion
+        val range = MotionGroup
+          .getMotionRange(editor, editor.caretModel.primaryCaret, context, cmd.count, cmd.rawCount, argument)
+        if (range != null) {
+          VimPlugin.getMark().setChangeMarks(editor, range)
+          val selectionType = SelectionType.fromCommandFlags(motion.flags)
+          KeyHandler.getInstance().reset(editor)
+          return operatorFunction.apply(editor, context, selectionType)
+        }
+      }
+      return false
+    }
+    VimPlugin.showMessage(MessageHelper.message("E774"))
+    return false
+  }
+}

src/com/maddyhome/idea/vim/action/change/RedoAction.java

@@ -1,41 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
-import com.maddyhome.idea.vim.helper.UndoRedoHelper;
-import org.jetbrains.annotations.NotNull;
-
-/**
- */
-public class RedoAction extends EditorAction {
-  public RedoAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends EditorActionHandlerBase {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
-      return UndoRedoHelper.redo(context);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/RedoAction.kt

@@ -0,0 +1,30 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.VimActionHandler
+import com.maddyhome.idea.vim.helper.UndoRedoHelper.redo
+
+class RedoAction : VimActionHandler.SingleExecution() {
+  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
+
+  override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean = redo(context)
+}

src/com/maddyhome/idea/vim/action/change/RepeatChangeAction.java

@@ -1,85 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.KeyHandler;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.CommandState;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
-import org.jetbrains.annotations.NotNull;
-
-/**
- */
-public class RepeatChangeAction extends EditorAction {
-  public RepeatChangeAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends EditorActionHandlerBase {
-    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command command) {
-      CommandState state = CommandState.getInstance(editor);
-      Command cmd = state.getLastChangeCommand();
-
-      if (cmd != null) {
-        if (command.getRawCount() > 0) {
-          cmd.setCount(command.getCount());
-          Argument arg = cmd.getArgument();
-          if (arg != null) {
-            Command mot = arg.getMotion();
-            if (mot != null) {
-              mot.setCount(0);
-            }
-          }
-        }
-        Command save = state.getCommand();
-        int lastFTCmd = VimPlugin.getMotion().getLastFTCmd();
-        char lastFTChar = VimPlugin.getMotion().getLastFTChar();
-
-        state.setCommand(cmd);
-        state.pushState(CommandState.Mode.REPEAT, CommandState.SubMode.NONE, MappingMode.NORMAL);
-        char reg = VimPlugin.getRegister().getCurrentRegister();
-        VimPlugin.getRegister().selectRegister(state.getLastChangeRegister());
-        try {
-          KeyHandler.executeAction(cmd.getAction(), context);
-        }
-        catch (Exception e) {
-          // oops
-        }
-        state.popState();
-        if (save != null) {
-          state.setCommand(save);
-        }
-        VimPlugin.getMotion().setLastFTCmd(lastFTCmd, lastFTChar);
-        state.saveLastChangeCommand(cmd);
-        VimPlugin.getRegister().selectRegister(reg);
-
-        return true;
-      }
-      else {
-        return false;
-      }
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/RepeatChangeAction.kt

@@ -0,0 +1,141 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.command.CommandProcessor
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.extension.VimExtensionHandler
+import com.maddyhome.idea.vim.handler.VimActionHandler
+import com.maddyhome.idea.vim.helper.commandState
+import javax.swing.KeyStroke
+
+class RepeatChangeAction : VimActionHandler.SingleExecution() {
+  override val type: Command.Type = Command.Type.OTHER_WRITABLE
+
+  override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
+    val state = editor.commandState
+    val lastCommand = VimRepeater.lastChangeCommand
+
+    if (lastCommand == null && VimRepeater.Extension.lastExtensionHandler == null) return false
+
+    // Save state
+    val save = state.executingCommand
+    val lastFTCmd = VimPlugin.getMotion().lastFTCmd
+    val lastFTChar = VimPlugin.getMotion().lastFTChar
+    val reg = VimPlugin.getRegister().currentRegister
+    val lastHandler = VimRepeater.Extension.lastExtensionHandler
+    val repeatHandler = VimRepeater.repeatHandler
+
+    state.isDotRepeatInProgress = true
+    VimPlugin.getRegister().selectRegister(VimRepeater.lastChangeRegister)
+
+    try {
+      if (repeatHandler && lastHandler != null) {
+        val processor = CommandProcessor.getInstance()
+        processor.executeCommand(editor.project, { lastHandler.execute(editor, context) }, "Vim " + lastHandler.javaClass.simpleName, null)
+      } else if (!repeatHandler && lastCommand != null) {
+        if (cmd.rawCount > 0) {
+          lastCommand.count = cmd.count
+          val arg = lastCommand.argument
+          if (arg != null) {
+            val mot = arg.motion
+            mot.count = 0
+          }
+        }
+        state.setExecutingCommand(lastCommand)
+
+        KeyHandler.executeVimAction(editor, lastCommand.action, context)
+
+        VimRepeater.saveLastChange(lastCommand)
+      }
+    } catch (ignored: Exception) {
+    }
+
+    state.isDotRepeatInProgress = false
+
+    // Restore state
+    if (save != null) state.setExecutingCommand(save)
+    VimPlugin.getMotion().setLastFTCmd(lastFTCmd, lastFTChar)
+    if (lastHandler != null) VimRepeater.Extension.lastExtensionHandler = lastHandler
+    VimRepeater.repeatHandler = repeatHandler
+    VimRepeater.Extension.reset()
+    VimPlugin.getRegister().selectRegister(reg)
+    return true
+  }
+}
+
+object VimRepeater {
+  var repeatHandler = false
+
+  var lastChangeCommand: Command? = null
+    private set
+  var lastChangeRegister = VimPlugin.getRegister().defaultRegister
+    private set
+
+  fun saveLastChange(command: Command) {
+    lastChangeCommand = command
+    lastChangeRegister = VimPlugin.getRegister().currentRegister
+  }
+
+  object Extension {
+    var lastExtensionHandler: VimExtensionHandler? = null
+    var argumentCaptured: Argument? = null
+
+    private val keyStrokes = mutableListOf<KeyStroke>()
+    private val strings = mutableListOf<String>()
+
+    private var keystrokePointer = 0
+    private var stringPointer = 0
+
+    fun addKeystroke(key: KeyStroke) = keyStrokes.add(key)
+    fun addString(key: String) = strings.add(key)
+
+    fun consumeKeystroke(): KeyStroke? {
+      if (keystrokePointer in keyStrokes.indices) {
+        keystrokePointer += 1
+        return keyStrokes[keystrokePointer - 1]
+      }
+      return null
+    }
+
+    fun consumeString(): String? {
+      if (stringPointer in strings.indices) {
+        stringPointer += 1
+        return strings[stringPointer - 1]
+      }
+      return null
+    }
+
+    fun reset() {
+      keystrokePointer = 0
+      stringPointer = 0
+    }
+
+    fun clean() {
+      keyStrokes.clear()
+      strings.clear()
+      keystrokePointer = 0
+      stringPointer = 0
+    }
+  }
+}

src/com/maddyhome/idea/vim/action/change/RepeatExCommandAction.java

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.ex.CommandParser;
-import com.maddyhome.idea.vim.ex.ExException;
-import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
-import org.jetbrains.annotations.NotNull;
-
-/**
- */
-public class RepeatExCommandAction extends EditorAction {
-  public RepeatExCommandAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends EditorActionHandlerBase {
-    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command command) {
-      int count = command.getCount();
-      try {
-        return CommandParser.getInstance().processLastCommand(editor, context, count);
-      }
-      catch (ExException e) {
-        return false;
-      }
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/UndoAction.java

@@ -1,41 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
-import com.maddyhome.idea.vim.helper.UndoRedoHelper;
-import org.jetbrains.annotations.NotNull;
-
-/**
- */
-public class UndoAction extends EditorAction {
-  public UndoAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends EditorActionHandlerBase {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
-      return UndoRedoHelper.undo(context);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/UndoAction.kt

@@ -0,0 +1,39 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.action.ComplicatedKeysAction
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.VimActionHandler
+import com.maddyhome.idea.vim.helper.StringHelper
+import com.maddyhome.idea.vim.helper.UndoRedoHelper.undo
+import java.awt.event.KeyEvent
+import javax.swing.KeyStroke
+
+class UndoAction : VimActionHandler.SingleExecution(), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    StringHelper.parseKeys("u"),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_UNDO, 0))
+  )
+
+  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
+
+  override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean = undo(context)
+}

src/com/maddyhome/idea/vim/action/change/change/AutoIndentLinesVisualAction.java

@@ -1,74 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.action.VimCommandAction;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.common.TextRange;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author vlan
- */
-public class AutoIndentLinesVisualAction extends VimCommandAction {
-  public AutoIndentLinesVisualAction() {
-    super(new VisualOperatorActionHandler(true, CaretOrder.DECREASING_OFFSET) {
-      @Override
-      protected boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
-                                @NotNull Command cmd, @NotNull TextRange range) {
-        VimPlugin.getChange().autoIndentRange(editor, caret, context, range);
-        return true;
-      }
-    });
-  }
-
-  @NotNull
-  @Override
-  public Set<MappingMode> getMappingModes() {
-    return MappingMode.V;
-  }
-
-  @NotNull
-  @Override
-  public Set<List<KeyStroke>> getKeyStrokesSet() {
-    return parseKeysSet("=");
-  }
-
-  @NotNull
-  @Override
-  public Command.Type getType() {
-    return Command.Type.CHANGE;
-  }
-
-  @Override
-  public int getFlags() {
-    return Command.FLAG_MOT_LINEWISE | Command.FLAG_FORCE_LINEWISE | Command.FLAG_EXIT_VISUAL;
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/AutoIndentLinesVisualAction.kt

@@ -0,0 +1,47 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+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.CommandFlags
+import com.maddyhome.idea.vim.group.visual.VimSelection
+import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
+import com.maddyhome.idea.vim.helper.enumSetOf
+import java.util.*
+
+/**
+ * @author vlan
+ */
+class AutoIndentLinesVisualAction : VisualOperatorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_MOT_LINEWISE, CommandFlags.FLAG_EXIT_VISUAL)
+
+  override fun executeAction(editor: Editor,
+                             caret: Caret,
+                             context: DataContext,
+                             cmd: Command,
+                             range: VimSelection): Boolean {
+    VimPlugin.getChange().autoIndentRange(editor, caret, context, range.toVimTextRange(true))
+    return true
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerMotionAction.java

@@ -1,53 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import com.maddyhome.idea.vim.helper.CharacterHelper;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeCaseLowerMotionAction extends EditorAction {
-  public ChangeCaseLowerMotionAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return argument != null &&
-             VimPlugin.getChange()
-               .changeCaseMotion(editor, caret, context, count, rawCount, CharacterHelper.CASE_LOWER, argument);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerMotionAction.kt

@@ -0,0 +1,47 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.action.DuplicableOperatorAction
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.CharacterHelper
+
+class ChangeCaseLowerMotionAction : ChangeEditorActionHandler.ForEachCaret(), DuplicableOperatorAction {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val argumentType: Argument.Type = Argument.Type.MOTION
+
+  override val duplicateWith: Char = 'u'
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return argument != null &&
+      VimPlugin.getChange()
+        .changeCaseMotion(editor, caret, context, count, rawCount, CharacterHelper.CASE_LOWER, argument)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerVisualAction.java

@@ -1,76 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.action.VimCommandAction;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.common.TextRange;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
-import com.maddyhome.idea.vim.helper.CharacterHelper;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author vlan
- */
-public class ChangeCaseLowerVisualAction extends VimCommandAction {
-  public ChangeCaseLowerVisualAction() {
-    super(new VisualOperatorActionHandler(true, CaretOrder.DECREASING_OFFSET) {
-      @Override
-      protected boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
-                                @NotNull Command cmd, @NotNull TextRange range) {
-        final Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(editor);
-        return VimPlugin.getChange().changeCaseRange(topLevelEditor, caret, range, CharacterHelper.CASE_LOWER);
-      }
-    });
-  }
-
-  @NotNull
-  @Override
-  public Set<MappingMode> getMappingModes() {
-    return MappingMode.V;
-  }
-
-  @NotNull
-  @Override
-  public Set<List<KeyStroke>> getKeyStrokesSet() {
-    return parseKeysSet("u");
-  }
-
-  @NotNull
-  @Override
-  public Command.Type getType() {
-    return Command.Type.CHANGE;
-  }
-
-  @Override
-  public int getFlags() {
-    return Command.FLAG_EXIT_VISUAL;
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerVisualAction.kt

@@ -0,0 +1,50 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+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.CommandFlags
+import com.maddyhome.idea.vim.group.visual.VimSelection
+import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
+import com.maddyhome.idea.vim.helper.CharacterHelper
+import com.maddyhome.idea.vim.helper.enumSetOf
+import com.maddyhome.idea.vim.helper.getTopLevelEditor
+import java.util.*
+
+/**
+ * @author vlan
+ */
+class ChangeCaseLowerVisualAction : VisualOperatorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_EXIT_VISUAL)
+
+  override fun executeAction(editor: Editor,
+                             caret: Caret,
+                             context: DataContext,
+                             cmd: Command,
+                             range: VimSelection): Boolean {
+    val topLevelEditor = editor.getTopLevelEditor()
+    return VimPlugin.getChange()
+      .changeCaseRange(topLevelEditor, caret, range.toVimTextRange(false), CharacterHelper.CASE_LOWER)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleCharacterAction.java

@@ -1,50 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeCaseToggleCharacterAction extends EditorAction {
-  public ChangeCaseToggleCharacterAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return VimPlugin.getChange().changeCaseToggleCharacter(editor, caret, count);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleCharacterAction.kt

@@ -0,0 +1,39 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+
+class ChangeCaseToggleCharacterAction : ChangeEditorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return VimPlugin.getChange().changeCaseToggleCharacter(editor, caret, count)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleMotionAction.java

@@ -1,53 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import com.maddyhome.idea.vim.helper.CharacterHelper;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeCaseToggleMotionAction extends EditorAction {
-  public ChangeCaseToggleMotionAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return argument != null &&
-             VimPlugin.getChange()
-               .changeCaseMotion(editor, caret, context, count, rawCount, CharacterHelper.CASE_TOGGLE, argument);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleMotionAction.kt

@@ -0,0 +1,47 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.action.DuplicableOperatorAction
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.CharacterHelper
+
+class ChangeCaseToggleMotionAction : ChangeEditorActionHandler.ForEachCaret(), DuplicableOperatorAction {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val argumentType: Argument.Type = Argument.Type.MOTION
+
+  override val duplicateWith: Char = '~'
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return argument != null &&
+      VimPlugin.getChange()
+        .changeCaseMotion(editor, caret, context, count, rawCount, CharacterHelper.CASE_TOGGLE, argument)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleVisualAction.java

@@ -1,74 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.action.VimCommandAction;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.common.TextRange;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
-import com.maddyhome.idea.vim.helper.CharacterHelper;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author vlan
- */
-public class ChangeCaseToggleVisualAction extends VimCommandAction {
-  public ChangeCaseToggleVisualAction() {
-    super(new VisualOperatorActionHandler(true, CaretOrder.DECREASING_OFFSET) {
-      @Override
-      protected boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
-                                @NotNull Command cmd, @NotNull TextRange range) {
-        return VimPlugin.getChange().changeCaseRange(editor, caret, range, CharacterHelper.CASE_TOGGLE);
-      }
-    });
-  }
-
-  @NotNull
-  @Override
-  public Set<MappingMode> getMappingModes() {
-    return MappingMode.V;
-  }
-
-  @NotNull
-  @Override
-  public Set<List<KeyStroke>> getKeyStrokesSet() {
-    return parseKeysSet("~");
-  }
-
-  @NotNull
-  @Override
-  public Command.Type getType() {
-    return Command.Type.CHANGE;
-  }
-
-  @Override
-  public int getFlags() {
-    return Command.FLAG_EXIT_VISUAL;
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleVisualAction.kt

@@ -0,0 +1,48 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+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.CommandFlags
+import com.maddyhome.idea.vim.group.visual.VimSelection
+import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
+import com.maddyhome.idea.vim.helper.CharacterHelper
+import com.maddyhome.idea.vim.helper.enumSetOf
+import java.util.*
+
+/**
+ * @author vlan
+ */
+class ChangeCaseToggleVisualAction : VisualOperatorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_EXIT_VISUAL)
+
+  override fun executeAction(editor: Editor,
+                             caret: Caret,
+                             context: DataContext,
+                             cmd: Command,
+                             range: VimSelection): Boolean {
+    return VimPlugin.getChange()
+      .changeCaseRange(editor, caret, range.toVimTextRange(false), CharacterHelper.CASE_TOGGLE)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperMotionAction.java

@@ -1,52 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import com.maddyhome.idea.vim.helper.CharacterHelper;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeCaseUpperMotionAction extends EditorAction {
-  public ChangeCaseUpperMotionAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return argument != null &&
-             VimPlugin.getChange()
-               .changeCaseMotion(editor, caret, context, count, rawCount, CharacterHelper.CASE_UPPER, argument);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperMotionAction.kt

@@ -0,0 +1,47 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.action.DuplicableOperatorAction
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.CharacterHelper
+
+class ChangeCaseUpperMotionAction : ChangeEditorActionHandler.ForEachCaret(), DuplicableOperatorAction {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val argumentType: Argument.Type = Argument.Type.MOTION
+
+  override val duplicateWith: Char = 'U'
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return argument != null &&
+      VimPlugin.getChange()
+        .changeCaseMotion(editor, caret, context, count, rawCount, CharacterHelper.CASE_UPPER, argument)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperVisualAction.java

@@ -1,73 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.action.VimCommandAction;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.common.TextRange;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
-import com.maddyhome.idea.vim.helper.CharacterHelper;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author vlan
- */
-public class ChangeCaseUpperVisualAction extends VimCommandAction {
-  public ChangeCaseUpperVisualAction() {
-    super(new VisualOperatorActionHandler(true, CaretOrder.DECREASING_OFFSET) {
-      protected boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
-                                @NotNull Command cmd, @NotNull TextRange range) {
-        return VimPlugin.getChange().changeCaseRange(editor, caret, range, CharacterHelper.CASE_UPPER);
-      }
-    });
-  }
-
-  @NotNull
-  @Override
-  public Set<MappingMode> getMappingModes() {
-    return MappingMode.V;
-  }
-
-  @NotNull
-  @Override
-  public Set<List<KeyStroke>> getKeyStrokesSet() {
-    return parseKeysSet("U");
-  }
-
-  @NotNull
-  @Override
-  public Command.Type getType() {
-    return Command.Type.CHANGE;
-  }
-
-  @Override
-  public int getFlags() {
-    return Command.FLAG_EXIT_VISUAL;
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperVisualAction.kt

@@ -0,0 +1,48 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+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.CommandFlags
+import com.maddyhome.idea.vim.group.visual.VimSelection
+import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
+import com.maddyhome.idea.vim.helper.CharacterHelper
+import com.maddyhome.idea.vim.helper.enumSetOf
+import java.util.*
+
+/**
+ * @author vlan
+ */
+class ChangeCaseUpperVisualAction : VisualOperatorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_EXIT_VISUAL)
+
+  override fun executeAction(editor: Editor,
+                             caret: Caret,
+                             context: DataContext,
+                             cmd: Command,
+                             range: VimSelection): Boolean {
+    return VimPlugin.getChange()
+      .changeCaseRange(editor, caret, range.toVimTextRange(false), CharacterHelper.CASE_UPPER)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCharacterAction.java

@@ -1,50 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeCharacterAction extends EditorAction {
-  public ChangeCharacterAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return argument != null && VimPlugin.getChange().changeCharacter(editor, caret, count, argument.getCharacter());
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCharacterAction.kt

@@ -0,0 +1,46 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.enumSetOf
+import java.util.*
+
+class ChangeCharacterAction : ChangeEditorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val argumentType: Argument.Type = Argument.Type.DIGRAPH
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_ALLOW_DIGRAPH)
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return argument != null && VimPlugin.getChange().changeCharacter(editor, caret, count, argument.character)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeCharactersAction.java

@@ -1,50 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeCharactersAction extends EditorAction {
-  public ChangeCharactersAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return VimPlugin.getChange().changeCharacters(editor, caret, count);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeCharactersAction.kt

@@ -0,0 +1,44 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.enumSetOf
+import java.util.*
+
+class ChangeCharactersAction : ChangeEditorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_NO_REPEAT_INSERT, CommandFlags.FLAG_MULTIKEY_UNDO)
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return VimPlugin.getChange().changeCharacters(editor, caret, count)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeEndOfLineAction.java

@@ -1,50 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeEndOfLineAction extends EditorAction {
-  public ChangeEndOfLineAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return VimPlugin.getChange().changeEndOfLine(editor, caret, count);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeEndOfLineAction.kt

@@ -0,0 +1,44 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.enumSetOf
+import java.util.*
+
+class ChangeEndOfLineAction : ChangeEditorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_NO_REPEAT_INSERT, CommandFlags.FLAG_MULTIKEY_UNDO)
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return VimPlugin.getChange().changeEndOfLine(editor, caret, count)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeLastGlobalSearchReplaceAction.java

@@ -1,45 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.ex.LineRange;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import com.maddyhome.idea.vim.helper.EditorHelper;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeLastGlobalSearchReplaceAction extends EditorAction {
-  public ChangeLastGlobalSearchReplaceAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, @Nullable Argument argument) {
-      final LineRange range = new LineRange(0, EditorHelper.getLineCount(editor) - 1);
-      return VimPlugin.getSearch().searchAndReplace(editor, editor.getCaretModel().getPrimaryCaret(), range, "s", "//~/&");
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeLastGlobalSearchReplaceAction.kt

@@ -0,0 +1,41 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.ex.ranges.LineRange
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.EditorHelper
+
+class ChangeLastGlobalSearchReplaceAction : ChangeEditorActionHandler.SingleExecution() {
+  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
+
+  override fun execute(editor: Editor,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    val range = LineRange(0, EditorHelper.getLineCount(editor) - 1)
+    return VimPlugin.getSearch()
+      .searchAndReplace(editor, editor.caretModel.primaryCaret, range, "s", "//~/&")
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeLastSearchReplaceAction.java

@@ -1,53 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.ex.LineRange;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeLastSearchReplaceAction extends EditorAction {
-  public ChangeLastSearchReplaceAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount,
-                           @Nullable Argument argument) {
-      boolean result = true;
-      for (Caret caret : editor.getCaretModel().getAllCarets()) {
-        final int line = caret.getLogicalPosition().line;
-        if (!VimPlugin.getSearch().searchAndReplace(editor, caret, new LineRange(line, line), "s", "//~/")) {
-          result = false;
-        }
-
-      }
-      return result;
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeLastSearchReplaceAction.kt

@@ -0,0 +1,45 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.ex.ranges.LineRange
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+
+class ChangeLastSearchReplaceAction : ChangeEditorActionHandler.SingleExecution() {
+  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
+
+  override fun execute(editor: Editor,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    var result = true
+    for (caret in editor.caretModel.allCarets) {
+      val line = caret.logicalPosition.line
+      if (!VimPlugin.getSearch().searchAndReplace(editor, caret, LineRange(line, line), "s", "//~/")) {
+        result = false
+      }
+    }
+    return result
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.java

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeLineAction extends EditorAction {
-  public ChangeLineAction() {
-    super(new ChangeEditorActionHandler(true, CaretOrder.DECREASING_OFFSET) {
-      @Override
-      public boolean execute(@NotNull Editor editor,
-                             @NotNull Caret caret,
-                             @NotNull DataContext context,
-                             int count,
-                             int rawCount,
-                             @Nullable Argument argument) {
-        return VimPlugin.getChange().changeLine(editor, caret, count);
-      }
-    });
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.kt

@@ -0,0 +1,44 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.enumSetOf
+import java.util.*
+
+class ChangeLineAction : ChangeEditorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_NO_REPEAT_INSERT, CommandFlags.FLAG_MULTIKEY_UNDO)
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return VimPlugin.getChange().changeLine(editor, caret, count, context)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeMotionAction.java

@@ -1,50 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeMotionAction extends EditorAction {
-  public ChangeMotionAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return argument != null && VimPlugin.getChange().changeMotion(editor, caret, context, count, rawCount, argument);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeMotionAction.kt

@@ -0,0 +1,44 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Caret
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.action.DuplicableOperatorAction
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+
+class ChangeMotionAction : ChangeEditorActionHandler.ForEachCaret(), DuplicableOperatorAction {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val argumentType: Argument.Type = Argument.Type.MOTION
+
+  override val duplicateWith: Char = 'c'
+
+  override fun execute(editor: Editor,
+                       caret: Caret,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    return argument != null && VimPlugin.getChange().changeMotion(editor, caret, context, count, rawCount, argument)
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeNumberDecAction.java

@@ -1,50 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeNumberDecAction extends EditorAction {
-  public ChangeNumberDecAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return VimPlugin.getChange().changeNumber(editor, caret, -count);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeNumberIncAction.java

@@ -1,50 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeNumberIncAction extends EditorAction {
-  public ChangeNumberIncAction() {
-    super(new Handler());
-  }
-
-  private static class Handler extends ChangeEditorActionHandler {
-    public Handler() {
-      super(true, CaretOrder.DECREASING_OFFSET);
-    }
-
-    @Override
-    public boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context, int count,
-                           int rawCount, @Nullable Argument argument) {
-      return VimPlugin.getChange().changeNumber(editor, caret, count);
-    }
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeReplaceAction.java

@@ -1,46 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.command.Argument;
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- */
-public class ChangeReplaceAction extends EditorAction {
-  public ChangeReplaceAction() {
-    super(new ChangeEditorActionHandler() {
-      @Override
-      public boolean execute(@NotNull Editor editor,
-                             @NotNull DataContext context,
-                             int count,
-                             int rawCount,
-                             @Nullable Argument argument) {
-        VimPlugin.getChange().changeReplace(editor, context);
-        return true;
-      }
-    });
-  }
-}

src/com/maddyhome/idea/vim/action/change/change/ChangeReplaceAction.kt

@@ -0,0 +1,43 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2020 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.maddyhome.idea.vim.action.change.change
+
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.enumSetOf
+import java.util.*
+
+class ChangeReplaceAction : ChangeEditorActionHandler.SingleExecution() {
+  override val type: Command.Type = Command.Type.CHANGE
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_MULTIKEY_UNDO)
+
+  override fun execute(editor: Editor,
+                       context: DataContext,
+                       count: Int,
+                       rawCount: Int,
+                       argument: Argument?): Boolean {
+    VimPlugin.getChange().changeReplace(editor, context)
+    return true
+  }
+}

src/com/maddyhome/idea/vim/action/change/change/ChangeVisualAction.java

@@ -1,78 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2016 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.change.change;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Caret;
-import com.intellij.openapi.editor.Editor;
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.action.VimCommandAction;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.command.SelectionType;
-import com.maddyhome.idea.vim.common.TextRange;
-import com.maddyhome.idea.vim.handler.CaretOrder;
-import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
-import com.maddyhome.idea.vim.helper.EditorData;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author vlan
- */
-public class ChangeVisualAction extends VimCommandAction {
-  public ChangeVisualAction() {
-    super(new VisualOperatorActionHandler(true, CaretOrder.DECREASING_OFFSET) {
-      @Override
-      protected boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
-                                @NotNull Command cmd, @NotNull TextRange range) {
-        final SelectionType type = EditorData.wasVisualBlockMode(editor) && range.isMultiple()
-                                   ? SelectionType.BLOCK_WISE
-                                   : SelectionType.CHARACTER_WISE;
-        return VimPlugin.getChange().changeRange(editor, caret, range, type);
-      }
-    });
-  }
-
-  @NotNull
-  @Override
-  public Set<MappingMode> getMappingModes() {
-    return MappingMode.V;
-  }
-
-  @NotNull
-  @Override
-  public Set<List<KeyStroke>> getKeyStrokesSet() {
-    return parseKeysSet("c", "s");
-  }
-
-  @NotNull
-  @Override
-  public Command.Type getType() {
-    return Command.Type.CHANGE;
-  }
-
-  @Override
-  public int getFlags() {
-    return Command.FLAG_MULTIKEY_UNDO | Command.FLAG_EXIT_VISUAL;
-  }
-}