Inherit from VimTestCase to setup IntelliJ extension points properly

Otherwise these tests depend on the run order of other tests for
proper initialization.

.gitignore

@@ -1,5 +1,6 @@
 *.swp
+/.gradle/
 /.idea/
-/idea/
+/build/
 /out/
 /tmp/

.idea/codeStyleSettings.xml

@@ -141,11 +141,8 @@
           </indentOptions>
         </codeStyleSettings>
         <codeStyleSettings language="Groovy">
-          <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" />
@@ -154,7 +151,6 @@
           <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" />
@@ -165,12 +161,9 @@
           <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" />
@@ -227,6 +220,10 @@
             <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" />
@@ -259,7 +256,6 @@
         </codeStyleSettings>
         <codeStyleSettings language="Python">
           <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
         </codeStyleSettings>
         <codeStyleSettings language="SQL">
@@ -276,5 +272,4 @@
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
-</project>
-
+</project>

.idea/codeStyles/Project.xml

@@ -0,0 +1,235 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <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="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" />
+    <JavaCodeStyleSettings>
+      <option name="FIELD_NAME_PREFIX" value="my" />
+      <option name="STATIC_FIELD_NAME_PREFIX" value="our" />
+    </JavaCodeStyleSettings>
+    <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>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

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

.idea/misc.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IntelliJ Plugin SDK" project-jdk-type="IDEA JDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
-

.idea/modules.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/ideavim.iml" filepath="$PROJECT_DIR$/ideavim.iml" />
-    </modules>
-  </component>
-</project>
-

.idea/runConfigurations/All_tests.xml

@@ -1,36 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="com.maddyhome.idea.vim.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-      <pattern>
-        <option name="PATTERN" value="org.jetbrains.plugins.ideavim.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="ideavim" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.plugins.ideavim" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="moduleWithDependencies" />
-    </option>
-    <envs />
-    <patterns />
-    <RunnerSettings RunnerId="Cover" />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Cover" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/IdeaVim.xml

@@ -1,10 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IdeaVim" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-    <module name="ideavim" />
-    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -Didea.is.internal=true" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method />
-  </configuration>
-</component>

.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
-

AUTHORS.md

@@ -24,6 +24,25 @@ Contributors:
 * [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)
 
 If you are a contributor and your name is not listed here, feel free to
 contact the maintainer.

CHANGES.md

@@ -4,6 +4,264 @@ The Changelog
 History of changes in IdeaVim for the IntelliJ platform.
 
 
