Inherit from VimTestCase to setup IntelliJ extension points properly

Otherwise these tests depend on the run order of other tests for proper initialization.
Version 0.49
2025-08-17 16:31:45 +02:00 · 2017-12-12 20:17:49 +03:00 · 2017-12-12 19:55:08 +03:00 · 2017-11-03 05:00:29 +03:00 · 2017-11-03 04:26:46 +03:00 · 2017-11-03 04:23:29 +03:00
461 changed files with 4873 additions and 1180 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.swp
+/.gradle/
 /.idea/
-/idea/
+/build/
 /out/
 /tmp/
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -256,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">
--- a/.idea/codeStyles/Project.xml
+++ b/.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>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/misc.xml
+++ b/.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>
-
--- a/.idea/modules.xml
+++ b/.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>
-
--- a/.idea/runConfigurations/All_tests.xml
+++ b/.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>
--- a/.idea/runConfigurations/IdeaVim.xml
+++ b/.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>
--- a/.idea/vcs.xml
+++ b/.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>
-
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -34,6 +34,15 @@ Contributors:
 * [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.
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,112 @@ 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/README.md
+++ b/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, CLion 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,7 +42,7 @@ 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 its 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
@@ -44,6 +50,21 @@ 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
 ---------------------------------

@@ -57,7 +78,7 @@ 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
@@ -66,6 +87,10 @@ Supported:
 * Window commands
 * Vim web help

+Emulated Vim plugins:
+
+* vim-surround
+
 Not supported (yet):

 * Jump lists
@@ -73,7 +98,7 @@ Not supported (yet):

 See also:

-* [List of recently added commands](https://github.com/JetBrains/ideavim/blob/master/src/com/maddyhome/idea/vim/package-info.java)
+* [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)


@@ -91,12 +116,27 @@ Note, that IdeaVim currently parses ~/.ideavimrc file via simple pattern matchin
 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
+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
 ------------------

@@ -104,16 +144,17 @@ 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).

@@ -153,39 +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 13.1+ (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"). This will launch a spare
-   instance of IntelliJ running the compiled plugin in a sandboxed enviroment.
-   To actually deploy the plugin the recommended way is executing `ant dist`
-   from command line, which will update versions in plugin.xml among other
-   tasks. Install the generated "ideavim.jar" file from
-   "Settings | Plugins | Install plugin from disk".
+    * 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.


@@ -193,4 +233,3 @@ License
 -------

 IdeaVim is licensed under the terms of the GNU Public license version 2.
-
--- a/build.gradle
+++ b/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"
+}
--- a/build.properties
+++ b/build.properties
@@ -1,4 +0,0 @@
-version-id:0.41
-platform-version:135.0
-idea.download.url=http://download.jetbrains.com/idea/ideaIU-14.0.2.zip
-build.number=dev
--- a/build.xml
+++ b/build.xml
@@ -1,181 +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" forkmode="once" 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"/>
-      <formatter type="xml" usefile="true" />
-
-      <batchtest todir="${test-reports}">
-        <fileset dir="${test}">
-          <include name="**/*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-</project>
--- a/doc/set-commands.md
+++ b/doc/set-commands.md
@@ -9,6 +9,8 @@ The following `:set` commands can appear in `~/.ideavimrc` or set manually in th
    '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
@@ -22,7 +24,9 @@ The following `:set` commands can appear in `~/.ideavimrc` or set manually in th
    '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
--- a/gradle.properties
+++ b/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
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
--- a/172
+++ b/172
@@ -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" "$@"
--- a/gradlew.bat
+++ b/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
--- a/ideavim.iml
+++ b/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>
-
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -2,42 +2,39 @@
  <name>IdeaVim</name>
  <id>IdeaVIM</id>
  <change-notes><![CDATA[
-      <p>0.41:</p>
+      <p>0.49:</p>
+      <ul>
+        <li>Enabled zero-latency typing for Vim emulation</li>
+        <li>Support for <code>iskeyword</code> option</li>
+        <li>Various bug fixes</li>
+      </ul>
+      <p>0.48:</p>
      <ul>
        <li>Various bug fixes</li>
      </ul>
-      <p>0.40:</p>
-      <ul>
-        <li>Support for <code>mapleader</code></li>
-        <li>Support comments in <code>%</code> brace matching</li>
-        <li>Various bug fixes</li>
-      </ul>
-      <p>0.39:</p>
+      <p>0.47:</p>
      <ul>
        <li>Various bug fixes</li>
      </ul>
-      <p>0.38:</p>
+      <p>0.46:</p>
      <ul>
-        <li>Support for <code>:action</code> and <code>:actionlist</code> for executing arbitrary IDE actions</li>
-        <li>Support for <code>number</code> and <code>relativenumber</code> options</li>
-        <li>Support for <code>clipboard=unnamed</code> option</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.37:</p>
+      <p>0.44:</p>
      <ul>
-        <li>Various bug fixes</li>
+        <li>Fixed typing keys in completion menus and typing with the plugin disabled</li>
      </ul>
-      <p>0.36:</p>
+      <p>0.43:</p>
      <ul>
-        <li>Window commands from the <code>&lt;C-W&gt;</code> family</li>
-        <li>Support for <code>:split</code>/<code>:vsplit</code> commands</li>
-        <li>Fixed visual block selection mode</li>
-        <li>Various bug fixes</li>
+        <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.</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>
@@ -46,10 +43,10 @@
        <li><a href="http://youtrack.jetbrains.com/issues/VIM">Issue tracker</a>: feature requests and bug reports</li>
      </ul>
    ]]></description>
-  <version>@VERSION@</version>
+  <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>
@@ -61,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"/>
@@ -149,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"/>
@@ -156,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"/>
@@ -269,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"/>
@@ -345,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>
--- a/resources/messages.properties
+++ b/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
--- a/src/com/maddyhome/idea/vim/EventFacade.java
+++ b/src/com/maddyhome/idea/vim/EventFacade.java
@@ -1,3 +1,21 @@
+/*
+ * 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;
@@ -42,13 +60,13 @@ public class EventFacade {

  public void setupTypedActionHandler(@NotNull TypedActionHandler handler) {
    final TypedAction typedAction = getTypedAction();
-    myOriginalTypedActionHandler = typedAction.getHandler();
-    typedAction.setupHandler(handler);
+    myOriginalTypedActionHandler = typedAction.getRawHandler();
+    typedAction.setupRawHandler(handler);
  }

  public void restoreTypedActionHandler() {
    if (myOriginalTypedActionHandler != null) {
-      getTypedAction().setupHandler(myOriginalTypedActionHandler);
+      getTypedAction().setupRawHandler(myOriginalTypedActionHandler);
    }
  }

--- a/src/com/maddyhome/idea/vim/KeyHandler.java
+++ b/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.
@@ -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,33 +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() {
-          final boolean fromIsPrefix = isPrefix(mappingInfo.getFromKeys(), mappingInfo.getToKeys());
-          boolean first = true;
-          for (KeyStroke keyStroke : mappingInfo.getToKeys()) {
-            final boolean recursive = mappingInfo.isRecursive() && !(first && fromIsPrefix);
-            handleKey(editor, keyStroke, new EditorDataContext(editor), recursive);
-            first = false;
+          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);
          }
        }
      };
@@ -324,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) {
--- a/src/com/maddyhome/idea/vim/RegisterActions.java
+++ b/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
@@ -73,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,
@@ -147,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}")}
@@ -171,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)
@@ -624,10 +632,10 @@ 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, Command.FLAG_OP_PEND,
--- a/src/com/maddyhome/idea/vim/VimPlugin.java
+++ b/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,10 +17,13 @@
 */
 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.components.ApplicationComponent;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
@@ -28,6 +31,8 @@ import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.actionSystem.EditorActionManager;
 import com.intellij.openapi.editor.actionSystem.TypedAction;
+import com.intellij.openapi.editor.event.EditorFactoryAdapter;
+import com.intellij.openapi.editor.event.EditorFactoryEvent;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.ex.KeymapManagerEx;
@@ -37,9 +42,13 @@ 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.intellij.util.io.HttpRequests;
 import com.maddyhome.idea.vim.ex.CommandParser;
 import com.maddyhome.idea.vim.ex.vimscript.VimScriptParser;
 import com.maddyhome.idea.vim.group.*;
@@ -48,12 +57,16 @@ 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.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
@@ -73,6 +86,7 @@ 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";
@@ -141,7 +155,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
    });

    final TypedAction typedAction = EditorActionManager.getInstance().getTypedAction();
-    EventFacade.getInstance().setupTypedActionHandler(new VimTypedActionHandler(typedAction.getHandler()));
+    EventFacade.getInstance().setupTypedActionHandler(new VimTypedActionHandler(typedAction.getRawHandler()));

    // Register vim actions in command mode
    RegisterActions.registerActions();
@@ -290,6 +304,17 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
    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;
  }
@@ -369,20 +394,17 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent

  private void updateState() {
    if (isEnabled() && !ApplicationManager.getApplication().isUnitTestMode()) {
-      boolean requiresRestart = false;
      if (SystemInfo.isMac) {
        final MacKeyRepeat keyRepeat = MacKeyRepeat.getInstance();
        final Boolean enabled = keyRepeat.isEnabled();
        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 " +
-                                       "(requires restart)?\n\n" +
+          if (Messages.showYesNoDialog("Do you want to enable repeating keys in Mac OS X on press and hold?\n\n" +
                                       "(You can do it manually by running 'defaults write -g " +
                                       "ApplePressAndHoldEnabled 0' in the console).", IDEAVIM_NOTIFICATION_TITLE,
                                       Messages.getQuestionIcon()) == Messages.YES) {
            editor.setKeyRepeat(true);
            keyRepeat.setEnabled(true);
-            requiresRestart = true;
          }
          else {
            editor.setKeyRepeat(false);
@@ -428,10 +450,6 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
          "<code>source ~/.vimrc</code>",
          NotificationType.INFORMATION).notify(null);
      }
-      if (requiresRestart) {
-        final ApplicationEx app = ApplicationManagerEx.getApplicationEx();
-        app.restart();
-      }
    }
  }