+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)
+
+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.
+
+
+0.49, 2017-12-12
+----------------
+
+Enabled zero-latency typing for Vim emulation. Added support for `iskeyword` option. Various bug fixes.
+
+
+* [VIM-1254](https://youtrack.jetbrains.com/issue/VIM-1254) Enable zero-latency typing for Vim emulation
+* [VIM-1367](https://youtrack.jetbrains.com/issue/VIM-1367) Support `iskeyword` option
+* [VIM-523](https://youtrack.jetbrains.com/issue/VIM-523) Fixed global mark remembering only the line number
+
+0.48, 2017-01-15
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* [VIM-1205](https://youtrack.jetbrains.com/issue/VIM-1205) Don't move key handling into separate event for raw handlers
+* [VIM-1216](https://youtrack.jetbrains.com/issue/VIM-1216) Fixed `.` resetting the last find movement while repeating change that also uses movement
+
+
+Features:
+
+* Support for zero-latency rendering
+
+
+0.47, 2016-10-19
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* VIM-1098 Don't start visual selection when mouse click was actually drag over single character
+* VIM-1190 Fixed exception "Write access is allowed from write-safe contexts only"
+
+
+0.46, 2016-07-07
+----------------
+
+Added `incsearch` option for incremental search. Added support for `it` and
+`at` tag block selection. Added `vim-surround` commands `ys`, `cs`, `ds`,
+`S`. Various bug fixes.
+
+Features:
+
+* VIM-769 Added `vim-surround` commands `ys`, `cs`, `ds`, `S`
+* VIM-264 Added tag block selection
+* VIM-271 Added `incsearch` option for showing search results while typing
+* VIM-217 Added support for `={motion}` formatting command
+
+Bug fixes:
+
+* VIM-796 Fixed focus issues with `:action` command
+* VIM-581 Fixed use of special registers `0`-`9` and `-` in delete commands
+* VIM-965 Fixed exception in `[m` in some file types
+* VIM-564 Fixed `g_` move to go to the current line
+* VIM-964 Fixed marks behavior when the whole line got deleted
+* VIM-259 Move caret to the line beginning after `==`
+* VIM-246 Fixed `{count}==` formatting
+* VIM-287 Fixed insert new line before and after folds
+* VIM-139 Focus on current search and use modal confirmation for `:s///gc`
+* VIM-843 Don't highlight search results after restart
+* VIM-1126 Fixed warning about modifying shortcuts of global actions for 2016.2
+
+
+0.44, 2015-11-02
+----------------
+
+A bugfix release.
+
+
+* VIM-1040 Fixed typing keys in completion menus and typing with the
+  plugin disabled
+
+
+0.43, 2015-11-02
+----------------
+
+A bugfix release.
+
+* VIM-1039 Fixed running the plugin with Java 6
+
+
+0.42, 2015-11-01
+----------------
+
+This release is compatible with IntelliJ 15+ and other IDEs based on the
+IntelliJ platform branch 143+.
+
+* VIM-970 Fixed move commands in read-only files
+
+
+0.41, 2015-06-10
+----------------
+
+A bugfix release.
+
+* VIM-957 Fixed plugin version 0.40 is not compatible with IDEs other than
+  IntelliJ
+
+
+0.40, 2015-06-09
+----------------
+
+Added support for `mapleader`. Support comments in `%` brace matching. Various
+bug fixes.
+
+Features:
+
+* VIM-650 Added support for `mapleader`
+* VIM-932 Support comments in `%` brace matching
+
+Bug fixes:
+
+* VIM-586 Invoke Vim shortcuts handler later to restore the sequence of input
+  events
+* VIM-838 `J` shouldn't add whitespace if there is a trailing space
+* VIM-855 Fixed regexp character class problem
+* VIM-210 Fix focus issues with the Ex panel and splits
+* VIM-575 Don't change cursor position of other splits in visual mode
+* VIM-864 Fixed visual marks getting changed during visual substitute
+* VIM-856 Fixed regex look-behind problem
+* VIM-868 Allow count on `gt` and `gT`
+* VIM-700 Remapping `0` should still allow it to be entered in command count
+* VIM-781 Fixed expanding visual block selection past empty lines
+* VIM-845 Fixed `c` and `x` functionality for visual block selections
+* VIM-930 Fixed editor focus issues after closing Ex entry box on Oracle Java 6
+
+
+0.39, 2014-12-03
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* VIM-848 Show line numbers if they are enabled in the settings and there is
+  no `set number`
+* VIM-702 Fix infinite loop on `s/$/\r/g`
+* EA-63022 Don't update line numbers in the caret movement event listener
+
+
+0.38, 2014-12-01
+----------------
+
+Added support for `number` and `relativenumber` options, `clipboard=unnamed`
+option. Added `:action` and `:actionlist` commands for executing arbitrary
+IDE actions. Various bug fixes.
+
+Features:
+
+* VIM-476 Added support for `clipboard=unnamed` option
+* VIM-410 Added support for `relativenumber` option
+* VIM-483 Added support for `number` option
+* VIM-652 Added `:action` and `:actionlist` commands for executing arbitrary
+  IDE actions
+
+Bug fixes:
+
+* VIM-818 Enable key repeat on Mac OS X every time it gets reset by the OS
+* VIM-624 Deselect visual selection range on opening the Ex entry field
+* VIM-511 Fixed editing offset after `<BS>` for `.` command
+* VIM-792 Fixed line-wise and block-wise paste commands for `*` and `+`
+  registers
+* VIM-501 Fixed off-by-1 error in visual block-wise selection
+* VIM-613 Fixed repeat after `d$`
+* VIM-705 Fixed repeated multiline indent
+* VIM-567 Fixed `:!` to allow running non-filter commands
+* VIM-536 Fixed `cc` on the second-to-last line
+* VIM-515 Fixed `cW` command detecting end-of-word incorrectly
+* VIM-794 Fixed NCDFE related to 'number' in IDEs other than IntelliJ
+* VIM-771 Fix semicolon repeat for 'till char' motion
+* VIM-723 Fix pasting to an empty line
+
+
+0.37, 2014-10-15
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* VIM-784 Fixed visual line selection where the start of the selection range
+  was greater than its end
+* VIM-407 Fixed `>>` to work if a line contains only one character
+
+
+0.36, 2014-10-14
+----------------
+
+Added support for common window splitting and navigation commands. Various bug
+fixes.
+
+Features:
+
+* VIM-171 Window `<C-W>` commands: split, close, next/previous windows,
+  left/right/up/down windows
+* VIM-265 Window `:split` and `:vsplit` commands
+
+Bug fixes:
+
+* VIM-632 Restored visual block mode that was broken due to multiple carets support
+* VIM-770 Close the current tab on `:quit` instead of all tabs with the current
+  file
+* VIM-569 Fixed `<C-W>` when the caret is at the end of a line
+
+
+0.35, 2014-05-15
+----------------
+
+The `~/.vimrc` initialization file is no longer read by default, use
+`~/.ideavimrc` instead.
+
+Features:
+
+* VIM-690 Read initialization commands only from `~/.ideavimrc`
+
+Bug fixes:
+
+* VIM-676 Handle control characters in `.ideavimrc` as pressed, not typed
+  keystrokes
+* VIM-679 Parse characters less than U+0020 as `<C-$CHAR>`
+* VIM-683 Allow `<C-PageUp>`/`<C-PagDown>` to be used outside of Vim emulation
+* VIM-646 Don't update the visual selection if a command moves the caret and exits
+  the visual mode
+* VIM-213 Use `'<` and `'>` marks for saving and restoring the last visual
+  selection
+
+
+0.34, 2014-04-29
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* VIM-674 Don't handle `<Tab>` in Insert mode in Vim emulation
+* VIM-672 Ignore mappings that contain `<Plug>` and `<SID>`
+* VIM-670 First character of a recursive mapping shouldn't be mapped again
+* VIM-666 Support `<Bar>` in Vim key notation
+* VIM-666 Ignore characters after `|` in `:map` commands
+* VIM-667 Ignore potentially nested lines of .vimrc based on leading whitespace
+
+
 0.33, 2014-04-28
 ----------------
 

README.md

@@ -2,27 +2,33 @@ IdeaVim
 =======
 
 <div>
-  <a href="http://teamcity.jetbrains.com/viewType.html?buildTypeId=bt299&guest=1">
-    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:bt299)/statusIcon"/>
+  <a href="https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub">
+    <img src="http://jb.gg/badges/official.svg" alt="official JetBrains project"/>
+  </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=bt453&guest=1">
-    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:bt453)/statusIcon"/>
+  <a href="http://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20172&guest=1">
+    <img src="http://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20172)/statusIcon.svg?guest=1"/>
   </a>
   <span>Tests</span>
 </div>
 
-IdeaVim is a Vim emulation plug-in 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, RubyMine, PyCharm, PhpStorm, WebStorm,
-AppCode and Android Studio.
+AppCode, CLion, DataGrip and Android Studio.
 
 Resources:
 
 * [Plugin homepage](http://plugins.jetbrains.com/plugin/164)
-* [Changelog](https://github.com/JetBrains/ideavim/blob/master/CHANGES.md)
+* [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
@@ -36,9 +42,28 @@ Start the IDE normally and enable the Vim emulation using "Tools | Vim
 Emulator" menu item. At this point you must use Vim keystrokes in all editors.
 
 If you wish to disable the plugin, select the "Tools | Vim Emulator" menu so
-it is unchecked. At this point IDE will work with it's regular keyboard
+it is unchecked. At this point your IDE will work with its regular keyboard
 shortcuts.
 
+Keyboard shortcut conflicts between the Vim emulation and the IDE can be
+resolved via "File | Settings | Vim Emulation", "File | Settings | Keymap"
+and key mapping commands in your ~/.ideavimrc file.
+
+
+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)
+
+See [the changelog](CHANGES.md) for the list of hot unreleased features.
+
+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.
+
 
 Summary of Supported Vim Features
 ---------------------------------
@@ -53,27 +78,65 @@ Supported:
 * Undo/redo
 * Visual mode commands
 * Some Ex commands
-* Some [:set options](https://github.com/JetBrains/ideavim/blob/master/doc/set-commands.md)
+* Some [:set options](doc/set-commands.md)
 * Full Vim regexps for search and search/replace
 * Key mappings
 * Macros
 * Digraphs
 * Command line and search history
+* Window commands
 * Vim web help
 
+Emulated Vim plugins:
+
+* vim-surround
+
 Not supported (yet):
 
-* Window commands
 * Jump lists
 * Various less used commands
 
 See also:
 
-* [List of recently added commands](https://github.com/JetBrains/ideavim/blob/master/src/com/maddyhome/idea/vim/package-info.java)
-* [List of commands covered with tests](https://github.com/JetBrains/ideavim/blob/master/index.txt)
+* [List of recently added 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)
 
 
+Files
+-----
+
+* ~/.ideavimrc
+    * Your IdeaVim-specific Vim initialization commands
+
+You can read your ~/.vimrc file from ~/.ideavimrc using 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
+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
+have `-Duser.home=/my/alternate/home` then IdeaVim will source
+`/my/alternate/home/.ideavimrc` instead of `~/.ideavimrc`.
+
+
+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:
+
+    set <extension-name>
+
+Available extensions:
+
+* surround
+    * Emulates [vim-surround](https://github.com/tpope/vim-surround)
+    * Commands: `ys`, `cs`, `ds`, `S`
+
+
 Changes to the IDE
 ------------------
 
@@ -81,19 +144,34 @@ Changes to the IDE
 
 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
-Vim. Vim compatibility of undo/redo may be improved in the future releases.
+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).
 
 ### Escape
 
 Using `<Esc>` in dialog windows remains problematic. For most dialog windows
-the Vim emulator is put into the insert mode without the possibility to switch to
-the normal mode. 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.
+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.
 
 See also [unresolved escape issues](http://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+Help+topic%3A+i_Esc).
 
+### Executing IDE Actions
+
+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
+* `:action {name}`
+    * Execute an action named `NAME`
+
+For example, here `\r` is mapped to the Reformat Code action:
+
+    :map \r :action ReformatCode<CR>
+
 
 Contributing
 ------------
@@ -116,34 +194,38 @@ in the issue tracker.
 
 1. Fork IdeaVim on GitHub and clone the repository on your local machine.
 
-2. Open the project in IntelliJ IDEA 12+ (Community or Ultimate) using "File |
-   Open... | /path/to/ideavim".
+2. Import the project from existing sources in IntelliJ IDEA 15+ (Community or
+   Ultimate) using "File | New | Project from Existing Sources..." or "Import
+   Project" from the start window.
 
-3. Set up a JDK if you haven't got it yet. Use "File | Project Structure | SDKs
-   | Add new JDK".
+    * In the project wizard select "Import project from external model | Gradle"
 
-4. Set up an IntelliJ plugin SDK using "File | Project Structure | SDKs | Add
-   new IntelliJ IDEA Plugin SDK". The correct path to your current installation
-   of IntelliJ will be suggested automatically. You will be prompted to select a
-   JDK for your plugin SDK. Select the JDK from the previous step. You
-   **should** name your plugin SDK `IntelliJ Plugin SDK` in order to match the
-   name in the project settings stored in the Git repository.
+    * Select your Java 6+ JDK as the Gradle JVM, leave other parameters unchanged
 
-5. Select a project SDK for your project using "File | Project Structure |
-   Project | Project SDK". Choose the plugin SDK you have created at the
-   previous step.
+3. Create a new plugin run configuration using "Run | Edit Configurations | New
+   Gradle Configuration" and run it in order to launch IntelliJ with the
+   compiled version of the IdeaVim plugin.
 
-6. Build IdeaVim and run IntelliJ with IdeaVim enabled using the "IdeaVim" run
-   configuration (use "Run | Run... | IdeaVim").
+    * Select your project as the Gradle project
 
-7. In order to be able to run tests in your IntelliJ edition uncomment the
-   appropriate lines in the constructor of the `VimTestCase` class.
+    * Enter "runIdea" as the task to run
+
+4. Create and run a new configuration for running tests by right-clicking on the
+   "test" folder in the project structure and selecting "Run All Tests".
+
+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"
 
 
 Authors
 -------
 
-See [AUTHORS.md](https://github.com/JetBrains/ideavim/blob/master/AUTHORS.md)
+See [AUTHORS.md](AUTHORS.md)
 for a list of authors and contributors.
 
 
@@ -151,4 +233,3 @@ License
 -------
 
 IdeaVim is licensed under the terms of the GNU Public license version 2.
-

build.gradle

@@ -0,0 +1,53 @@
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+  }
+}
+
+plugins {
+  id 'org.jetbrains.intellij' version '0.2.17'
+}
+
+apply plugin: 'java'
+apply plugin: 'kotlin'
+
+sourceCompatibility = javaVersion
+targetCompatibility = javaVersion
+
+tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+
+sourceSets {
+  main {
+    java.srcDir 'src'
+    resources.srcDir 'resources'
+  }
+  test {
+    java.srcDir 'test'
+  }
+}
+
+intellij {
+  version ideaVersion
+  pluginName 'IdeaVim'
+  updateSinceUntilBuild false
+  downloadSources Boolean.valueOf(downloadIdeaSources)
+
+  publishPlugin {
+    channels publishChannels.split(',')
+    username publishUsername
+    password publishPassword
+  }
+}
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+  compile "org.jetbrains.kotlin:kotlin-runtime:$kotlinVersion"
+}

build.properties

@@ -1,4 +0,0 @@
-version-id:0.33
-platform-version:120.0
-idea.download.url=http://download.jetbrains.com/idea/ideaIU-13.zip
-build.number=dev

build.xml

@@ -1,180 +0,0 @@
-<project name="IdeaVim">
-  <!--
-  * IdeaVim - A Vim emulator plugin for IntelliJ Idea
-  * Copyright (C) 2003-2009 Rick Maddy, Oleg Shpynov
-  *
-  * 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, write to the Free Software
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  -->
-  <property file="build.properties"/>
-
-  <property name="idea" value="${basedir}/idea"/>
-  <property name="src" value="${basedir}/src"/>
-  <property name="resources" value="${basedir}/resources"/>
-  <property name="test" value="${basedir}/test"/>
-  <property name="idea.home" value="${idea}/unzip"/>
-  <property environment="env"/>
-  <property name="tools.jar" value="${env.JAVA_HOME}/lib/tools.jar"/>
-  <property name="version" value="${version-id}"/>
-  <property name="filename" value="ideavim-${version}"/>
-
-  <!--Output-->
-  <property name="out" value="${basedir}/out"/>
-  <property name="classes" value="${out}/classes"/>
-  <property name="build" value="${out}/build"/>
-  <property name="dist" value="${out}/dist"/>
-  <property name="test-reports" value="${out}/test-reports"/>
-
-  <path id="build.classpath">
-    <fileset dir="${idea.home}/lib">
-      <include name="*.jar"/>
-    </fileset>
-    <fileset dir="${java.home}/lib">
-      <include name="*.jar"/>
-    </fileset>
-    <pathelement path="${classes}"/>
-  </path>
-
-  <path id="test.classpath">
-    <path refid="build.classpath"/>
-    <pathelement path="${tools.jar}"/>
-  </path>
-
-  <!-- Clean all the generated stuff -->
-  <target name="clean" description="Removes all generated files">
-    <delete dir="${out}"/>
-  </target>
-
-  <!-- Compile all the sources to the ${classes} folder -->
-  <target name="compile">
-    <mkdir dir="${classes}"/>
-    <taskdef name="javac2" classname="com.intellij.ant.Javac2">
-      <classpath refid="build.classpath"/>
-    </taskdef>
-    <!-- The task requires the following libraries from IntelliJ IDEA distribution: -->
-    <!--   javac2.jar; jdom.jar; asm.jar; asm-commons.jar -->
-    <javac2 destdir="${classes}" debug="on" fork="true" encoding="UTF-8" includeantruntime="false">
-      <classpath refid="build.classpath"/>
-      <src path="${src}"/>
-      <include name="com/maddyhome/idea/**"/>
-    </javac2>
-  </target>
-
-  <!-- Create ideavim.jar for packing inside zip plugin package -->
-  <target name="jar">
-    <mkdir dir="${classes}"/>
-    <mkdir dir="${classes}/META-INF"/>
-    <copy file="resources/META-INF/plugin.xml" todir="${classes}/META-INF">
-      <filterset>
-        <filter token="VERSION" value="${version}"/>
-        <filter token="SINCE-VERSION" value="${platform-version}"/>
-        <filter token="BUILD-NUMBER" value="${build.number}"/>
-      </filterset>
-    </copy>
-    <copy todir="${classes}">
-      <fileset dir="${src}" excludes="**/*.java"/>
-    </copy>
-    <copy todir="${classes}">
-      <fileset dir="${resources}"/>
-    </copy>
-    <mkdir dir="${build}"/>
-    <jar basedir="${classes}" jarfile="${build}/IdeaVim.jar" compress="yes"/>
-  </target>
-
-  <target name="build" depends="unzip, clean, compile, jar" description="Compiles all source code and created plugin jar file"/>
-
-  <!-- Download IntelliJ IDEA distribution -->
-  <target name="download" description="Downloads IntelliJ IDEA artifacts">
-    <mkdir dir="${idea}"/>
-    <get src="${idea.download.url}" dest="${idea}" skipexisting="true"/>
-  </target>
-
-  <!-- Unpack idea-*.zip file for ideavim compilation -->
-  <target name="unzip" depends="download" description="Unzip downloaded artifacts and set up idea.home">
-    <delete dir="${idea}/unzip"/>
-    <mkdir dir="${idea}/unzip"/>
-    <basename property="idea.filename" file="${idea.download.url}"/>
-    <unzip dest="${idea}/unzip">
-      <fileset dir="${idea}" includes="${idea.filename}"/>
-    </unzip>
-  </target>
-
-  <target name="dist" depends="dist-src, dist-bin" description="Creates the src and bin distribution files"/>
-
-  <!-- Prepare layout for plugin distribution and creates zip file which can be published -->
-  <target name="dist-bin" depends="clean, build" description="Creates a zip file containing the plugin sources">
-    <delete dir="${build}/IdeaVim"/>
-    <mkdir dir="${build}/IdeaVim"/>
-    <copy file="${basedir}/LICENSE.txt" tofile="${build}/IdeaVim/LICENSE"/>
-    <copy todir="${build}/IdeaVim/lib">
-      <fileset dir="${build}" includes="*.jar"/>
-    </copy>
-    <copy file="${basedir}/README.md" tofile="${build}/IdeaVim/README"/>
-    <copy file="${basedir}/CHANGES.md" tofile="${build}/IdeaVim/CHANGES"/>
-    <zip basedir="${build}" zipfile="${dist}/${filename}-${build.number}.zip" compress="true" includes="IdeaVim/**"/>
-  </target>
-
-  <!-- Packs all the sources -->
-  <target name="dist-src" depends="clean" description="Creates the source tar file">
-    <mkdir dir="${dist}"/>
-    <tar basedir="." destfile="${dist}/${filename}-src.tar.gz" excludes=".git/**,.idea/**,idea/**,out/**,*.iws,*.iml" compression="gzip"/>
-  </target>
-
-  <target name="compile-tests" depends="compile">
-    <mkdir dir="${classes}"/>
-    <taskdef name="javac2" classname="com.intellij.ant.Javac2">
-      <classpath refid="build.classpath"/>
-    </taskdef>
-    <javac2 destdir="${classes}" debug="on" fork="true" encoding="UTF-8" includeantruntime="false">
-      <classpath refid="build.classpath"/>
-      <src path="${test}"/>
-      <include name="org/jetbrains/plugins/ideavim/**"/>
-    </javac2>
-  </target>
-
-  <target name="prepare-tests" depends="compile-tests">
-    <mkdir dir="${classes}/META-INF"/>
-    <copy file="resources/META-INF/plugin.xml" todir="${classes}/META-INF">
-      <filterset>
-        <filter token="VERSION" value="${version}"/>
-        <filter token="SINCE-VERSION" value="${platform-version}"/>
-      </filterset>
-    </copy>
-    <copy todir="${classes}">
-      <fileset dir="${resources}"/>
-    </copy>
-    <mkdir dir="${out}/IdeaVim"/>
-  </target>
-
-  <target name="test" depends="unzip, clean, prepare-tests">
-    <mkdir dir="${test-reports}"/>
-    <junit fork="true" logfailedtests="false" printsummary="true">
-      <classpath refid="test.classpath"/>
-
-      <jvmarg value="-Xmx256M"/>
-      <jvmarg value="-ea"/>
-      <jvmarg value="-Djava.awt.headless=true"/>
-      <jvmarg value="-Didea.plugins.path=${out}"/>
-      <jvmarg value="-Didea.load.plugins.id=IdeaVIM"/>
-
-      <formatter type="plain"/>
-
-      <batchtest todir="${test-reports}">
-        <fileset dir="${test}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-</project>

doc/set-commands.md

@@ -1,24 +1,32 @@
 List of Supported Set Commands
 ==============================
 
-The following `:set` commands can appear in `~/.vimrc` or set manually in the command mode:
+The following `:set` commands can appear in `~/.ideavimrc` or set manually in the command mode:
 
-    '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
-    'matchpairs'    'mps'   pairs of characters that "%" can match
-    'nrformats'     'nf'    number formats recognized for CTRL-A command
-    '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
-    '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
-    'timeoutlen'    'tm'    time that is waited for a mapped key sequence
-    'undolevels'    'ul'    maximum number of changes that can be undone
-    'visualbell'    'vb'    use visual bell instead of beeping
-    'wrapscan'      'ws'    searches wrap around the end of the file
+    '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
+    '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
+    'relativenumber' 'rnu'   show the line number relative to the line with
+                             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
+    '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

gradle.properties

@@ -0,0 +1,8 @@
+ideaVersion IC-172-EAP-SNAPSHOT
+downloadIdeaSources true
+version SNAPSHOT
+javaVersion 1.8
+kotlinVersion 1.1.51
+publishUsername username
+publishPassword password
+publishChannels eap

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Tue Oct 31 23:32:54 MSK 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+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=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+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
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@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

ideavim.iml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PLUGIN_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

resources/META-INF/plugin.xml

@@ -1,67 +1,52 @@
 <idea-plugin url="http://plugins.jetbrains.com/plugin/164">
   <name>IdeaVim</name>
   <id>IdeaVIM</id>
-  <change-notes>
-    <![CDATA[
-      <p>0.33:</p>
+  <change-notes><![CDATA[
+      <p>0.49:</p>
       <ul>
-        <li>Support for <code>:map</code> key mapping commands</li>
-        <li>New keyboard shortcuts handler that doesn't require a separate keymap for Vim emulation</li>
-        <li>Support for <code>:source</code> command</li>
-        <li>Support for <code>:sort</code> command</li>
+        <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.32:</p>
-      <ul>
-        <li>Fixed API compatibility with IntelliJ platform builds 132.1052+</li>
-      </ul>
-      <p>0.31:</p>
+      <p>0.48:</p>
       <ul>
         <li>Various bug fixes</li>
       </ul>
-      <p>0.30:</p>
+      <p>0.47:</p>
       <ul>
-        <li>Support for a separate <code>.ideavimrc</code> config file</li>
-        <li>Fixed long-standing issues with merged undo/redo commands and <code>&lt;Esc&gt;</code> during completion</li>
         <li>Various bug fixes</li>
       </ul>
-      <p>0.29:</p>
+      <p>0.46:</p>
       <ul>
-        <li>Fixed repeat buffer limits</li>
-        <li>Enable normal <code>&lt;Enter&gt;</code> handling for one-line editors</li>
-        <li>Don't move cursor while scrolling</li>
+        <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>Various bug fixes</li>
+      </ul>
+      <p>0.44:</p>
+      <ul>
+        <li>Fixed typing keys in completion menus and typing with the plugin disabled</li>
+      </ul>
+      <p>0.43:</p>
+      <ul>
+        <li>Fixed running the plugin with Java 6</li>
       </ul>
       <p>See also the complete <a href="https://github.com/JetBrains/ideavim/blob/master/CHANGES.md">changelog</a>.</p>
-    ]]>
-  </change-notes>
-  <description>
-    <![CDATA[
-      <p>Build @VERSION@-@BUILD-NUMBER@</p>
-      <p>Vim emulation plug-in for IDEs based on the IntelliJ platform. IdeaVim can be used with IntelliJ IDEA, RubyMine, PyCharm, PhpStorm, WebStorm, AppCode and Android Studio.</p>
-      <p>Supported functionality:</p>
+    ]]></change-notes>
+  <description><![CDATA[
+      <p>Vim emulation plug-in for IDEs based on the IntelliJ platform.</p>
+      <p>IdeaVim supports many Vim features including normal/insert/visual modes, motion keys, deletion/changing, marks, registers, some Ex commands, Vim regexps, configuration via ~/.ideavimrc, macros, window commands, etc.</p>
+      <p>See also:</p>
       <ul>
-          <li>Motion keys</li>
-          <li>Deletion/Changing</li>
-          <li>Insert mode commands</li>
-          <li>Marks</li>
-          <li>Registers</li>
-          <li>Undo/redo</li>
-          <li>Visual mode commands</li>
-          <li>Some Ex commands</li>
-          <li>Some :set options</li>
-          <li>Full Vim regexps for search and search/replace</li>
-          <li>Key mappings</li>
-          <li>Macros</li>
-          <li>Digraphs</li>
-          <li>Command line and search history</li>
-          <li>Vim web help</li>
+        <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>
       </ul>
-    ]]>
-  </description>
-  <version>@VERSION@</version>
+    ]]></description>
+  <version>SNAPSHOT</version>
   <vendor>JetBrains</vendor>
 
-  <idea-version since-build="@SINCE-VERSION@"/>
+  <idea-version since-build="171.0"/>
 
   <!-- Mark the plugin as compatible with RubyMine and other products based on the IntelliJ platform -->
   <depends>com.intellij.modules.lang</depends>
@@ -73,11 +58,18 @@
     </component>
   </application-components>
 
+  <extensionPoints>
+    <extensionPoint qualifiedName="IdeaVIM.vimExtension" interface="com.maddyhome.idea.vim.extension.VimExtension"/>
+  </extensionPoints>
+
   <extensions defaultExtensionNs="com.intellij">
-    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <applicationConfigurable instance="com.maddyhome.idea.vim.ui.VimEmulationConfigurable"/>
   </extensions>
 
+  <extensions defaultExtensionNs="IdeaVIM">
+    <vimExtension implementation="com.maddyhome.idea.vim.extension.surround.VimSurroundExtension"/>
+  </extensions>
+
   <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"/>
@@ -161,6 +153,7 @@
     <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"/>
@@ -168,6 +161,7 @@
     <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"/>
@@ -185,7 +179,6 @@
     <!-- 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="VimMotionLastScreenLineEnd" class="com.maddyhome.idea.vim.action.motion.screen.MotionLastScreenLineEndAction" text="Last Screen Line End"/>
     <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"/>
@@ -213,7 +206,7 @@
     <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="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"/>
 
     <!-- Insert -->
@@ -282,6 +275,7 @@
 
     <!-- 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"/>
@@ -313,6 +307,18 @@
     <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"/>
@@ -346,6 +352,7 @@
     <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="Vim Shortcuts"/>
+    <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"/>
   </actions>
 </idea-plugin>

resources/messages.properties

@@ -48,3 +48,4 @@ E385=E385: search hit BOTTOM without match for: {0}
 e_patnotf2=Pattern not found: {0}
 unkopt=Unknown option: {0}
 e_invarg=Invalid argument: {0}
+E774=E774: 'operatorfunc' is empty

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

@@ -0,0 +1,127 @@
+/*
+ * 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;
+
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.ShortcutSet;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorFactory;
+import com.intellij.openapi.editor.actionSystem.EditorActionManager;
+import com.intellij.openapi.editor.actionSystem.TypedAction;
+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.util.messages.MessageBusConnection;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+
+/**
+ * @author vlan
+ */
+public class EventFacade {
+  @NotNull private static final EventFacade ourInstance = new EventFacade();
+
+  @Nullable private TypedActionHandler myOriginalTypedActionHandler;
+
+  private EventFacade() {
+  }
+
+  @NotNull
+  public static EventFacade getInstance() {
+    return ourInstance;
+  }
+
+  public void addProjectManagerListener(@NotNull ProjectManagerListener listener) {
+    ProjectManager.getInstance().addProjectManagerListener(listener);
+  }
+
+  public void setupTypedActionHandler(@NotNull TypedActionHandler handler) {
+    final TypedAction typedAction = getTypedAction();
+    myOriginalTypedActionHandler = typedAction.getRawHandler();
+    typedAction.setupRawHandler(handler);
+  }
+
+  public void restoreTypedActionHandler() {
+    if (myOriginalTypedActionHandler != null) {
+      getTypedAction().setupRawHandler(myOriginalTypedActionHandler);
+    }
+  }
+
+  public void registerCustomShortcutSet(@NotNull AnAction action, @NotNull ShortcutSet shortcutSet,
+                                        @Nullable JComponent component) {
+    action.registerCustomShortcutSet(shortcutSet, component);
+  }
+
+  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();
+    connection.subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, listener);
+  }
+
+  public void addDocumentListener(@NotNull Document document, @NotNull DocumentListener listener) {
+    document.addDocumentListener(listener);
+  }
+
+  public void removeDocumentListener(@NotNull Document document, @NotNull DocumentListener listener) {
+    document.removeDocumentListener(listener);
+  }
+
+  public void addEditorFactoryListener(@NotNull EditorFactoryListener listener, @NotNull Disposable parentDisposable) {
+    EditorFactory.getInstance().addEditorFactoryListener(listener, parentDisposable);
+  }
+
+  public void addEditorMouseListener(@NotNull Editor editor, @NotNull EditorMouseListener listener) {
+    editor.addEditorMouseListener(listener);
+  }
+
+  public void removeEditorMouseListener(@NotNull Editor editor, @NotNull EditorMouseListener listener) {
+    editor.removeEditorMouseListener(listener);
+  }
+
+  public void addEditorMouseMotionListener(@NotNull Editor editor, @NotNull EditorMouseMotionListener listener) {
+    editor.addEditorMouseMotionListener(listener);
+  }
+
+  public void removeEditorMouseMotionListener(@NotNull Editor editor, @NotNull EditorMouseMotionListener listener) {
+    editor.removeEditorMouseMotionListener(listener);
+  }
+
+  public void addEditorSelectionListener(@NotNull Editor editor, @NotNull SelectionListener listener) {
+    editor.getSelectionModel().addSelectionListener(listener);
+  }
+
+  public void removeEditorSelectionListener(@NotNull Editor editor, @NotNull SelectionListener listener) {
+    editor.getSelectionModel().removeSelectionListener(listener);
+  }
+
+  @NotNull
+  private TypedAction getTypedAction() {
+    return EditorActionManager.getInstance().getTypedAction();
+  }
+}

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -25,6 +25,7 @@ import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.editor.actionSystem.ActionPlan;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
 import com.intellij.openapi.project.Project;
@@ -33,6 +34,7 @@ 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.extension.VimExtensionHandler;
 import com.maddyhome.idea.vim.group.RegisterGroup;
 import com.maddyhome.idea.vim.helper.*;
 import com.maddyhome.idea.vim.key.*;
@@ -91,6 +93,26 @@ public class KeyHandler {
     return origHandler;
   }
 
+  /**
+   * Invoked before acquiring a write lock and actually handling the keystroke.
+   *
+   * Drafts an optional {@link ActionPlan} that will be used as a base for zero-latency rendering in editor.
+   *
+   * @param editor  The editor the key was typed into
+   * @param key     The keystroke typed by the user
+   * @param context The data context
+   * @param plan    The current action plan
+   */
+  public void beforeHandleKey(@NotNull Editor editor, @NotNull KeyStroke key,
+                              @NotNull DataContext context, @NotNull ActionPlan plan) {
+
+    final CommandState.Mode mode = CommandState.getInstance(editor).getMode();
+
+    if (mode == CommandState.Mode.INSERT || mode == CommandState.Mode.REPLACE) {
+      VimPlugin.getChange().beforeProcessKey(editor, context, key, plan);
+    }
+  }
+
   /**
    * This is the main key handler for the Vim plugin. Every keystroke not handled directly by Idea is sent here for
    * processing.
@@ -111,29 +133,29 @@ public class KeyHandler {
     editor = InjectedLanguageUtil.getTopLevelEditor(editor);
     final CommandState editorState = CommandState.getInstance(editor);
 
-    if (allowKeyMappings && handleKeyMapping(editor, key, context)) {
-      return;
-    }
-
-    final boolean isRecording = editorState.isRecording();
-    boolean shouldRecord = true;
     // If this is a "regular" character keystroke, get the character
     char chKey = key.getKeyChar() == KeyEvent.CHAR_UNDEFINED ? 0 : key.getKeyChar();
 
-    if (isEditorReset(key, editorState)) {
-      handleEditorReset(editor, key, context);
-    }
-    // At this point the user must be typing in a command. Most commands can be preceded by a number. Let's
-    // check if a number can be entered at this point, and if so, did the user send us a digit.
-    else if (isCommandCount(editorState, chKey)) {
+    final boolean isRecording = editorState.isRecording();
+    boolean shouldRecord = true;
+
+    // Check for command count before key mappings - otherwise e.g. ':map 0 ^' breaks command counts that contain a zero
+    if (isCommandCount(editorState, chKey)) {
       // Update the count
       count = count * 10 + (chKey - '0');
     }
+    else if (allowKeyMappings && handleKeyMapping(editor, key, context)) {
+      return;
+    }
     // Pressing delete while entering a count "removes" the last digit entered
+    // Unlike the digits, this must be checked *after* checking for key mappings
     else if (isDeleteCommandCount(key, editorState)) {
       // "Remove" the last digit sent to us
       count /= 10;
     }
+    else if (isEditorReset(key, editorState)) {
+      handleEditorReset(editor, key, context);
+    }
     // If we got this far the user is entering a command or supplying an argument to an entered command.
     // First let's check to see if we are at the point of expecting a single character argument to a command.
     else if (currentArg == Argument.Type.CHARACTER) {
@@ -164,7 +186,7 @@ public class KeyHandler {
       // If this is an argument node then the last keystroke was not part of the current command but should
       // be the first keystroke of the argument of the current command
       else if (node instanceof ArgumentNode) {
-        shouldRecord = handleArgumentNode(editor, key, context, editorState, true, (ArgumentNode)node);
+        shouldRecord = handleArgumentNode(editor, key, context, editorState, (ArgumentNode)node);
       }
       else {
         if (lastWasBS && lastChar != 0 && Options.getInstance().isSet("digraph")) {
@@ -179,7 +201,7 @@ public class KeyHandler {
           }
         }
         else if (editorState.getMappingMode() == MappingMode.CMD_LINE) {
-          if (!VimPlugin.getProcess().processExKey(editor, key, true)) {
+          if (!VimPlugin.getProcess().processExKey(editor, key)) {
             shouldRecord = false;
           }
         }
@@ -216,7 +238,7 @@ public class KeyHandler {
     }
   }
 
-  private boolean handleKeyMapping(@NotNull final Editor editor, @NotNull KeyStroke key,
+  private boolean handleKeyMapping(@NotNull final Editor editor, @NotNull final KeyStroke key,
                                    @NotNull final DataContext context) {
     final CommandState commandState = CommandState.getInstance(editor);
     commandState.stopMappingTimer();
@@ -231,29 +253,57 @@ public class KeyHandler {
     }
 
     final KeyMapping mapping = VimPlugin.getKey().getKeyMapping(mappingMode);
-    final MappingInfo mappingInfo = mapping.get(fromKeys);
+    final MappingInfo currentMappingInfo = mapping.get(fromKeys);
+    final MappingInfo prevMappingInfo = mapping.get(mappingKeys);
+    final MappingInfo mappingInfo = currentMappingInfo != null ? currentMappingInfo : prevMappingInfo;
+
+    final Application application = ApplicationManager.getApplication();
 
     if (mapping.isPrefix(fromKeys)) {
       mappingKeys.add(key);
-      commandState.startMappingTimer(new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent actionEvent) {
-          mappingKeys.clear();
-          for (KeyStroke keyStroke : fromKeys) {
-            handleKey(editor, keyStroke, new EditorDataContext(editor), false);
+      if (!application.isUnitTestMode() && Options.getInstance().isSet(Options.TIMEOUT)) {
+        commandState.startMappingTimer(new ActionListener() {
+          @Override
+          public void actionPerformed(ActionEvent actionEvent) {
+            mappingKeys.clear();
+            for (KeyStroke keyStroke : fromKeys) {
+              handleKey(editor, keyStroke, new EditorDataContext(editor), false);
+            }
           }
-        }
-      });
+        });
+      }
       return true;
     }
     else if (mappingInfo != null) {
       mappingKeys.clear();
-      final Application application = ApplicationManager.getApplication();
       final Runnable handleMappedKeys = new Runnable() {
         @Override
         public void run() {
-          for (KeyStroke keyStroke : mappingInfo.getToKeys()) {
-            handleKey(editor, keyStroke, new EditorDataContext(editor), mappingInfo.isRecursive());
+          if (editor.isDisposed()) {
+            return;
+          }
+          final List<KeyStroke> toKeys = mappingInfo.getToKeys();
+          final VimExtensionHandler extensionHandler = mappingInfo.getExtensionHandler();
+          final EditorDataContext currentContext = new EditorDataContext(editor);
+          if (toKeys != null) {
+            final boolean fromIsPrefix = isPrefix(mappingInfo.getFromKeys(), toKeys);
+            boolean first = true;
+            for (KeyStroke keyStroke : toKeys) {
+              final boolean recursive = mappingInfo.isRecursive() && !(first && fromIsPrefix);
+              handleKey(editor, keyStroke, currentContext, recursive);
+              first = false;
+            }
+          }
+          else if (extensionHandler != null) {
+            RunnableHelper.runWriteCommand(editor.getProject(), new Runnable() {
+              @Override
+              public void run() {
+                extensionHandler.execute(editor, context);
+              }
+            }, "Vim " + extensionHandler.getClass().getSimpleName(), null);
+          }
+          if (prevMappingInfo != null) {
+            handleKey(editor, key, currentContext);
           }
         }
       };
@@ -275,18 +325,32 @@ public class KeyHandler {
     }
   }
 
-  private void handleEditorReset(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull final DataContext context) {
-    if (state != State.COMMAND && count == 0 && currentArg == Argument.Type.NONE && currentCmd.size() == 0 &&
-        VimPlugin.getRegister().getCurrentRegister() == RegisterGroup.REGISTER_DEFAULT) {
-      if (key.getKeyCode() == KeyEvent.VK_ESCAPE) {
-        CommandProcessor.getInstance().executeCommand(editor.getProject(), new Runnable() {
-          @Override
-          public void run() {
-            KeyHandler.executeAction("EditorEscape", context);
-          }
-        }, "", null);
+  private static <T> boolean isPrefix(@NotNull List<T> list1, @NotNull List<T> list2) {
+    if (list1.size() > list2.size()) {
+      return false;
+    }
+    for (int i = 0; i < list1.size(); i++) {
+      if (!list1.get(i).equals(list2.get(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  private void handleEditorReset(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull final DataContext context) {
+    if (state != State.COMMAND && count == 0 && currentArg == Argument.Type.NONE && currentCmd.size() == 0) {
+      RegisterGroup register = VimPlugin.getRegister();
+      if (register.getCurrentRegister() == register.getDefaultRegister()) {
+        if (key.getKeyCode() == KeyEvent.VK_ESCAPE) {
+          CommandProcessor.getInstance().executeCommand(editor.getProject(), new Runnable() {
+            @Override
+            public void run() {
+              KeyHandler.executeAction("EditorEscape", context);
+            }
+          }, "", null);
+        }
+        VimPlugin.indicateError();
       }
-      VimPlugin.indicateError();
     }
     reset(editor);
   }
@@ -306,9 +370,7 @@ public class KeyHandler {
 
   private boolean isEditorReset(@NotNull KeyStroke key, @NotNull CommandState editorState) {
     return (editorState.getMode() == CommandState.Mode.COMMAND || state == State.COMMAND) &&
-           (key.getKeyCode() == KeyEvent.VK_ESCAPE ||
-            (key.getKeyCode() == KeyEvent.VK_C && (key.getModifiers() & KeyEvent.CTRL_MASK) != 0) ||
-            (key.getKeyCode() == '[' && (key.getModifiers() & KeyEvent.CTRL_MASK) != 0));
+           StringHelper.isCloseKeyStroke(key);
   }
 
   private void handleCharArgument(@NotNull KeyStroke key, char chKey) {
@@ -370,7 +432,6 @@ public class KeyHandler {
 
   private void executeCommand(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull DataContext context,
                               @NotNull CommandState editorState) {
-    DelegateCommandListener.getInstance().setRunnable(null);
     // Let's go through the command stack and merge it all into one command. At this time there should never
     // be more than two commands on the stack - one is the actual command and the other would be a motion
     // command argument needed by the first command
@@ -427,8 +488,7 @@ public class KeyHandler {
   }
 
   private boolean handleArgumentNode(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull DataContext context,
-                                     @NotNull CommandState editorState, boolean shouldRecord,
-                                     @NotNull ArgumentNode node) {
+                                     @NotNull CommandState editorState, @NotNull ArgumentNode node) {
     // Create a new command based on what the user has typed so far, excluding this keystroke.
     Command cmd = new Command(count, node.getActionId(), node.getAction(), node.getCmdType(), node.getFlags());
     cmd.setKeys(keys);
@@ -462,9 +522,9 @@ public class KeyHandler {
     if (currentArg != Argument.Type.NONE) {
       partialReset(editor);
       handleKey(editor, key, context);
-      shouldRecord = false; // Prevent this from getting recorded twice
+      return false;
     }
-    return shouldRecord;
+    return true;
   }
 
   private void handleCommandNode(@NotNull Editor editor, @NotNull DataContext context, @NotNull CommandNode node) {
@@ -546,12 +606,10 @@ public class KeyHandler {
    * @param name    The name of the action to execute
    * @param context The context to run it in
    */
-  public static void executeAction(@NotNull String name, @NotNull DataContext context) {
+  public static boolean executeAction(@NotNull String name, @NotNull DataContext context) {
     ActionManager aMgr = ActionManager.getInstance();
     AnAction action = aMgr.getAction(name);
-    if (action != null) {
-      executeAction(action, context);
-    }
+    return action != null && executeAction(action, context);
   }
 
   /**
@@ -560,16 +618,20 @@ public class KeyHandler {
    * @param action  The action to execute
    * @param context The context to run it in
    */
-  public static void executeAction(@NotNull AnAction action, @NotNull DataContext context) {
+  public static boolean executeAction(@NotNull AnAction action, @NotNull DataContext context) {
     // Hopefully all the arguments are sufficient. So far they all seem to work OK.
     // We don't have a specific InputEvent so that is null
     // What is "place"? Leave it the empty string for now.
     // Is the template presentation sufficient?
     // What are the modifiers? Is zero OK?
-    action.actionPerformed(
-      new AnActionEvent(null, context, "", action.getTemplatePresentation(), ActionManager.getInstance(),
-                        // API change - don't merge
-                        0));
+    final AnActionEvent event = new AnActionEvent(null, context, "", action.getTemplatePresentation(),
+                                                  ActionManager.getInstance(), 0);
+    action.update(event);
+    if (event.getPresentation().isEnabled()) {
+      action.actionPerformed(event);
+      return true;
+    }
+    return false;
   }
 
   /**
@@ -613,7 +675,6 @@ public class KeyHandler {
     lastChar = 0;
     lastWasBS = false;
     VimPlugin.getRegister().resetRegister();
-    DelegateCommandListener.getInstance().setRunnable(null);
   }
 
   /**
@@ -660,10 +721,10 @@ public class KeyHandler {
       }
     }
 
-    private Editor editor;
-    private DataContext context;
-    private Command cmd;
-    private KeyStroke key;
+    private final Editor editor;
+    private final DataContext context;
+    private final Command cmd;
+    private final KeyStroke key;
   }
 
   private static enum State {
@@ -677,7 +738,7 @@ public class KeyHandler {
   private int count;
   private List<KeyStroke> keys;
   private State state;
-  @NotNull private Stack<Command> currentCmd = new Stack<Command>();
+  @NotNull private final Stack<Command> currentCmd = new Stack<Command>();
   @NotNull private Argument.Type currentArg;
   private TypedActionHandler origHandler;
   @Nullable private DigraphSequence digraph = null;

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -37,7 +37,6 @@ public class RegisterActions {
     registerVimCommandActions();
 
     registerInsertModeActions();
-    registerVisualModeActions();
     registerNormalModeActions();
     registerNVOModesActions();
     registerCommandLineActions();
@@ -74,12 +73,12 @@ public class RegisterActions {
                             new KeyStroke[]{KeyStroke.getKeyStroke('g'),
                               KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_MASK)})
     );
-    // TODO - add zC
-    // TODO - add zO
     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,
@@ -148,6 +147,10 @@ public class RegisterActions {
         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}")}
@@ -172,6 +175,10 @@ public class RegisterActions {
                           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)
@@ -251,8 +258,7 @@ public class RegisterActions {
     parser
       .registerAction(MappingMode.NVO, "VimMotionFirstScreenLine", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
                       new Shortcut[]{
-                        new Shortcut('H'),
-                        new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, KeyEvent.CTRL_MASK))
+                        new Shortcut('H')
                       });
     parser
       .registerAction(MappingMode.NVO, "VimMotionGotoLineFirst", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
@@ -283,9 +289,6 @@ public class RegisterActions {
     parser
       .registerAction(MappingMode.NVO, "VimMotionLastScreenLine", Command.Type.MOTION, Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
                       new Shortcut('L'));
-    parser.registerAction(MappingMode.NVO, "VimMotionLastScreenLineEnd", Command.Type.MOTION,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_SAVE_JUMP,
-                          new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, KeyEvent.CTRL_MASK)));
     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))
@@ -605,8 +608,6 @@ public class RegisterActions {
                           new Shortcut('&'));
     parser.registerAction(MappingMode.N, "VimLastGlobalSearchReplace", Command.Type.OTHER_WRITABLE,
                           new Shortcut("g&"));
-    parser.registerAction(MappingMode.N, "VimVisualSelectPrevious", Command.Type.OTHER_READONLY,
-                          new Shortcut("gv"));
     parser.registerAction(MappingMode.N, "VimRepeatChange", Command.Type.OTHER_WRITABLE,
                           new Shortcut('.'));
     parser.registerAction(MappingMode.N, "VimRepeatExCommand", Command.Type.OTHER_WRITABLE,
@@ -631,17 +632,17 @@ public class RegisterActions {
     });
 
     // Shift Actions
-    // TODO - add =
-    // TODO - == will ignore count and only auto-indent 1 lines
     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,
+    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,
+    parser.registerAction(MappingMode.N, "VimShiftRightMotion", Command.Type.CHANGE, Command.FLAG_OP_PEND,
                           new Shortcut('>'), Argument.Type.MOTION);
 
     // Jump Actions
@@ -664,9 +665,6 @@ public class RegisterActions {
     parser.registerAction(MappingMode.N, "VimFileGetFileInfo", Command.Type.OTHER_READONLY,
                           new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_MASK)));
 
-    // Window Actions
-    // TODO - CTRL-W commands: +, -, =, S, s, _, b, c, n, o, q, s, t, <up>, <down>
-
     // Macro Actions
     parser.registerAction(MappingMode.N, "VimPlaybackLastRegister", Command.Type.OTHER_WRITABLE,
                           new Shortcut("@@"));
@@ -675,93 +673,6 @@ public class RegisterActions {
     // TODO - support for :map macros
   }
 
-  private static void registerVisualModeActions() {
-    final KeyGroup parser = VimPlugin.getKey();
-    parser.registerAction(MappingMode.V, "VimAutoIndentVisual", Command.Type.CHANGE,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_FORCE_LINEWISE,
-                          new Shortcut('='));
-    parser.registerAction(MappingMode.V, "VimReformatVisual", Command.Type.CHANGE,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_FORCE_LINEWISE,
-                          new Shortcut("gq"));
-    parser.registerAction(MappingMode.V, "VimChangeCaseLowerVisual", Command.Type.CHANGE,
-                          new Shortcut('u'));
-    parser.registerAction(MappingMode.V, "VimChangeCaseToggleVisual", Command.Type.CHANGE,
-                          new Shortcut('~'));
-    parser.registerAction(MappingMode.V, "VimChangeCaseUpperVisual", Command.Type.CHANGE,
-                          new Shortcut('U'));
-    parser.registerAction(MappingMode.V, "VimChangeVisual", Command.Type.CHANGE, Command.FLAG_MULTIKEY_UNDO, new Shortcut[]{
-      new Shortcut('c'),
-      new Shortcut('s')
-    });
-    parser.registerAction(MappingMode.V, "VimChangeVisualCharacter", Command.Type.CHANGE, Command.FLAG_ALLOW_DIGRAPH,
-                          new Shortcut('r'), Argument.Type.DIGRAPH);
-    parser.registerAction(MappingMode.V, "VimChangeVisualLines", Command.Type.CHANGE,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_MULTIKEY_UNDO, new Shortcut[]{
-        new Shortcut('R'),
-        new Shortcut('S')
-      });
-    parser.registerAction(MappingMode.V, "VimChangeVisualLinesEnd", Command.Type.CHANGE,
-                          Command.FLAG_MOT_LINEWISE | Command.FLAG_MULTIKEY_UNDO, new Shortcut[]{
-        new Shortcut('C')
-      });
-    parser.registerAction(MappingMode.V, "VimCopyYankVisual", Command.Type.COPY,
-                          new Shortcut('y'));
-    parser.registerAction(MappingMode.V, "VimCopyYankVisualLines", Command.Type.COPY, Command.FLAG_MOT_LINEWISE,
-                          new Shortcut('Y'));
-    parser.registerAction(MappingMode.V, "VimDeleteJoinVisualLines", Command.Type.DELETE,
-                          new Shortcut("gJ"));
-    parser.registerAction(MappingMode.V, "VimDeleteJoinVisualLinesSpaces", Command.Type.DELETE,
-                          new Shortcut('J'));
-    parser.registerAction(MappingMode.V, "VimDeleteVisual", Command.Type.DELETE, new Shortcut[]{
-      new Shortcut('d'),
-      new Shortcut('x'),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0))
-    });
-    parser.registerAction(MappingMode.V, "VimDeleteVisualLinesEnd", Command.Type.DELETE, Command.FLAG_MOT_LINEWISE, new Shortcut[]{
-      new Shortcut('D')
-    });
-    parser.registerAction(MappingMode.V, "VimDeleteVisualLines", Command.Type.DELETE, Command.FLAG_MOT_LINEWISE, new Shortcut[]{
-      new Shortcut('X')
-    });
-    parser.registerAction(MappingMode.V, "VimFilterVisualLines", Command.Type.CHANGE, Command.FLAG_MOT_LINEWISE,
-                          new Shortcut('!'));
-    parser.registerAction(MappingMode.V, "VimShiftLeftVisual", Command.Type.CHANGE,
-                          new Shortcut('<'));
-    parser.registerAction(MappingMode.V, "VimShiftRightVisual", Command.Type.CHANGE,
-                          new Shortcut('>'));
-    parser.registerAction(MappingMode.V, "VimVisualExitMode", Command.Type.OTHER_READONLY, new Shortcut[]{
-      new Shortcut(KeyStroke.getKeyStroke('[', KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_MASK)),
-      new Shortcut(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0)),
-      new Shortcut(new KeyStroke[]{KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SLASH, KeyEvent.CTRL_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_MASK)})
-    });
-    parser.registerAction(MappingMode.V, "VimVisualPutText", Command.Type.PASTE, new Shortcut[]{
-      new Shortcut('P'),
-      new Shortcut('p')
-    });
-    parser.registerAction(MappingMode.V, "VimVisualPutTextMoveCursor", Command.Type.PASTE, new Shortcut[]{
-      new Shortcut("gp"),
-      new Shortcut("gP")
-    });
-    parser.registerAction(MappingMode.V, "VimVisualPutTextNoIndent", Command.Type.PASTE, new Shortcut[]{
-      new Shortcut("[p"),
-      new Shortcut("]p"),
-      new Shortcut("[P"),
-      new Shortcut("]P")
-    });
-    parser.registerAction(MappingMode.V, "VimVisualBlockInsert", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('I'));
-    parser.registerAction(MappingMode.V, "VimVisualBlockAppend", Command.Type.INSERT, Command.FLAG_MULTIKEY_UNDO,
-                          new Shortcut('A'));
-    parser.registerAction(MappingMode.V, "VimVisualSwapEnds", Command.Type.OTHER_READONLY,
-                          new Shortcut('o'));
-    parser.registerAction(MappingMode.V, "VimVisualSwapEndsBlock", Command.Type.OTHER_READONLY,
-                          new Shortcut('O'));
-    parser.registerAction(MappingMode.V, "VimVisualSwapSelections", Command.Type.OTHER_READONLY,
-                          new Shortcut("gv"));
-  }
-
   private static void registerInsertModeActions() {
     final KeyGroup parser = VimPlugin.getKey();
     // Other insert actions
@@ -819,11 +730,11 @@ public class RegisterActions {
                           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, Command.FLAG_SAVE_STROKE, new Shortcut[]{
+    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, Command.FLAG_SAVE_STROKE, new Shortcut[]{
+    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))
     });

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -17,26 +17,23 @@
  */
 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.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ex.ApplicationEx;
-import com.intellij.openapi.application.ex.ApplicationManagerEx;
-import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.EditorFactory;
 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.editor.ex.EditorEx;
 import com.intellij.openapi.extensions.PluginId;
-import com.intellij.openapi.fileEditor.FileEditorManagerListener;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.ex.KeymapManagerEx;
 import com.intellij.openapi.keymap.impl.DefaultKeymap;
@@ -45,24 +42,31 @@ 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;
 import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.WindowManager;
-import com.maddyhome.idea.vim.command.CommandState;
+import com.intellij.util.io.HttpRequests;
 import com.maddyhome.idea.vim.ex.CommandParser;
-import com.maddyhome.idea.vim.ex.VimScriptParser;
+import com.maddyhome.idea.vim.ex.vimscript.VimScriptParser;
 import com.maddyhome.idea.vim.group.*;
-import com.maddyhome.idea.vim.helper.*;
+import com.maddyhome.idea.vim.helper.DocumentManager;
+import com.maddyhome.idea.vim.helper.MacKeyRepeat;
 import com.maddyhome.idea.vim.option.Options;
 import com.maddyhome.idea.vim.ui.VimEmulationConfigurable;
 import org.jdom.Element;
+import org.jdom.JDOMException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import java.awt.*;
 import java.io.File;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.concurrent.TimeUnit;
 
 /**
  * This plugin attempts to emulate the key binding and general functionality of Vim and gVim. See the supplied
@@ -82,19 +86,12 @@ import java.io.File;
 public class VimPlugin implements ApplicationComponent, PersistentStateComponent<Element> {
   private static final String IDEAVIM_COMPONENT_NAME = "VimPlugin";
   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 = 3;
+  public static final int STATE_VERSION = 4;
 
-  private static final boolean BLOCK_CURSOR_VIM_VALUE = true;
-  private static final boolean ANIMATED_SCROLLING_VIM_VALUE = false;
-  private static final boolean REFRAIN_FROM_SCROLLING_VIM_VALUE = true;
-
-  private VimTypedActionHandler vimHandler;
-  private boolean isBlockCursor = false;
-  private boolean isAnimatedScrolling = false;
-  private boolean isRefrainFromScrolling = false;
   private boolean error = false;
 
   private int previousStateVersion = 0;
@@ -103,26 +100,24 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
   // It is enabled by default to avoid any special configuration after plugin installation
   private boolean enabled = true;
 
-  private static Logger LOG = Logger.getInstance(VimPlugin.class);
+  private static final Logger LOG = Logger.getInstance(VimPlugin.class);
 
-  private final Application myApp;
-
-  private MotionGroup motion;
-  private ChangeGroup change;
-  private CopyGroup copy;
-  private MarkGroup mark;
-  private RegisterGroup register;
-  private FileGroup file;
-  private SearchGroup search;
-  private ProcessGroup process;
-  private MacroGroup macro;
-  private DigraphGroup digraph;
-  private HistoryGroup history;
-  private KeyGroup key;
-
-  public VimPlugin(final Application app) {
-    myApp = app;
+  @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;
 
+  public VimPlugin() {
     motion = new MotionGroup();
     change = new ChangeGroup();
     copy = new CopyGroup();
@@ -135,6 +130,8 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     digraph = new DigraphGroup();
     history = new HistoryGroup();
     key = new KeyGroup();
+    window = new WindowGroup();
+    editor = new EditorGroup();
 
     LOG.debug("VimPlugin ctr");
   }
@@ -157,12 +154,8 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
       }
     });
 
-    EditorActionManager manager = EditorActionManager.getInstance();
-    TypedAction action = manager.getTypedAction();
-
-    // Replace the default key handler with the Vim key handler
-    vimHandler = new VimTypedActionHandler(action.getHandler());
-    action.setupHandler(vimHandler);
+    final TypedAction typedAction = EditorActionManager.getInstance().getTypedAction();
+    EventFacade.getInstance().setupTypedActionHandler(new VimTypedActionHandler(typedAction.getRawHandler()));
 
     // Register vim actions in command mode
     RegisterActions.registerActions();
@@ -174,9 +167,9 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     CommandParser.getInstance().registerHandlers();
 
     if (!ApplicationManager.getApplication().isUnitTestMode()) {
-      final File vimrc = VimScriptParser.findVimrc();
-      if (vimrc != null) {
-        VimScriptParser.executeFile(vimrc);
+      final File ideaVimRc = VimScriptParser.findIdeaVimRc();
+      if (ideaVimRc != null) {
+        VimScriptParser.executeFile(ideaVimRc);
       }
     }
 
@@ -187,9 +180,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
   public void disposeComponent() {
     LOG.debug("disposeComponent");
     turnOffPlugin();
-    EditorActionManager manager = EditorActionManager.getInstance();
-    TypedAction action = manager.getTypedAction();
-    action.setupHandler(vimHandler.getOriginalTypedHandler());
+    EventFacade.getInstance().restoreTypedActionHandler();
     LOG.debug("done");
   }
 
@@ -209,6 +200,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     search.saveData(element);
     history.saveData(element);
     key.saveData(element);
+    editor.saveData(element);
 
     return element;
   }
@@ -234,60 +226,95 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     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() {
     return PluginId.getId(IDEAVIM_PLUGIN_ID);
   }
 
+  @NotNull
+  public static String getVersion() {
+    if (!ApplicationManager.getApplication().isInternal()) {
+      final IdeaPluginDescriptor plugin = PluginManager.getPlugin(getPluginId());
+      return plugin != null ? plugin.getVersion() : "SNAPSHOT";
+    }
+    else {
+      return "INTERNAL";
+    }
+  }
+
   public static boolean isEnabled() {
     return getInstance().enabled;
   }
@@ -353,41 +380,38 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
 
   private void turnOnPlugin() {
     KeyHandler.getInstance().fullReset(null);
-    setCursors(BLOCK_CURSOR_VIM_VALUE);
-    setAnimatedScrolling(ANIMATED_SCROLLING_VIM_VALUE);
-    setRefrainFromScrolling(REFRAIN_FROM_SCROLLING_VIM_VALUE);
 
+    getEditor().turnOn();
     getMotion().turnOn();
   }
 
   private void turnOffPlugin() {
     KeyHandler.getInstance().fullReset(null);
-    setCursors(isBlockCursor);
-    setAnimatedScrolling(isAnimatedScrolling);
-    setRefrainFromScrolling(isRefrainFromScrolling);
 
+    getEditor().turnOff();
     getMotion().turnOff();
   }
 
   private void updateState() {
     if (isEnabled() && !ApplicationManager.getApplication().isUnitTestMode()) {
-      boolean requiresRestart = false;
-      if (previousStateVersion < 2 && SystemInfo.isMac) {
+      if (SystemInfo.isMac) {
         final MacKeyRepeat keyRepeat = MacKeyRepeat.getInstance();
         final Boolean enabled = keyRepeat.isEnabled();
-        if (enabled == null || !enabled) {
-          if (Messages.showYesNoDialog("Do you want to enable repeating keys in Mac OS X on press and hold " +
-                                       "(requires restart)?\n\n" +
+        final Boolean isKeyRepeat = editor.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) {
+                                       Messages.getQuestionIcon()) == Messages.YES) {
+            editor.setKeyRepeat(true);
             keyRepeat.setEnabled(true);
-            requiresRestart = true;
+          }
+          else {
+            editor.setKeyRepeat(false);
           }
         }
       }
-      if (previousStateVersion < 3) {
+      if (previousStateVersion > 0 && previousStateVersion < 3) {
         final KeymapManagerEx manager = KeymapManagerEx.getInstanceEx();
         Keymap keymap = null;
         if (previousKeyMap != null) {
@@ -404,7 +428,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
                         "Switching to \"%s\" keymap.<br/><br/>" +
                         "Now it is possible to set up:<br/>" +
                         "<ul>" +
-                        "<li>Vim keys in your .vimrc file using key mapping commands</li>" +
+                        "<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()),
@@ -417,9 +441,14 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
           }).notify(null);
         manager.setActiveKeymap(keymap);
       }
-      if (requiresRestart) {
-        final ApplicationEx app = ApplicationManagerEx.getApplicationEx();
-        app.restart();
+      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);
       }
     }
   }
@@ -428,85 +457,79 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
    * This sets up some listeners so we can handle various events that occur
    */
   private void setupListeners() {
+    final EventFacade eventFacade = EventFacade.getInstance();
+
+    setupStatisticsReporter(eventFacade);
+
     DocumentManager.getInstance().addDocumentListener(new MarkGroup.MarkUpdater());
     DocumentManager.getInstance().addDocumentListener(new SearchGroup.DocumentSearchListener());
-    DocumentManager.getInstance().init();
 
-    EditorFactory.getInstance().addEditorFactoryListener(new EditorFactoryAdapter() {
-      @Override
-      public void editorCreated(@NotNull EditorFactoryEvent event) {
-        final Editor editor = event.getEditor();
-        isBlockCursor = editor.getSettings().isBlockCursor();
-        isAnimatedScrolling = editor.getSettings().isAnimatedScrolling();
-        isRefrainFromScrolling = editor.getSettings().isRefrainFromScrolling();
-        EditorData.initializeEditor(editor);
-        DocumentManager.getInstance().addListeners(editor.getDocument());
-        key.registerRequiredShortcutKeys(editor);
-
-        if (VimPlugin.isEnabled()) {
-          // Turn on insert mode if editor doesn't have any file
-          if (!EditorData.isFileEditor(editor) && editor.getDocument().isWritable() &&
-              !CommandState.inInsertMode(editor)) {
-            KeyHandler.getInstance().handleKey(editor, KeyStroke.getKeyStroke('i'), new EditorDataContext(editor));
-          }
-          editor.getSettings().setBlockCursor(!CommandState.inInsertMode(editor));
-          editor.getSettings().setAnimatedScrolling(ANIMATED_SCROLLING_VIM_VALUE);
-          editor.getSettings().setRefrainFromScrolling(REFRAIN_FROM_SCROLLING_VIM_VALUE);
-        }
-      }
-
-      @Override
-      public void editorReleased(@NotNull EditorFactoryEvent event) {
-        final Editor editor = event.getEditor();
-        EditorData.uninitializeEditor(editor);
-        key.unregisterShortcutKeys(editor);
-        editor.getSettings().setAnimatedScrolling(isAnimatedScrolling);
-        editor.getSettings().setRefrainFromScrolling(isRefrainFromScrolling);
-        DocumentManager.getInstance().removeListeners(editor.getDocument());
-      }
-    }, myApp);
-
-    // Since the Vim plugin custom actions aren't available to the call to <code>initComponent()</code>
-    // we need to force the generation of the key map when the first project is opened.
-    ProjectManager.getInstance().addProjectManagerListener(new ProjectManagerAdapter() {
+    eventFacade.addProjectManagerListener(new ProjectManagerAdapter() {
       @Override
       public void projectOpened(@NotNull final Project project) {
-        project.getMessageBus().connect()
-          .subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new MotionGroup.MotionEditorChange());
-        project.getMessageBus().connect()
-          .subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileGroup.SelectionCheck());
-        project.getMessageBus().connect()
-          .subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new SearchGroup.EditorSelectionCheck());
-      }
-
-      @Override
-      public void projectClosed(final Project project) {
+        eventFacade.addFileEditorManagerListener(project, new MotionGroup.MotionEditorChange());
+        eventFacade.addFileEditorManagerListener(project, new FileGroup.SelectionCheck());
+        eventFacade.addFileEditorManagerListener(project, new SearchGroup.EditorSelectionCheck());
       }
     });
-
-    CommandProcessor.getInstance().addCommandListener(DelegateCommandListener.getInstance());
   }
 
-  private void setCursors(boolean isBlock) {
-    Editor[] editors = EditorFactory.getInstance().getAllEditors();
-    for (Editor editor : editors) {
-      // Vim plugin should be turned on in insert mode
-      ((EditorEx)editor).setInsertMode(true);
-      editor.getSettings().setBlockCursor(isBlock);
-    }
-  }
-
-  private void setAnimatedScrolling(boolean isOn) {
-    Editor[] editors = EditorFactory.getInstance().getAllEditors();
-    for (Editor editor : editors) {
-      editor.getSettings().setAnimatedScrolling(isOn);
-    }
-  }
-
-  private void setRefrainFromScrolling(boolean isOn) {
-    Editor[] editors = EditorFactory.getInstance().getAllEditors();
-    for (Editor editor : editors) {
-      editor.getSettings().setRefrainFromScrolling(isOn);
-    }
+  /**
+   * 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);
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -22,8 +22,11 @@ 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.TypedActionHandler;
+import com.intellij.openapi.editor.actionSystem.TypedActionHandlerEx;
+import com.maddyhome.idea.vim.helper.EditorDataContext;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -33,11 +36,11 @@ import javax.swing.*;
  *
  * IDE shortcut keys used by Vim commands are handled by {@link com.maddyhome.idea.vim.action.VimShortcutKeyAction}.
  */
-public class VimTypedActionHandler implements TypedActionHandler {
-  private static Logger logger = Logger.getInstance(VimTypedActionHandler.class.getName());
+public class VimTypedActionHandler implements TypedActionHandlerEx {
+  private static final Logger logger = Logger.getInstance(VimTypedActionHandler.class.getName());
 
-  private TypedActionHandler origHandler;
-  private KeyHandler handler;
+  private final TypedActionHandler origHandler;
+  @NotNull private final KeyHandler handler;
 
   public VimTypedActionHandler(TypedActionHandler origHandler) {
     this.origHandler = origHandler;
@@ -45,31 +48,34 @@ public class VimTypedActionHandler implements TypedActionHandler {
     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);
+      }
+    }
+  }
+
   @Override
   public void execute(@NotNull final Editor editor, final char charTyped, @NotNull final DataContext context) {
     if (isEnabled(editor)) {
-      // Run key handler outside of the key typed command for creating our own undoable commands
-      SwingUtilities.invokeLater(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), context);
-          }
-          catch (Throwable e) {
-            logger.error(e);
-          }
-        }
-      });
+      try {
+        handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), new EditorDataContext(editor));
+      }
+      catch (Throwable e) {
+        logger.error(e);
+      }
     }
     else {
       origHandler.execute(editor, charTyped, context);
     }
   }
 