@@ -441,6 +459,8 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
  private void setupListeners() {
    final EventFacade eventFacade = EventFacade.getInstance();

+    setupStatisticsReporter(eventFacade);
+
    DocumentManager.getInstance().addDocumentListener(new MarkGroup.MarkUpdater());
    DocumentManager.getInstance().addDocumentListener(new SearchGroup.DocumentSearchListener());

@@ -453,4 +473,63 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
      }
    });
  }
+
+  /**
+   * 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);
+  }
 }
--- a/src/com/maddyhome/idea/vim/VimTypedActionHandler.java
+++ b/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,10 @@ 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;

@@ -34,7 +36,7 @@ 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 {
+public class VimTypedActionHandler implements TypedActionHandlerEx {
  private static final Logger logger = Logger.getInstance(VimTypedActionHandler.class.getName());

  private final TypedActionHandler origHandler;
@@ -46,21 +48,28 @@ 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), new EditorDataContext(editor));
-          }
-          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);
--- a/src/com/maddyhome/idea/vim/action/ExEntryAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/ResetModeAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/VimCommandAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/VimPluginToggleAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/VimShortcutKeyAction.java
+++ b/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
@@ -86,6 +86,7 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {
    .build();

  private static final Logger ourLogger = Logger.getInstance(VimShortcutKeyAction.class.getName());
+  private static AnAction ourInstance = null;

  @Override
  public void actionPerformed(@NotNull AnActionEvent e) {
@@ -97,18 +98,12 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {
        notifyAboutShortcutConflict(keyStroke);
      }
      // Should we use InjectedLanguageUtil.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
-      // Run key handler later to restore input events sequence due to VimTypedActionHandler
-      SwingUtilities.invokeLater(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            KeyHandler.getInstance().handleKey(editor, keyStroke, new EditorDataContext(editor));
-          }
-          catch (Throwable throwable) {
-            ourLogger.error(throwable);
-          }
-        }
-      });
+      try {
+        KeyHandler.getInstance().handleKey(editor, keyStroke, new EditorDataContext(editor));
+      }
+      catch (Throwable throwable) {
+        ourLogger.error(throwable);
+      }
    }
  }

@@ -119,7 +114,11 @@ public class VimShortcutKeyAction extends AnAction implements DumbAware {

  @NotNull
  public static AnAction getInstance() {
-    return ActionManager.getInstance().getAction(ACTION_ID);
+    if (ourInstance == null) {
+      final AnAction originalAction = ActionManager.getInstance().getAction(ACTION_ID);
+      ourInstance = EmptyAction.wrap(originalAction);
+    }
+    return ourInstance;
  }

  private void notifyAboutShortcutConflict(@NotNull final KeyStroke keyStroke) {
--- a/src/com/maddyhome/idea/vim/action/change/OperatorAction.java
+++ b/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;
+  }
+}
--- a/src/com/maddyhome/idea/vim/action/change/RedoAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/RepeatChangeAction.java
+++ b/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);

--- a/src/com/maddyhome/idea/vim/action/change/RepeatExCommandAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/UndoAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/AutoIndentLinesVisualAction.java
+++ b/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
@@ -43,7 +43,7 @@ public class AutoIndentLinesVisualAction extends VimCommandAction {
                                @NotNull DataContext context,
                                @NotNull Command cmd,
                                @NotNull TextRange range) {
-        VimPlugin.getChange().autoIndentLines(context);
+        VimPlugin.getChange().autoIndentRange(editor, context, range);
        return true;
      }
    });
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerMotionAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerVisualAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleCharacterAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleMotionAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleVisualAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperMotionAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperVisualAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCharacterAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCharactersAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeEndOfLineAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeLastGlobalSearchReplaceAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeLastSearchReplaceAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeMotionAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeNumberDecAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeNumberIncAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeReplaceAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualCharacterAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesEndAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/FilterCountLinesAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/FilterMotionAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/FilterVisualLinesAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/change/ReformatCodeVisualAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterLeftAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterRightAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteEndOfLineAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesSpacesAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesSpacesAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteLineAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteMotionAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesEndAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertAfterCursorAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertAfterLineEndAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertAtPreviousInsertAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertBeforeCursorAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertBeforeFirstNonBlankAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertCharacterAboveCursorAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertCharacterBelowCursorAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertDeleteInsertedTextAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertDeletePreviousWordAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertEnterAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertExitModeAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertInsertAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertLineStartAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertNewLineAboveAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertNewLineBelowAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertExitAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertRegisterAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertSingleCommandAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/VisualBlockAppendAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/insert/VisualBlockInsertAction.java
+++ b/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
--- a/src/com/maddyhome/idea/vim/action/change/shift/AutoIndentLinesAction.java
+++ b/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;
    }
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrey Vlasovskikh	942b64052d	Inherit from VimTestCase to setup IntelliJ extension points properly Otherwise these tests depend on the run order of other tests for proper initialization.	2017-12-12 20:17:49 +03:00
Andrey Vlasovskikh	559aabd6b8	Version 0.49	2017-12-12 19:55:08 +03:00
Andrey Vlasovskikh	a76b41b737	VIM-1367 Fixed resetting the default value The previous fix tried to parse the current value instead of the default one.	2017-11-03 05:00:29 +03:00
Andrey Vlasovskikh	2fc6553203	VIM-1367 Correctly reset parsed and stored 'iskeyword' option value	2017-11-03 04:26:46 +03:00
Andrey Vlasovskikh	98b003e601	VIM-1367 Deterministic order of options for reproducible tests	2017-11-03 04:23:29 +03:00
Andrey Vlasovskikh	0dda443cc8	Added iskeyword option to the list of supported set commands	2017-11-03 03:59:13 +03:00
Andrey Vlasovskikh	9322283cb1	Updated changelog	2017-11-03 03:56:00 +03:00
Andrey Vlasovskikh	95d412c78d	Added nickgieschen to contributors	2017-11-03 03:54:06 +03:00
Andrey Vlasovskikh	6245b15d8f	Cleanup	2017-11-03 03:48:15 +03:00
Andrey Vlasovskikh	ab1d7ba6cb	VIM-1367 Removed unnecessary repetition in positive lookbehind It resulted in an inspection warning that positive lookbehind groups cannot contain 1 or more repetition patterns.	2017-11-03 03:34:11 +03:00
nickgieschen	ef05491991	VIM-1367 Implement iskeyword (cherry picked from commit d91d38c)	2017-11-03 03:22:39 +03:00
Andrey Vlasovskikh	113642c8f5	Fixed test configuration URL	2017-11-01 03:15:05 +03:00
Andrey Vlasovskikh	088dd98e0d	Updated test configuration ID	2017-11-01 03:14:23 +03:00
Andrey Vlasovskikh	7e0046a715	Updated changelog	2017-11-01 03:00:40 +03:00
Andrey Vlasovskikh	1a11d5df35	Added tieTYT to the list of contributors	2017-11-01 02:58:06 +03:00
tieTYT	57b5b319a7	VIM-523 Fixed global mark remembering only the line number Bear with me as this is the first thing I've ever done with Intellij-IDEA plugin development. I tested this and I believe I fixed the problem. The cause of the problem was that the code was checking if the mark was in a different file but if it was, it was using the editor of the current file to go to the line of the mark. I changed the code so that it opens the file of the mark first, then jumps to its line number. I need a VirtualFile so that I can get the Editor to open. The Mark stores the path of the file it's in, but the path is not enough information to get a VirtualFile. I also need the "protocol" of the file. So, I had to change the structure of the Mark and add a "protocol" field to it. I had to update the save/load logic to use this new field, too. This way, when you restart Intellij-IDEA, the marks can still be used. For old marks, I defaulted the "protocol" to the value of "file". One thing I couldn't figure out how to do is add a test case to check that this is working correctly. This is not due to a lack of effort. In fact, I tried to write the test case first. But I have been unable to find any examples anywhere of testing multiple Editors, and that's what's involved to fix this issue. Because of this, this issue may be best used as a reference to fix the problem instead of worthy of being used in production. Either way, I'd love to know how to write such a test.	2017-11-01 02:35:23 +03:00
Andrey Vlasovskikh	0a4672c050	Updated intellij-gradle-plugin, Kotlin, and IntelliJ platform versions	2017-11-01 02:12:07 +03:00
Andrey Vlasovskikh	8808b651e2	Updated gradle wrapper to 4.3	2017-11-01 02:12:07 +03:00
Andrey Vlasovskikh	e9fca757b7	JetBrains project badge	2017-09-08 23:09:46 +03:00
Andrey Vlasovskikh	98a3801f6a	New code style settings format of IntelliJ 2017.3	2017-09-08 23:06:24 +03:00
Andrey Vlasovskikh	49ecfd6879	Added Pavel Fatin to contributors	2017-01-16 01:03:42 +03:00
Andrey Vlasovskikh	4d4b5967da	Updated CHANGES	2017-01-16 01:02:47 +03:00
Andrey Vlasovskikh	a882e37d04	Merge remote-tracking branch 'origin/vim-1007' # Conflicts: # gradle.properties # resources/META-INF/plugin.xml # src/com/maddyhome/idea/vim/VimTypedActionHandler.java	2017-01-16 00:57:31 +03:00
Andrey Vlasovskikh	4734d23e29	Fixed compilation by adding Kotlin Gradle plugin	2017-01-16 00:42:55 +03:00
Andrey Vlasovskikh	b7416da26d	Merge branch 'kotlin' # Conflicts: # build.gradle # gradle.properties	2017-01-16 00:30:30 +03:00
Andrey Vlasovskikh	36e768ab37	Allow Java 8	2017-01-16 00:27:51 +03:00
Andrey Vlasovskikh	ede0bd8623	Set minimal version to 2017.1 in order to use new API for zero-latency typing	2017-01-16 00:25:47 +03:00
Andrey Vlasovskikh	b4072eb62d	Use gradle-intellij-plugin 0.2.0	2017-01-15 23:36:27 +03:00
Andrey Vlasovskikh	120b69c439	Fixed source API compatibility with branch 171	2017-01-15 23:22:40 +03:00
Andrey Vlasovskikh	b68daf3f3e	Version 0.48	2017-01-15 23:01:53 +03:00
Andrey Vlasovskikh	c32a1a5e5b	Updated changelog and list of contributors	2016-11-29 00:43:41 +03:00
Andrey Vlasovskikh	a5e303d1ca	Merge pull request #121 from gaganis/VIM-1216 Fixed . reseting the last find movement	2016-11-29 00:35:40 +03:00
Giorgos Gaganis	c4d8cef44d	Fixed . reseting the last find movement where repeating change that also uses movement. On the original vim when we repeat a change with . that also contain an find movement the last find that was typed before the repeat is the one used by the motion repeat ;. Before the commit the plugin would have reset the last movement to use the movement contained in the command that was repeated. To solve this I took a simple approach where I save the last find motion before starting the repeat and then restoring it to its original value after the repeat is over. In order to access the find motion fields from RepeatChangeAction I created getters in MotionGroup for the movement type and character. modified: src/com/maddyhome/idea/vim/action/change/RepeatChangeAction.java modified: src/com/maddyhome/idea/vim/group/MotionGroup.java modified: test/org/jetbrains/plugins/ideavim/action/ChangeActionTest.java	2016-11-28 19:05:11 +02:00
Andrey Vlasovskikh	72fbe758b4	VIM-1205 Don't move key handling into separate event for raw handlers	2016-11-22 21:58:32 +03:00
Andrey Vlasovskikh	3344bb3254	Ability to use Kotlin along with Java	2016-11-21 19:40:14 +03:00
Pavel Fatin	6b9ab7163a	Support for zero-latency rendering, #VIM-1007 fixed	2016-10-26 12:53:13 +02:00
Andrey Vlasovskikh	563092cffb	Fixed caret model exception when changing selection in documents open in several editors	2016-10-21 18:11:15 +03:00
Andrey Vlasovskikh	9a2a0c3b0e	Split several channel names by comma	2016-10-19 17:26:23 +03:00
Andrey Vlasovskikh	f3b4726b34	Version 0.47	2016-10-19 15:58:35 +03:00
Andrey Vlasovskikh	30d7c6edf1	Remove obsolete pluginId	2016-09-30 21:15:51 +03:00
Andrey Vlasovskikh	f33f73d2f5	VIM-1190 Fixed exception "Write access is allowed from write-safe contexts only" We now use IntelliJ's version of invokeLater() in order to satisfy the new protocol for running read-write actions in modal dialogs.	2016-09-30 20:44:16 +03:00
Andrey Vlasovskikh	b595dfd443	VIM-1098 Don't start visual selection when mouse click was actually drag over single character	2016-09-01 20:50:55 +03:00
Andrey Vlasovskikh	a3e15b5c76	Possibility to publish the plugin to multiple channels	2016-09-01 18:32:16 +03:00
Andrey Vlasovskikh	31d85c0221	Update gradle-intellij-plugin to 0.2.0-SNAPSHOT for multi-channel plugin publishing	2016-09-01 18:26:30 +03:00
Andrey Vlasovskikh	124bd55e18	Update gradle-intellij-plugin to 0.0.43	2016-07-08 12:19:02 +03:00
Andrey Vlasovskikh	bb9b5b5bde	Use IntelliJ 15.0.5 by default	2016-07-08 12:19:02 +03:00
Andrey Vlasovskikh	f586e6dd29	Version 0.46 Due to the plugin versions comparision logic in the IntelliJ platform it's impossible to update 0.45-eap-XXX to 0.45. Bumped version once again.	2016-07-07 18:27:09 +03:00
Andrey Vlasovskikh	c2b1b67b6b	Parameter for customizing publish channel for plugin	2016-07-07 18:03:01 +03:00
Andrey Vlasovskikh	2cb29233c8	Version 0.45	2016-07-07 17:56:57 +03:00
Andrey Vlasovskikh	b0e0bebb7e	Removed default error handler	2016-07-07 17:56:23 +03:00
Andrey Vlasovskikh	364b3567fc	VIM-1126 Fixed warning about modifying shortcuts of global actions for 2016.2	2016-07-07 17:39:29 +03:00
Andrey Vlasovskikh	9522a51dc7	Enabling key repeat on Mac OS X doesn't require restart	2016-04-29 21:52:35 +03:00
Andrey Vlasovskikh	75335a8a01	Added Paulo Bu to the list of contributors	2016-04-29 21:37:42 +03:00
Andrey Vlasovskikh	0bf561e326	Merge remote-tracking branch 'pbu88/adds_more_folding_commands'	2016-04-29 21:34:19 +03:00
Andrey Vlasovskikh	7e6c2c2a7c	Updated changelog	2016-04-29 21:28:41 +03:00
Andrey Vlasovskikh	b132d490f0	Typo	2016-04-29 21:20:22 +03:00
Andrey Vlasovskikh	3fde0fc209	Non-public methods made private	2016-04-29 21:19:17 +03:00
Andrey Vlasovskikh	24bc09796f	Fixed NPE	2016-04-29 21:18:28 +03:00
Andrey Vlasovskikh	758bff79d6	Removed unused code	2016-04-29 21:16:05 +03:00
Andrey Vlasovskikh	3b0660799b	VIM-843 Don't highlight search results after restart Added limited support for 'viminfo' option. Only 'h' in 'viminfo' is taken into account.	2016-04-29 21:15:01 +03:00
Andrey Vlasovskikh	6880afa73c	VIM-139 Focus on current search and use modal confirmation for ':s///gc'	2016-04-29 01:33:28 +03:00
Andrey Vlasovskikh	01aae065ff	Updated changelog	2016-04-28 20:17:22 +03:00
Andrey Vlasovskikh	8ee49edef0	VIM-287 Fixed insert new line before and after folds	2016-04-28 20:13:08 +03:00
Andrey Vlasovskikh	e09f6c7886	Failing tests for VIM-287	2016-04-28 19:38:19 +03:00
Andrey Vlasovskikh	dd0a7207d5	Removed old block selection API usages to become compatible with IntelliJ branch 146	2016-04-22 03:22:02 +03:00
Andrey Vlasovskikh	17700a6537	Updated changelog	2016-04-20 03:02:15 +03:00
Andrey Vlasovskikh	949444f6dd	EAP for IdeaVim	2016-04-20 03:00:54 +03:00
Andrey Vlasovskikh	31832ac230	Don't specify build number as a separate entity in the plugin description	2016-04-20 02:31:38 +03:00
Andrey Vlasovskikh	33200f8208	Settings for publishing the plugin to the EAP channel	2016-04-20 01:56:46 +03:00
Andrey Vlasovskikh	893cd17c1a	Updated changelog	2016-04-18 03:32:34 +03:00
Andrey Vlasovskikh	c471ddd12f	Merge remote-tracking branch 'ayzenquwe/ayzen/VIM-259'	2016-04-18 02:47:38 +03:00
Andrey Vlasovskikh	b0ac8f89c5	Merge remote-tracking branch 'ayzenquwe/ayzen/VIM-964'	2016-04-18 02:41:35 +03:00
Andrey Vlasovskikh	a47338d8b7	Merge remote-tracking branch 'ayzenquwe/ayzen/VIM-564'	2016-04-18 02:36:58 +03:00
Andrey Vlasovskikh	76d00ab47f	Merge remote-tracking branch 'ayzenquwe/ayzen/gomethod'	2016-04-18 02:31:11 +03:00
Andrey Vlasovskikh	22b8552939	Updated changelog	2016-04-18 02:29:15 +03:00
Andrey Vlasovskikh	1d25a04377	Added Aleksey Lagoshin to list of contributors	2016-04-18 02:26:41 +03:00
Andrey Vlasovskikh	52148f69c1	Merge remote-tracking branch 'ayzenquwe/ayzen/registers'	2016-04-18 02:24:00 +03:00
Andrey Vlasovskikh	f280f8138d	Support <Plug> in mapping commands	2016-04-18 01:46:46 +03:00
Andrey Vlasovskikh	530846bc7a	Added 'timeout' option for toggling timeout for mapping commands	2016-04-18 01:46:46 +03:00
Andrey Vlasovskikh	27adde7af0	Merge pull request #108 from agriesbaum/master Improve diction of README	2016-04-06 19:41:57 +04:00
Alexander Griesbaum	e3869a201f	Improve diction of README	2016-04-05 22:44:26 +02:00
Andrey Vlasovskikh	745a356c87	Cleanup	2016-02-21 07:08:21 +03:00
Andrey Vlasovskikh	b16a4a1343	Handle <Esc> in modal input better	2016-02-21 07:00:44 +03:00
Andrey Vlasovskikh	36e41555ea	Cleaned up ModalEntry	2016-02-21 06:16:11 +03:00
Andrey Vlasovskikh	3f824cf205	Enable SecondaryLoop-based implementation for Java 7+	2016-02-21 06:07:34 +03:00
dhleong	c61b3c2f29	More closely emulate SecondaryLoop with reflection and a Proxy	2016-02-17 20:46:33 -05:00
dhleong	fd97cfbd15	Add compat layer for JDK6 JDK7 mode works like a dream, but JDK6 still seems to break after the first invocation.	2016-02-15 09:19:18 -05:00
dhleong	4b4c293008	Refactor modal input for Vim Extensions Doesn't use dialogs, so should fix VIM-1086	2016-02-14 13:23:51 -05:00
Andrey Vlasovskikh	69a573a279	Handle <Esc> in inputKeyStroke() uniformly as "typed Esc"	2016-02-09 00:40:37 +03:00
Andrey Vlasovskikh	c33d4d989e	Clearer offsets comparison + multi-line deletion test	2016-02-09 00:20:58 +03:00
dhleong	3cd1134973	Fix calculation of how to paste surrounded value Fixes VIM-1085; includes test	2016-02-06 10:23:05 -05:00
Andrey Vlasovskikh	4f42d4dc4f	Merge branch 'vlasovskikh/surround' # Conflicts: # CHANGES.md # resources/META-INF/plugin.xml # src/com/maddyhome/idea/vim/option/Options.java	2016-02-04 23:08:37 +03:00
Andrey Vlasovskikh	a3b4aecded	Docs about 'surround' extension	2016-02-04 23:02:29 +03:00
Andrey Vlasovskikh	534ae6aa81	Added Daniel Leong to the list of contributors	2016-02-04 22:54:15 +03:00
Andrey Vlasovskikh	7e1e50ffde	Cleanup	2016-02-04 22:52:59 +03:00
Andrey Vlasovskikh	ab3cbb113e	Restore caret position properly	2016-02-04 22:18:37 +03:00
dhleong	1c7e6af1fc	Fix <esc> not sent after VSurround; support change with tags	2016-02-02 20:57:54 -05:00
dhleong	84f7e25c5e	Cleanup overly verbose code; remove unused import	2016-02-02 20:32:09 -05:00
dhleong	458fe97b75	Add visual surround (`S`) command	2016-01-30 09:31:25 -05:00
dhleong	31364607f5	Add `ds` command; jump to start when executed to match vim-surround	2016-01-30 09:14:34 -05:00
dhleong	56ec2c7ebc	Add `cs` action Note that, unfortunately, we can't do `cst`, as IdeaVim doesn't support the tag textobject. Once that's supported, however, we just need to disable the safety check to enable that.	2016-01-30 09:02:06 -05:00
Andrey Vlasovskikh	f944d91d62	Updated changelog	2016-01-30 02:10:31 +03:00
Andrey Vlasovskikh	2cf7d89581	VIM-271 Added 'incsearch' option for showing search results while typing	2016-01-30 02:05:24 +03:00
Andrey Vlasovskikh	91546700d4	Added simple ys{motion}t tag surround and `input()` function	2016-01-26 22:25:36 +03:00
Andrey Vlasovskikh	a972aec9b0	Implementation notes	2016-01-26 21:33:31 +03:00
Andrey Vlasovskikh	6328575639	'ys{motion}<' requires further user input to wrap text into HTML tags	2016-01-26 21:15:29 +03:00
Andrey Vlasovskikh	af534c9209	Repeat is not supported for 'ys' yet	2016-01-26 21:14:43 +03:00
Andrey Vlasovskikh	82a1e920e0	Initial refactoring of dhleong's 'ys' on top of extension infrastructure	2016-01-26 21:14:15 +03:00
Andrey Vlasovskikh	d46d292865	Added surround tests for 'ys' by dhleong	2016-01-26 18:15:00 +03:00
Andrey Vlasovskikh	1a96533a3c	Added unit test-friendly version of VimExtensionFacade.getKeyStroke()	2016-01-26 18:14:14 +03:00
Andrey Vlasovskikh	2d86054fe8	Fixed regression after setChangeMarks() refactoring	2016-01-26 17:49:05 +03:00
Andrey Vlasovskikh	50e3af7b82	Added modal getKeyStroke() similar to Vim's getchar()	2016-01-26 04:17:19 +03:00
Andrey Vlasovskikh	27af4b926b	Added the 'g@' command for IdeaVim extensions	2016-01-26 01:02:20 +03:00
Andrey Vlasovskikh	1d035acb6d	Vim extension facade for executing emulated Vim statements built-in functions	2016-01-24 20:14:54 +03:00
Andrey Vlasovskikh	3704c321fa	Added the ability to map keys to IdeaVim extension handlers	2016-01-24 19:57:37 +03:00
Andrey Vlasovskikh	9c6f35f3bd	Added mechanism for providing extensions for IdeaVim like ported Vim plugins	2016-01-24 19:04:12 +03:00
Andrey Vlasovskikh	47b49c3e03	Merge pull request #93 from raimon49/use-relative-links Use relative links that recommended way by GitHub Inc.	2016-01-23 02:24:35 +03:00
Andrey Vlasovskikh	7a99261979	Updated "Setting up development environment" for Gradle	2016-01-23 02:15:08 +03:00
Andrey Vlasovskikh	8eda58825f	Put /out/ back	2016-01-23 02:14:40 +03:00
Andrey Vlasovskikh	6ee43c0014	Removed old project files	2016-01-23 01:46:43 +03:00
Andrey Vlasovskikh	bea3d58ddb	Removed old project file	2016-01-23 01:45:44 +03:00
Andrey Vlasovskikh	71b121c15c	Use source code for Gradle Wrapper	2016-01-23 00:32:01 +03:00
Andrey Vlasovskikh	7c8b6d2fe6	Removed old IntelliJ project files in favor of non-version-controlled Gradle files	2016-01-23 00:31:31 +03:00
Andrey Vlasovskikh	5d33c46e6b	Updated code style settings	2016-01-23 00:30:22 +03:00
Andrey Vlasovskikh	8aac0ebdb6	Configurable option for downloading IntelliJ sources	2016-01-22 23:49:32 +03:00
Andrey Vlasovskikh	6072aae338	Add build number to archive name	2016-01-22 23:47:29 +03:00
Andrey Vlasovskikh	872b916d46	Added Gradle Wrapper	2016-01-22 22:46:44 +03:00
Alexander Zolotov	86303b58df	Use retina-friendly svg status images	2016-01-22 22:44:48 +03:00
Andrey Vlasovskikh	78b1ad6df6	Switched from Ant to Gradle for easier dependency on IntelliJ in automated builds	2016-01-22 22:15:38 +03:00
Andrey Vlasovskikh	e5ac7ee607	Send stats reports in internal mode	2016-01-22 21:41:35 +03:00
Andrey Vlasovskikh	480b32b5af	Fixed AIOOBE in tag selection for files starting with '/' and containing '>'	2016-01-21 18:28:14 +03:00
Andrey Vlasovskikh	8c9cf09bd8	Report usage statistics	2016-01-21 17:51:21 +03:00
Andrey Vlasovskikh	7ceea17050	Added DataGrip to the list of supported IDEs	2016-01-21 02:22:48 +03:00
Andrey Vlasovskikh	76333c5a24	Updated copyright years	2016-01-21 02:20:57 +03:00
Andrey Vlasovskikh	85857a3319	Updated changelog	2016-01-21 02:02:08 +03:00
Andrey Vlasovskikh	5ad2bb4bea	Updated current IntelliJ URL	2016-01-21 02:01:51 +03:00
Andrey Vlasovskikh	cb9d205336	VIM-796 Execute :action handler strictly after request focus handler	2016-01-21 01:44:27 +03:00
Andrey Vlasovskikh	e1a292ba33	Merge remote-tracking branch 'smartbomb/ActionHandler-focus-fix'	2016-01-21 01:28:20 +03:00
Andrey Vlasovskikh	fa4e54b32e	Inline since-build into build.xml for running in internal mode	2016-01-21 01:27:22 +03:00
smartbomb	3ba41ac458	VIM-892 Fix various focus related issues when executing :action commands a keymap also fixes VIM-1001, VIM-1016 and hopefully VIM-962 but unable to fully reproduce	2015-12-30 22:06:52 +01:00
Andrey Vlasovskikh	2fbe85e60f	Added Teruo and Liubov to the list of contributors	2015-12-03 15:39:54 +03:00
Andrey Vlasovskikh	676a518fa8	Updated changelog	2015-12-03 15:39:23 +03:00
Andrey Vlasovskikh	992c1923f6	Use Guava for more idiomatic list operations	2015-12-03 15:33:04 +03:00
lubba	a22afdd0f6	VIM-364 Added support for tag block selection	2015-12-03 15:19:54 +03:00
Andrey Vlasovskikh	0da8625f30	VIM-1040 Fixed typing keys in completion menus and typing with the plugin disabled	2015-11-02 15:53:50 +03:00
Andrey Vlasovskikh	4cc784eb95	VIM-1039 Fixed running the plugin with Java 6	2015-11-02 00:45:23 +03:00
Andrey Vlasovskikh	ee3bec9eed	Version 0.42	2015-11-01 02:23:09 +03:00
Andrey Vlasovskikh	24788ac86f	Updated changelog	2015-10-30 16:11:16 +03:00
Andrey Vlasovskikh	9af3c732b5	Updated CI icons	2015-10-30 16:04:35 +03:00
Andrey Vlasovskikh	e5873fe5f9	Use HTTP by default	2015-10-30 15:41:55 +03:00
Andrey Vlasovskikh	39f088cdcd	VIM-970 Use raw typed handlers in order not to require write action in read-only files This change requires the API of IntelliJ platform branch 143+.	2015-10-30 15:37:17 +03:00
Andrey Vlasovskikh	e805852721	Platform prefix initialization is no longer needed	2015-10-30 15:20:36 +03:00
Andrey Vlasovskikh	e136ecc1f8	Added generated idea/ to excluded folders	2015-10-30 15:19:42 +03:00
Andrey Vlasovskikh	efa4001440	Require minimal platform version 143	2015-10-30 15:19:19 +03:00
Paulo Bu	52a0af1636	Adds zC and zO folding commands	2015-08-28 15:59:13 +02:00
ayzen	5fc66b5896	={motion} implementation, == with count and fix for VIM-259	2015-07-11 21:44:36 +03:00
ayzen	80dec29832	Fix for VIM-965 with a test	2015-07-01 23:31:25 +03:00
raimon	2c7d3c9971	Use relative links that recommended way by GitHub Inc.	2015-06-23 21:56:46 +09:00
ayzen	30a16e9496	Corrected typo that prevented correct calculation for marks vertical shifting; added a test	2015-06-14 10:54:15 +03:00
ayzen	0d6526ea31	Mark should not be deleted due to change commands that start from the beginning of the mark line	2015-06-14 10:41:52 +03:00
ayzen	4428340fd9	Fix for VIM-964 (marks get removed if one-char line is replaced by r) with a test	2015-06-14 10:38:36 +03:00
ayzen	900ce21445	Fix for VIM-564 (g_ didn't work correctly) with tests	2015-06-12 22:43:19 +03:00
ayzen	efad5545de	Correct behavior of numbered registers	2015-06-05 21:09:31 +03:00
ayzen	afb411dd35	Added tests for special registers	2015-06-05 21:09:16 +03:00