-  public TypedActionHandler getOriginalTypedHandler() {
-    return origHandler;
-  }
-
   private boolean isEnabled(@NotNull Editor editor) {
     if (VimPlugin.isEnabled()) {
       final Lookup lookup = LookupManager.getActiveLookup(editor);

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -18,11 +18,13 @@
 
 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.*;
@@ -66,4 +68,13 @@ public abstract class VimCommandAction extends EditorAction {
   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,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -23,10 +23,8 @@ 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.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.KeyboardShortcut;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.keymap.KeymapUtil;
 import com.intellij.openapi.options.ShowSettingsUtil;
@@ -37,6 +35,7 @@ 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 org.jetbrains.annotations.NotNull;
@@ -59,7 +58,9 @@ import static java.awt.event.KeyEvent.*;
  * 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 {
-  @NotNull public static Set<KeyStroke> VIM_ONLY_EDITOR_KEYS = ImmutableSet.<KeyStroke>builder()
+  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))
@@ -72,17 +73,22 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {
     .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, CTRL_MASK, SHIFT_MASK, CTRL_MASK | SHIFT_MASK))
-    .addAll(getKeyStrokes(VK_PAGE_DOWN, 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 Set<KeyStroke> NON_FILE_EDITOR_KEYS = ImmutableSet.<KeyStroke>builder()
+  @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);
@@ -92,7 +98,12 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {
         notifyAboutShortcutConflict(keyStroke);
       }
       // Should we use InjectedLanguageUtil.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
-      KeyHandler.getInstance().handleKey(editor, keyStroke, e.getDataContext());
+      try {
+        KeyHandler.getInstance().handleKey(editor, keyStroke, new EditorDataContext(editor));
+      }
+      catch (Throwable throwable) {
+        ourLogger.error(throwable);
+      }
     }
   }
 
@@ -101,6 +112,15 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {
     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(
@@ -139,7 +159,8 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {
           return isExitInsertMode(keyStroke);
         }
         if (CommandState.inInsertMode(editor)) {
-          if (keyCode == VK_ENTER) {
+          // XXX: <Tab> won't be recorded in macros
+          if (keyCode == VK_TAB) {
             return false;
           }
           // Debug watch, Python console, etc.
@@ -183,7 +204,8 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {
     return !VimPlugin.getKey().getKeymapConflicts(keyStroke).isEmpty();
   }
 
-  private static List<KeyStroke> getKeyStrokes(int keyCode, int... modifiers) {
+  @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));

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

@@ -0,0 +1,98 @@
+/*
+ * 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, 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_READ_WRITE;
+  }
+
+  @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/RedoAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -41,6 +41,7 @@ public class RepeatChangeAction extends EditorAction {
     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());
@@ -53,6 +54,9 @@ public class RepeatChangeAction extends EditorAction {
           }
         }
         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();
@@ -67,6 +71,7 @@ public class RepeatChangeAction extends EditorAction {
         if (save != null) {
           state.setCommand(save);
         }
+        VimPlugin.getMotion().setLastFTCmd(lastFTCmd, lastFTChar);
         state.saveLastChangeCommand(cmd);
         VimPlugin.getRegister().selectRegister(reg);
 

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,17 +20,22 @@ 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.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.VisualOperatorActionHandler;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
  * @author vlan
  */
-public class AutoIndentLinesVisualAction extends EditorAction {
+public class AutoIndentLinesVisualAction extends VimCommandAction {
   public AutoIndentLinesVisualAction() {
     super(new VisualOperatorActionHandler() {
       @Override
@@ -38,9 +43,32 @@ public class AutoIndentLinesVisualAction extends EditorAction {
                                 @NotNull DataContext context,
                                 @NotNull Command cmd,
                                 @NotNull TextRange range) {
-        VimPlugin.getChange().autoIndentLines(context);
+        VimPlugin.getChange().autoIndentRange(editor, 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/ChangeCaseLowerMotionAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,28 +20,54 @@ 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.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.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 EditorAction {
+public class ChangeCaseLowerVisualAction extends VimCommandAction {
   public ChangeCaseLowerVisualAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        final Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(editor);
+        return VimPlugin.getChange().changeCaseRange(topLevelEditor, range, CharacterHelper.CASE_LOWER);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      return VimPlugin.getChange().changeCaseRange(InjectedLanguageUtil.getTopLevelEditor(editor),
-                                                                     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/ChangeCaseToggleCharacterAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,25 +20,52 @@ 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.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.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 EditorAction {
+public class ChangeCaseToggleVisualAction extends VimCommandAction {
   public ChangeCaseToggleVisualAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        return VimPlugin.getChange().changeCaseRange(editor, range, CharacterHelper.CASE_TOGGLE);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      return VimPlugin.getChange().changeCaseRange(editor, 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/ChangeCaseUpperMotionAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,25 +20,52 @@ 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.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.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 EditorAction {
+public class ChangeCaseUpperVisualAction extends VimCommandAction {
   public ChangeCaseUpperVisualAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        return VimPlugin.getChange().changeCaseRange(editor, range, CharacterHelper.CASE_UPPER);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      return VimPlugin.getChange().changeCaseRange(editor, 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/ChangeCharacterAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -39,7 +39,7 @@ public class ChangeLastGlobalSearchReplaceAction extends EditorAction {
   private static class Handler extends ChangeEditorActionHandler {
     public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, @Nullable Argument argument) {
       LineRange range = new LineRange(0, EditorHelper.getLineCount(editor) - 1);
-      return VimPlugin.getSearch().searchAndReplace(editor, context, range, "s", "//~/&");
+      return VimPlugin.getSearch().searchAndReplace(editor, range, "s", "//~/&");
     }
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -39,7 +39,7 @@ public class ChangeLastSearchReplaceAction extends EditorAction {
     public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, @Nullable Argument argument) {
       int line = editor.getCaretModel().getLogicalPosition().line;
       LineRange range = new LineRange(line, line);
-      return VimPlugin.getSearch().searchAndReplace(editor, context, range, "s", "//~/");
+      return VimPlugin.getSearch().searchAndReplace(editor, range, "s", "//~/");
     }
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,26 +20,53 @@ 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.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.VisualOperatorActionHandler;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class ChangeVisualAction extends EditorAction {
+public class ChangeVisualAction extends VimCommandAction {
   public ChangeVisualAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        final SelectionType type = range.isMultiple() ? SelectionType.BLOCK_WISE : SelectionType.CHARACTER_WISE;
+        return VimPlugin.getChange().changeRange(editor, context, range, type);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      final SelectionType type = range.isMultiple() ? SelectionType.BLOCK_WISE : SelectionType.CHARACTER_WISE;
-      return VimPlugin.getChange().changeRange(editor, context, 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;
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,24 +20,59 @@ 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.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.maddyhome.idea.vim.common.TextRange;
 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 ChangeVisualCharacterAction extends EditorAction {
+public class ChangeVisualCharacterAction extends VimCommandAction {
   public ChangeVisualCharacterAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        final Argument argument = cmd.getArgument();
+        return argument != null && VimPlugin.getChange().changeCharacterRange(editor, range, argument.getCharacter());
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd, @NotNull TextRange range) {
-      return VimPlugin.getChange().changeCharacterRange(editor, range,
-                                                                          cmd.getArgument().getCharacter());
-    }
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
+
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("r");
+  }
+
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.CHANGE;
+  }
+
+  @NotNull
+  @Override
+  public Argument.Type getArgumentType() {
+    return Argument.Type.DIGRAPH;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_ALLOW_DIGRAPH | Command.FLAG_EXIT_VISUAL;
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,29 +20,55 @@ 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.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.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class ChangeVisualLinesAction extends EditorAction {
+public class ChangeVisualLinesAction extends VimCommandAction {
   public ChangeVisualLinesAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        final TextRange lineRange = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
+                                                  EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+        return VimPlugin.getChange().changeRange(editor, context, lineRange, SelectionType.LINE_WISE);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
-                            EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-      return VimPlugin.getChange().changeRange(editor, context, range, SelectionType.LINE_WISE);
-    }
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("R", "S");
+  }
+
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.CHANGE;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_MOT_LINEWISE | Command.FLAG_MULTIKEY_UNDO | Command.FLAG_EXIT_VISUAL;
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,43 +20,68 @@ 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.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.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class ChangeVisualLinesEndAction extends EditorAction {
+public class ChangeVisualLinesEndAction extends VimCommandAction {
   public ChangeVisualLinesEndAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        if (range.isMultiple()) {
+          final int[] starts = range.getStartOffsets();
+          final int[] ends = range.getEndOffsets();
+          for (int i = 0; i < starts.length; i++) {
+            if (ends[i] > starts[i]) {
+              ends[i] = EditorHelper.getLineEndForOffset(editor, starts[i]);
+            }
+          }
+          final TextRange blockRange = new TextRange(starts, ends);
+          return VimPlugin.getChange().changeRange(editor, context, blockRange, SelectionType.BLOCK_WISE);
+        }
+        else {
+          final TextRange lineRange = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
+                                                    EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+          return VimPlugin.getChange().changeRange(editor, context, lineRange, SelectionType.LINE_WISE);
+        }
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      if (range.isMultiple()) {
-        int[] starts = range.getStartOffsets();
-        int[] ends = range.getEndOffsets();
-        for (int i = 0; i < starts.length; i++) {
-          if (ends[i] > starts[i]) {
-            ends[i] = EditorHelper.getLineEndForOffset(editor, starts[i]);
-          }
-        }
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-        range = new TextRange(starts, ends);
-        return VimPlugin.getChange().changeRange(editor, context, range, SelectionType.BLOCK_WISE);
-      }
-      else {
-        range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
-                              EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("C");
+  }
 
-        return VimPlugin.getChange().changeRange(editor, context, range, SelectionType.LINE_WISE);
-      }
-    }
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.CHANGE;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_MOT_LINEWISE | Command.FLAG_MULTIKEY_UNDO | Command.FLAG_EXIT_VISUAL;
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -23,6 +23,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
 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.command.Command;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.MotionGroup;
@@ -38,8 +39,11 @@ public class FilterMotionAction extends EditorAction {
 
   private static class Handler extends EditorActionHandlerBase {
     protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
-      TextRange range = MotionGroup.getMotionRange(editor, context, cmd.getCount(), cmd.getRawCount(),
-                                                   cmd.getArgument(), false, false);
+      final Argument argument = cmd.getArgument();
+      if (argument == null) {
+        return false;
+      }
+      TextRange range = MotionGroup.getMotionRange(editor, context, cmd.getCount(), cmd.getRawCount(), argument, false);
       if (range == null) {
         return false;
       }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,25 +20,51 @@ 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.action.VimCommandAction;
 import com.maddyhome.idea.vim.command.Command;
+import com.maddyhome.idea.vim.command.MappingMode;
 import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class FilterVisualLinesAction extends EditorAction {
+public class FilterVisualLinesAction extends VimCommandAction {
   public FilterVisualLinesAction() {
-    super(new Handler());
+    super(new EditorActionHandlerBase() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
+        VimPlugin.getProcess().startFilterCommand(editor, context, cmd);
+        VimPlugin.getMotion().resetVisual(editor, true);
+        return true;
+      }
+    });
   }
 
-  private static class Handler extends EditorActionHandlerBase {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
-      VimPlugin.getProcess().startFilterCommand(editor, context, cmd);
-      VimPlugin.getMotion().resetVisual(editor, true);
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-      return true;
-    }
+  @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;
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,27 +20,53 @@ 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.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.VisualOperatorActionHandler;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
  * @author vlan
  */
-public class ReformatCodeVisualAction extends EditorAction {
+public class ReformatCodeVisualAction extends VimCommandAction {
   public ReformatCodeVisualAction() {
     super(new VisualOperatorActionHandler() {
       @Override
-      protected boolean execute(@NotNull Editor editor,
-                                @NotNull DataContext context,
-                                @NotNull Command cmd,
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
                                 @NotNull TextRange range) {
         VimPlugin.getChange().reformatCode(context);
         return true;
       }
     });
   }
+
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
+
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("gq");
+  }
+
+  @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/delete/DeleteCharacterAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterLeftAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterRightAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/delete/DeleteEndOfLineAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesSpacesAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,28 +20,51 @@ package com.maddyhome.idea.vim.action.change.delete;
 
 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.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.VisualOperatorActionHandler;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class DeleteJoinVisualLinesAction extends EditorAction {
+public class DeleteJoinVisualLinesAction extends VimCommandAction {
   public DeleteJoinVisualLinesAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        return !editor.isOneLineMode() && VimPlugin.getChange().deleteJoinRange(editor, range, false);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      if (editor.isOneLineMode()) {
-        return false;
-      }
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-      return VimPlugin.getChange().deleteJoinRange(editor, range, false);
-    }
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("gJ");
+  }
+
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.DELETE;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_EXIT_VISUAL;
   }
 }

src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesSpacesAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,28 +20,51 @@ package com.maddyhome.idea.vim.action.change.delete;
 
 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.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.VisualOperatorActionHandler;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class DeleteJoinVisualLinesSpacesAction extends EditorAction {
+public class DeleteJoinVisualLinesSpacesAction extends VimCommandAction {
   public DeleteJoinVisualLinesSpacesAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        return !editor.isOneLineMode() && VimPlugin.getChange().deleteJoinRange(editor, range, true);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      if (editor.isOneLineMode()) {
-        return false;
-      }
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-      return VimPlugin.getChange().deleteJoinRange(editor, range, true);
-    }
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("J");
+  }
+
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.DELETE;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_EXIT_VISUAL;
   }
 }

src/com/maddyhome/idea/vim/action/change/delete/DeleteLineAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/delete/DeleteMotionAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,34 +20,62 @@ package com.maddyhome.idea.vim.action.change.delete;
 
 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.action.VimCommandAction;
 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.command.SelectionType;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class DeleteVisualAction extends EditorAction {
+public class DeleteVisualAction extends VimCommandAction {
   public DeleteVisualAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        final CommandState.SubMode mode = CommandState.getInstance(editor).getSubMode();
+        if (mode == CommandState.SubMode.VISUAL_LINE) {
+          final TextRange lineRange = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
+                                                    EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+          return VimPlugin.getChange().deleteRange(editor, lineRange, SelectionType.fromSubMode(mode), false);
+        }
+        else {
+          return VimPlugin.getChange().deleteRange(editor, range, SelectionType.fromSubMode(mode), false);
+        }
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      CommandState.SubMode mode = CommandState.getInstance(editor).getSubMode();
-      if (mode == CommandState.SubMode.VISUAL_LINE) {
-        range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
-                              EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
-      }
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-      return VimPlugin.getChange().deleteRange(editor, range,
-                                                                 SelectionType.fromSubMode(mode), false);
-    }
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("d", "x", "<Del>");
+  }
+
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.DELETE;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_EXIT_VISUAL;
   }
 }

src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,37 +20,62 @@ package com.maddyhome.idea.vim.action.change.delete;
 
 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.action.VimCommandAction;
 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.command.SelectionType;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class DeleteVisualLinesAction extends EditorAction {
+public class DeleteVisualLinesAction extends VimCommandAction {
   public DeleteVisualLinesAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        final CommandState.SubMode mode = CommandState.getInstance(editor).getSubMode();
+        if (mode == CommandState.SubMode.VISUAL_BLOCK) {
+          return VimPlugin.getChange().deleteRange(editor, range, SelectionType.fromSubMode(mode), false);
+        }
+        else {
+          final TextRange lineRange = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
+                                                    EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+          return VimPlugin.getChange().deleteRange(editor, lineRange, SelectionType.LINE_WISE, false);
+        }
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      CommandState.SubMode mode = CommandState.getInstance(editor).getSubMode();
-      if (mode == CommandState.SubMode.VISUAL_BLOCK) {
-        return VimPlugin.getChange().deleteRange(editor, range,
-                                                                   SelectionType.fromSubMode(mode), false);
-      }
-      else {
-        range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
-                              EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-        return VimPlugin.getChange().deleteRange(editor, range, SelectionType.LINE_WISE, false);
-      }
-    }
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("X");
+  }
+
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.DELETE;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_MOT_LINEWISE | Command.FLAG_EXIT_VISUAL;
   }
 }

src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesEndAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,45 +20,68 @@ package com.maddyhome.idea.vim.action.change.delete;
 
 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.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.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class DeleteVisualLinesEndAction extends EditorAction {
+public class DeleteVisualLinesEndAction extends VimCommandAction {
   public DeleteVisualLinesEndAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        if (range.isMultiple()) {
+          final int[] starts = range.getStartOffsets();
+          final int[] ends = range.getEndOffsets();
+          for (int i = 0; i < starts.length; i++) {
+            if (ends[i] > starts[i]) {
+              ends[i] = EditorHelper.getLineEndForOffset(editor, starts[i]);
+            }
+          }
+          final TextRange blockRange = new TextRange(starts, ends);
+          return VimPlugin.getChange().deleteRange(editor, blockRange, SelectionType.BLOCK_WISE, false);
+        }
+        else {
+          final TextRange lineRange = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
+                                                    EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+          return VimPlugin.getChange().deleteRange(editor, lineRange, SelectionType.LINE_WISE, false);
+        }
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      if (range.isMultiple()) {
-        int[] starts = range.getStartOffsets();
-        int[] ends = range.getEndOffsets();
-        for (int i = 0; i < starts.length; i++) {
-          if (ends[i] > starts[i]) {
-            ends[i] = EditorHelper.getLineEndForOffset(editor, starts[i]);
-          }
-        }
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-        range = new TextRange(starts, ends);
-        return VimPlugin.getChange().deleteRange(editor, range,
-                                                                   SelectionType.BLOCK_WISE, false);
-      }
-      else {
-        range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
-                              EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("D");
+  }
 
-        return VimPlugin.getChange().deleteRange(editor, range,
-                                                                   SelectionType.LINE_WISE, false);
-      }
-    }
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.DELETE;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_MOT_LINEWISE | Command.FLAG_EXIT_VISUAL;
   }
 }

src/com/maddyhome/idea/vim/action/change/insert/InsertAfterCursorAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertAfterLineEndAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertAtPreviousInsertAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertBeforeCursorAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -33,8 +33,6 @@ import javax.swing.*;
 import java.util.List;
 import java.util.Set;
 
-import static com.maddyhome.idea.vim.helper.StringHelper.parseKeysSet;
-
 public class InsertBeforeCursorAction extends VimCommandAction {
   public InsertBeforeCursorAction() {
     super(new ChangeEditorActionHandler() {

src/com/maddyhome/idea/vim/action/change/insert/InsertBeforeFirstNonBlankAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertCharacterAboveCursorAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertCharacterBelowCursorAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertDeleteInsertedTextAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertDeletePreviousWordAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertEnterAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertExitModeAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -33,8 +33,6 @@ import javax.swing.*;
 import java.util.List;
 import java.util.Set;
 
-import static com.maddyhome.idea.vim.helper.StringHelper.parseKeysSet;
-
 public class InsertExitModeAction extends VimCommandAction {
   private static final String ACTION_ID = "VimInsertExitMode";
 

src/com/maddyhome/idea/vim/action/change/insert/InsertInsertAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertLineStartAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertNewLineAboveAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertNewLineBelowAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertExitAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/InsertRegisterAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -22,6 +22,7 @@ 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.command.Command;
 import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
 import org.jetbrains.annotations.NotNull;
@@ -35,7 +36,8 @@ public class InsertRegisterAction extends EditorAction {
 
   private static class Handler extends EditorActionHandlerBase {
     public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
-      return VimPlugin.getChange().insertRegister(editor, context, cmd.getArgument().getCharacter());
+      final Argument argument = cmd.getArgument();
+      return argument != null && VimPlugin.getChange().insertRegister(editor, context, argument.getCharacter());
     }
   }
 }

src/com/maddyhome/idea/vim/action/change/insert/InsertSingleCommandAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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

src/com/maddyhome/idea/vim/action/change/insert/VisualBlockAppendAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,28 +20,51 @@ package com.maddyhome.idea.vim.action.change.insert;
 
 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.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.VisualOperatorActionHandler;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class VisualBlockAppendAction extends EditorAction {
+public class VisualBlockAppendAction extends VimCommandAction {
   public VisualBlockAppendAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        return !editor.isOneLineMode() && VimPlugin.getChange().blockInsert(editor, context, range, true);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      if (editor.isOneLineMode()) {
-        return false;
-      }
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-      return VimPlugin.getChange().blockInsert(editor, context, range, true);
-    }
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("A");
+  }
+
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.INSERT;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_MULTIKEY_UNDO | Command.FLAG_EXIT_VISUAL;
   }
 }

src/com/maddyhome/idea/vim/action/change/insert/VisualBlockInsertAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -20,28 +20,51 @@ package com.maddyhome.idea.vim.action.change.insert;
 
 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.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.VisualOperatorActionHandler;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.util.List;
+import java.util.Set;
+
 /**
+ * @author vlan
  */
-public class VisualBlockInsertAction extends EditorAction {
+public class VisualBlockInsertAction extends VimCommandAction {
   public VisualBlockInsertAction() {
-    super(new Handler());
+    super(new VisualOperatorActionHandler() {
+      protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                                @NotNull TextRange range) {
+        return !editor.isOneLineMode() && VimPlugin.getChange().blockInsert(editor, context, range, false);
+      }
+    });
   }
 
-  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
-                              @NotNull TextRange range) {
-      if (editor.isOneLineMode()) {
-        return false;
-      }
+  @NotNull
+  @Override
+  public Set<MappingMode> getMappingModes() {
+    return MappingMode.V;
+  }
 
-      return VimPlugin.getChange().blockInsert(editor, context, range, false);
-    }
+  @NotNull
+  @Override
+  public Set<List<KeyStroke>> getKeyStrokesSet() {
+    return parseKeysSet("I");
+  }
+
+  @NotNull
+  @Override
+  public Command.Type getType() {
+    return Command.Type.INSERT;
+  }
+
+  @Override
+  public int getFlags() {
+    return Command.FLAG_MULTIKEY_UNDO | Command.FLAG_EXIT_VISUAL;
   }
 }

src/com/maddyhome/idea/vim/action/change/shift/AutoIndentLinesAction.java

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2014 The IdeaVim authors
+ * 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
@@ -36,7 +36,7 @@ public class AutoIndentLinesAction extends EditorAction {
 
   private static class Handler extends ChangeEditorActionHandler {
     public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, @Nullable Argument argument) {
-      VimPlugin.getChange().autoIndentLines(context);
+      VimPlugin.getChange().autoIndentLines(editor, context, count);
       return true;
     }
   }