Bumped version

This class is an entry point to nearly all Vim actions, so it should be
easier to discover.

AUTHORS.md

@@ -3,24 +3,25 @@ IdeaVim Authors
 
 The original author:
 
-* Rick Maddy <rmaddy@maddyhome.com>
+* [Rick Maddy](mailto:rmaddy@maddyhome.com)
 
 The current maintainer:
 
-* Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
+* [Andrey Vlasovskikh](mailto:andrey.vlasovskikh@gmail.com)
 
 Previous maintainers:
 
-* Oleg Shpynov <oleg.shpynov@jetbrains.com>
+* [Oleg Shpynov](mailto:oleg.shpynov@jetbrains.com)
 
 Contributors:
 
-* Dmitry Jemerov <yole@jetbrains.com>
-* Marquis Wang <marquis@marquiswang.com>
-* Julien Hoarau <madgnome@gmail.com>
-* Masanobu Imai <masanobu.imai@gmail.com>
-* poxu <poxvuibr@gmail.com>
-* Alexander Zolotov <alexander.zolotov@jetbrains.com>
+* [Dmitry Jemerov](mailto:yole@jetbrains.com)
+* [Marquis Wang](mailto:marquis@marquiswang.com)
+* [Julien Hoarau](mailto:madgnome@gmail.com)
+* [Masanobu Imai](mailto:masanobu.imai@gmail.com)
+* [poxu](mailto:poxvuibr@gmail.com)
+* [Alexander Zolotov](mailto:alexander.zolotov@jetbrains.com)
+* [John Lindquist](mailto:johnlindquist@gmail.com)
 
 If you are a contributor and your name is not listed here, feel free to
 contact the maintainer.

CHANGES.md

@@ -4,8 +4,94 @@ The Changelog
 History of changes in IdeaVim for the IntelliJ platform.
 
 
+0.30, 2013-11-11
+----------------
+
+Added support for a separate `.ideavimrc` config file. Fixed long-standing
+issues with merged undo/redo commands and `<Esc>` during code completion.
+Various bug fixes.
+
+Features:
+
+* VIM-425 Read config from .ideavimrc if available
+
+Bug fixes:
+
+* VIM-98 Invoke actions in separate commands for better undo/redo
+* VIM-193 Launch Vim action handler for `<Esc>` in completion windows
+* VIM-440 Fixed `:e` open file dialog
+* VIM-550 `:put` creates a new line
+* VIM-551 Argument of `:put` is optional
+* Fixed several reported exceptions
+
+
+0.29, 2013-05-15
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* VIM-482 Fixed repeat buffer limits
+* VIM-91 Enable normal `<Enter>` handling for one-line editors
+* VIM-121 Don't move cursor while scrolling
+
+
+0.28, 2013-04-06
+----------------
+
+A bugfix release.
+
+Bug fixes:
+
+* VIM-478 Fixed reconfigure Vim keymap for user-defined base keymaps
+* VIM-479 Don't try to activate insert mode for diff view
+
+
+0.27, 2013-04-03
+----------------
+
+New Vim keymap generator creates better keymaps, especially for Mac OS X.
+Restart after reconfiguring the keymap is no longer required.
+
+Features:
+
+* VIM-92 Better Vim keymaps for Mac OS X
+* VIM-286 Ask if the plugin should enable repeating keys in Mac OS X
+
+Bug fixes:
+
+* VIM-42 Fixed code completion for the `.` command
+* VIM-421 Fixed `cw` on the last character in line
+* VIM-419 Fixed resetting cursor position after 'gt' and 'gT'
+* VIM-233 Fixed code completion for edits in visual block mode
+* VIM-404 Fixed `O` command at the first line
+* VIM-472 Fixed right selection in visual mode to be one char more
+* Fixed command window font size to match editor font size
+
+
+0.26, 2012-12-26
+----------------
+
+Added support for paste in the command mode: from a register using `<C-R>`,
+from the clipboard using `<S-Insert>` or `<M-V>`. Added support for the last
+change position mark (the dot `.` mark). New shortcuts for Go to declaration
+`<C-]>` and Navigate back `<C-T>`. Various bug fixes.
+
+Features:
+
+* VIM-262 Support for paste from register in command mode
+* VIM-214 Key bindings for paste into command line
+* VIM-43 Added support for the last change position mark
+* VIM-177 Added `<C-]>` and `<C-T>` to the keymap
+
+Bug fixes:
+
+* VIM-302 Fixed tab switching order for `gt` and `gT`
+
+
 0.25, 2012-12-19
-------------------
+----------------
 
 A bugfix release.
 

README.md

@@ -7,10 +7,11 @@ and AppCode.
 
 Resources:
 
-* [Plugin homepage](http://plugins.intellij.net/plugin/?id=164)
+* [Plugin homepage](http://plugins.jetbrains.com/plugin/164)
 * [Changelog](https://github.com/JetBrains/ideavim/blob/master/CHANGES.md)
 * [Bug tracker](http://youtrack.jetbrains.com/issues/VIM)
-* [Continuous integration builds](http://teamcity.jetbrains.com/project.html?projectId=project55)
+* [Continuous integration builds](http://teamcity.jetbrains.com/project.html?projectId=IdeaVim)
+* [@IdeaVim](http://twitter.com/ideavim) in Twitter
 
 
 Installation
@@ -67,12 +68,6 @@ Vim. Vim compatibility of undo/redo may be improved in the future releases.
 
 ### Escape
 
-In the IDE, the `<Esc>` key is used during editing to cancel code completion
-windows, dialog windows, and parameter tooltips. While in the Vim insert mode,
-`<Esc>` is used to return back to the normal mode. If you are typing in the
-insert mode and a code completion window is popped up, pressing `<Esc>` cancel
-the window without exiting the insert mode.
-
 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

build.properties

@@ -1,4 +1,4 @@
-version-id:0.25
+version-id:0.30
 platform-version:110.0
-idea.download.url=http://download.jetbrains.com/idea/ideaIU-12.0.zip
+idea.download.url=http://download.jetbrains.com/idea/ideaIU-12.1.zip
 build.number=x

index.txt

@@ -26,6 +26,8 @@ tag             char            action in Insert mode   ~
                                 enter digraph
 |i_CTRL-O|      CTRL-O          execute a single command and return to insert
                                 mode
+|i_CTRL-R|      CTRL-R {0-9a-z"%#*:=}
+                                insert the contents of a register
 |i_CTRL-W|      CTRL-W          delete word before the cursor
 
 ==============================================================================
@@ -63,6 +65,8 @@ tag             char          note action in Normal mode        ~
 |count|         9                       "
 |F|             F{char}         1  cursor to the Nth occurrence of {char} to
                                    the left
+|O|             O               2  begin a new line above the cursor and
+                                   insert text, repeat N times
 |P|             ["x]P           2  put the text [from buffer x] before the
                                    cursor N times
 |T|             T{char}         1  cursor till after Nth occurrence of {char}
@@ -159,6 +163,20 @@ tag             command       note action in Visual mode        ~
 ------------------------------------------------------------------------------
 |v_y|           y                  yank the highlighted area
 
+==============================================================================
+4. Command-line editing                                 *ex-edit-index*
+
+Get to the command-line with the ':', '!', '/' or '?' commands.
+Normal characters are inserted at the current cursor position.
+"Completion" below refers to context-sensitive completion.  It will complete
+file names, tags, commands etc. as appropriate.
+
+tag             command       action in Command-line editing mode       ~
+------------------------------------------------------------------------------
+|c_CTRL-R|      CTRL-R {0-9a-z"%#*:= CTRL-F CTRL-P CTRL-W CTRL-A}
+                                insert the contents of a register or object
+                                under the cursor as if typed
+
 ==============================================================================
 5. EX commands                                  *ex-cmd-index*
 

resources/META-INF/plugin.xml

@@ -1,7 +1,43 @@
-<idea-plugin url="http://plugins.intellij.net/plugin/?id=164">
-    <name>IdeaVIM</name>
+<idea-plugin url="http://plugins.jetbrains.com/plugin/164">
+  <name>IdeaVim</name>
   <id>IdeaVIM</id>
-    <description><![CDATA[
+  <change-notes>
+    <![CDATA[
+      <p>0.30:</p>
+      <ul>
+        <li>Support for a separate <code>.ideavimrc</code> config file</li>
+        <li>Fixed long-standing issues with merged undo/redo commands and <code>&lt;Esc&gt;</code> during completion</li>
+        <li>Various bug fixes</li>
+      </ul>
+      <p>0.29:</p>
+      <ul>
+        <li>Fixed repeat buffer limits</li>
+        <li>Enable normal <code>&lt;Enter&gt;</code> handling for one-line editors</li>
+        <li>Don't move cursor while scrolling</li>
+      </ul>
+      <p>0.28:</p>
+      <ul>
+        <li>Fixed reconfigure Vim keymap for user-defined base keymaps</li>
+      </ul>
+      <p>0.27:</p>
+      <ul>
+        <li>Better Vim keymaps for Mac OS X</li>
+        <li>Ask if the plugin should enable repeating keys in Mac OS X</li>
+        <li>Fixed a long-standing bug with code completion and repeat last change command ('<code>.</code>')</li>
+        <li>Various bug fixes</li>
+      </ul>
+      <p>0.26:</p>
+      <ul>
+        <li>Added support for paste in the command mode: from a register using <code>&lt;C-R&gt;</code>, from the clipboard using <code>&lt;S-Insert&gt;</code> or <code>&lt;M-V&gt;</code></li>
+        <li>Added support for the last change position mark (the dot <code>.</code> mark)</li>
+        <li>New shortcuts for Go to declaration <code>&lt;C-]&gt;</code> and Navigate back <code>&lt;C-T&gt;</code></li>
+        <li>Various bug fixes</li>
+      </ul>
+      <p>See also the complete <a href="https://github.com/JetBrains/ideavim/blob/master/CHANGES.md">changelog</a>.</p>
+    ]]>
+  </change-notes>
+  <description>
+    <![CDATA[
       <p>Vim emulation plug-in for IDEs based on the IntelliJ platform. IdeaVim can be used with IntelliJ IDEA, RubyMine, PyCharm, PhpStorm, WebStorm and AppCode.</p>
       <p>Supported functionality:</p>
       <ul>
@@ -20,11 +56,11 @@
           <li>Command line and search history</li>
           <li>Vim web help</li>
       </ul>
-    ]]></description>
+    ]]>
+  </description>
   <version>@VERSION@</version>
-    <vendor logo="/icons/vim16x16.png">Rick Maddy, JetBrains</vendor>
+  <vendor logo="/icons/vim16x16.png">JetBrains</vendor>
 
-    <helpset file="help.jar" path="/VimHelp.hs"/>
   <idea-version since-build="@SINCE-VERSION@"/>
 
   <!-- Mark the plugin as compatible with RubyMine and other products based on the IntelliJ platform -->
@@ -42,12 +78,12 @@
   </extensions>
 
   <actions>
-        <action id="VimPluginToggle" class="com.maddyhome.idea.vim.VimPluginToggleAction" text="VIM Emulator" description="Toggle the Vim Plugin On/Off">
+    <action id="VimPluginToggle" class="com.maddyhome.idea.vim.VimPluginToggleAction" text="Vim Emulator" description="Toggle the Vim Plugin On/Off">
       <keyboard-shortcut first-keystroke="control alt V" keymap="$default"/>
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
-        <action id="VimReconfigureKeymap" class="com.maddyhome.idea.vim.VimReconfigureKeymapAction" text="Reconfigure VIM Keymap" description="Reconfigure VIM keymap">
-            <add-to-group group-id="ToolsMenu" order="after VimPluginToggle"/>
+    <action id="VimReconfigureKeymap" class="com.maddyhome.idea.vim.VimReconfigureKeymapAction" text="Reconfigure Vim Keymap" description="Reconfigure Vim keymap">
+      <add-to-group group-id="ToolsMenu" relative-to-action="after VimPluginToggle"/>
     </action>
 
     <!-- Motions -->
@@ -317,11 +353,6 @@
     <action id="VimResetMode" class="com.maddyhome.idea.vim.action.ResetModeAction" text="Reset Mode"/>
     <action id="VimRedo" class="com.maddyhome.idea.vim.action.change.RedoAction" text="Redo"/>
     <action id="VimUndo" class="com.maddyhome.idea.vim.action.change.UndoAction" text="Undo"/>
-        <action id="VimGenerateConstructor" class="com.maddyhome.idea.vim.action.TxActionWrapper" text="Generate Constructor"/>
-        <action id="VimGenerateGetter" class="com.maddyhome.idea.vim.action.TxActionWrapper" text="Generate Getter"/>
-        <action id="VimGenerateSetter" class="com.maddyhome.idea.vim.action.TxActionWrapper" text="Generate Setter"/>
-        <action id="VimGenerateGetterAndSetter" class="com.maddyhome.idea.vim.action.TxActionWrapper" text="Generate Getter and Setter"/>
-        <action id="VimGenerateEquals" class="com.maddyhome.idea.vim.action.TxActionWrapper" text="Generate Equals"/>
 
     <action id="VimClassNameCompletion" class="com.maddyhome.idea.vim.action.OriginalDelegateAction" text="Class Name Completion"/>
     <action id="VimCodeCompletion" class="com.maddyhome.idea.vim.action.OriginalDelegateAction" text="Code Completion"/>

resources/Vim.xml

@@ -1,129 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keymap version="1" name="Vim" disable-mnemonics="false" parent="$default">
-  <action id="$Copy">
-    <keyboard-shortcut first-keystroke="control INSERT" />
-    <keyboard-shortcut first-keystroke="meta C" />
-  </action>
-  <action id="$Cut">
-    <keyboard-shortcut first-keystroke="shift DELETE" />
-    <keyboard-shortcut first-keystroke="meta X" />
-  </action>
-  <action id="$Paste">
-    <keyboard-shortcut first-keystroke="shift INSERT" />
-    <keyboard-shortcut first-keystroke="meta V" />
-  </action>
-  <action id="$Redo">
-    <keyboard-shortcut first-keystroke="shift alt BACK_SPACE" />
-  </action>
-  <action id="$SelectAll" />
-  <action id="$Undo">
-    <keyboard-shortcut first-keystroke="alt BACK_SPACE" />
-  </action>
-  <action id="CheckinProject" />
-  <action id="ClassNameCompletion" />
-  <action id="ClearCase.CheckInProject" />
-  <action id="CodeCompletion" />
-  <action id="CommanderSwapPanels" />
-  <action id="ContextHelp" />
-  <action id="EditorBackSpace">
-    <keyboard-shortcut first-keystroke="BACK_SPACE" />
-  </action>
-  <action id="EditorCodeBlockEnd" />
-  <action id="EditorCodeBlockStart" />
-  <action id="EditorCopy">
-    <keyboard-shortcut first-keystroke="control INSERT" />
-    <keyboard-shortcut first-keystroke="meta C" />
-  </action>
-  <action id="EditorCut">
-    <keyboard-shortcut first-keystroke="shift DELETE" />
-    <keyboard-shortcut first-keystroke="meta X" />
-  </action>
-  <action id="EditorDeleteLine" />
-  <action id="EditorDeleteToWordEnd" />
-  <action id="EditorDeleteToWordStart" />
-  <action id="EditorDownWithSelection" />
-  <action id="EditorDuplicate" />
-  <action id="EditorIndentSelection" />
-  <action id="EditorJoinLines" />
-  <action id="EditorLeftWithSelection" />
-  <action id="EditorLineEndWithSelection" />
-  <action id="EditorLineStartWithSelection" />
-  <action id="EditorMoveToPageBottom" />
-  <action id="EditorMoveToPageBottomWithSelection" />
-  <action id="EditorMoveToPageTop" />
-  <action id="EditorMoveToPageTopWithSelection" />
-  <action id="EditorNextWord" />
-  <action id="EditorNextWordWithSelection" />
-  <action id="EditorPageDownWithSelection" />
-  <action id="EditorPageUpWithSelection" />
-  <action id="EditorPaste">
-    <keyboard-shortcut first-keystroke="shift INSERT" />
-    <keyboard-shortcut first-keystroke="meta V" />
-  </action>
-  <action id="EditorPreviousWord" />
-  <action id="EditorPreviousWordWithSelection" />
-  <action id="EditorRedo" />
-  <action id="EditorRightWithSelection" />
-  <action id="EditorScrollDown" />
-  <action id="EditorScrollToCenter" />
-  <action id="EditorScrollUp" />
-  <action id="EditorSelectAll" />
-  <action id="EditorSelectWord" />
-  <action id="EditorSplitLine" />
-  <action id="EditorStartNewLine" />
-  <action id="EditorTextEnd" />
-  <action id="EditorTextEndWithSelection" />
-  <action id="EditorTextStart" />
-  <action id="EditorTextStartWithSelection" />
-  <action id="EditorToggleCase" />
-  <action id="EditorUnSelectWord" />
-  <action id="EditorUndo" />
-  <action id="EditorUnindentSelection" />
-  <action id="EditorUpWithSelection" />
-  <action id="Find" />
-  <action id="FindNext">
-    <keyboard-shortcut first-keystroke="F3" />
-  </action>
-  <action id="FindPrevious">
-    <keyboard-shortcut first-keystroke="shift F3" />
-  </action>
-  <action id="GotoBookmark2" />
-  <action id="GotoClass">
-    <keyboard-shortcut first-keystroke="shift alt N" />
-  </action>
-  <action id="GotoDeclaration">
-    <mouse-shortcut keystroke="control button1" />
-    <mouse-shortcut keystroke="button2" />
-  </action>
-  <action id="GotoLine" />
-  <action id="GotoSuperMethod">
-    <keyboard-shortcut first-keystroke="shift control U" />
-  </action>
-  <action id="ImplementMethods">
-    <keyboard-shortcut first-keystroke="shift control I" />
-  </action>
-  <action id="InsertLiveTemplate" />
-  <action id="MethodHierarchy.ImplementMethodAction" />
-  <action id="MethodHierarchy.OverrideMethodAction" />
-  <action id="OverrideMethods">
-    <keyboard-shortcut first-keystroke="shift control O" />
-  </action>
-  <action id="ParameterInfo">
-    <keyboard-shortcut first-keystroke="shift control P" />
-  </action>
-  <action id="QuickJavaDoc">
-    <mouse-shortcut keystroke="alt button2" />
-  </action>
-  <action id="RecentFiles" />
-  <action id="Replace" />
-  <action id="SaveAll" />
-  <action id="SmartTypeCompletion" />
-  <action id="Starteam.CheckinProject" />
-  <action id="Subversion.CommitProject" />
-  <action id="ToggleBookmark2" />
-  <action id="TypeHierarchy">
-    <keyboard-shortcut first-keystroke="shift control alt H" />
-  </action>
   <action id="VimKeyHandler">
     <keyboard-shortcut first-keystroke="control 2" />
     <keyboard-shortcut first-keystroke="control A" />
@@ -145,7 +21,6 @@
     <keyboard-shortcut first-keystroke="control L" />
     <keyboard-shortcut first-keystroke="control LEFT" />
     <keyboard-shortcut first-keystroke="control M" />
-    <keyboard-shortcut first-keystroke="control N" />
     <keyboard-shortcut first-keystroke="control O" />
     <keyboard-shortcut first-keystroke="control OPEN_BRACKET" />
     <keyboard-shortcut first-keystroke="control P" />

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2006 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,17 @@ package com.maddyhome.idea.vim;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim;
+
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
 import com.intellij.openapi.project.Project;
@@ -105,7 +104,6 @@ public class KeyHandler {
     // All the editor actions should be performed with top level editor!!!
     // Be careful: all the EditorActionHandler implementation should correctly process InjectedEditors
     editor = InjectedLanguageUtil.getTopLevelEditor(editor);
-    logger.debug("handleKey " + key);
     final CommandState editorState = CommandState.getInstance(editor);
     final boolean isRecording = editorState.isRecording();
     boolean shouldRecord = true;
@@ -120,13 +118,11 @@ public class KeyHandler {
     else if (isCommandCount(editorState, chKey)) {
       // Update the count
       count = count * 10 + (chKey - '0');
-      logger.debug("count now " + count);
     }
     // Pressing delete while entering a count "removes" the last digit entered
     else if (isDeleteCommandCount(key, editorState)) {
       // "Remove" the last digit sent to us
       count /= 10;
-      logger.debug("count now " + count);
     }
     // If we got this far the user is entering a command or supplying an argument to an entered command.
     // First let's check to see if we are at the point of expecting a single character argument to a command.
@@ -138,9 +134,6 @@ public class KeyHandler {
     else {
       // For debugging purposes we track the keys entered for this command
       keys.add(key);
-      if (logger.isDebugEnabled()) {
-        logger.debug("keys now " + keys);
-      }
 
       // Ask the key/action tree if this is an appropriate key at this point in the command and if so,
       // return the node matching this keystroke
@@ -161,21 +154,16 @@ public class KeyHandler {
       // If this is an argument node then the last keystroke was not part of the current command but should
       // be the first keystroke of the argument of the current command
       else if (node instanceof ArgumentNode) {
-        shouldRecord = handleArgumentNode(editor, key, context, editorState, shouldRecord, (ArgumentNode)node);
+        shouldRecord = handleArgumentNode(editor, key, context, editorState, true, (ArgumentNode)node);
       }
       else {
-        logger.debug("checking for digraph");
-        logger.debug("lastWasBS=" + lastWasBS);
-        logger.debug("lastChar=" + lastChar);
         if (lastWasBS && lastChar != 0 && Options.getInstance().isSet("digraph")) {
           char dig = CommandGroups.getInstance().getDigraph().getDigraph(lastChar, key.getKeyChar());
-          logger.debug("dig=" + dig);
           key = KeyStroke.getKeyStroke(dig);
         }
 
         // If we are in insert/replace mode send this key in for processing
-        if (editorState.getMode() == CommandState.Mode.INSERT ||
-            editorState.getMode() == CommandState.Mode.REPLACE) {
+        if (editorState.getMode() == CommandState.Mode.INSERT || editorState.getMode() == CommandState.Mode.REPLACE) {
           if (!CommandGroups.getInstance().getChange().processKey(editor, context, key)) {
             shouldRecord = false;
           }
@@ -214,36 +202,35 @@ public class KeyHandler {
       fullReset(editor);
     }
     else if (isRecording && shouldRecord) {
-      CommandGroups.getInstance().getRegister().addKeyStroke(key);
+      CommandGroups.getInstance().getRegister().recordKeyStroke(key);
     }
   }
 
-  private void handleEditorReset(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull DataContext context) {
+  private void handleEditorReset(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull final DataContext context) {
     if (state != State.COMMAND && count == 0 && currentArg == Argument.Type.NONE && currentCmd.size() == 0 &&
         CommandGroups.getInstance().getRegister().getCurrentRegister() == RegisterGroup.REGISTER_DEFAULT) {
       if (key.getKeyCode() == KeyEvent.VK_ESCAPE) {
+        CommandProcessor.getInstance().executeCommand(editor.getProject(), new Runnable() {
+          @Override
+          public void run() {
             KeyHandler.executeAction("VimEditorEscape", context);
-        //getOriginalHandler().execute(editor, key.getKeyChar(), context);
+          }
+        }, "", null);
       }
       VimPlugin.indicateError();
     }
-
     reset(editor);
   }
 
   private boolean isDeleteCommandCount(@NotNull KeyStroke key, @NotNull CommandState editorState) {
-    return (editorState.getMode() == CommandState.Mode.COMMAND ||
-              editorState.getMode() == CommandState.Mode.VISUAL) &&
-             state == State.NEW_COMMAND && currentArg != Argument.Type.CHARACTER && currentArg !=
-                                                                                              Argument.Type.DIGRAPH &&
+    return (editorState.getMode() == CommandState.Mode.COMMAND || editorState.getMode() == CommandState.Mode.VISUAL) &&
+           state == State.NEW_COMMAND && currentArg != Argument.Type.CHARACTER && currentArg != Argument.Type.DIGRAPH &&
            key.getKeyCode() == KeyEvent.VK_DELETE && count != 0;
   }
 
   private boolean isCommandCount(@NotNull CommandState editorState, char chKey) {
-    return (editorState.getMode() == CommandState.Mode.COMMAND ||
-              editorState.getMode() == CommandState.Mode.VISUAL) &&
-             state == State.NEW_COMMAND && currentArg != Argument.Type.CHARACTER && currentArg !=
-                                                                                              Argument.Type.DIGRAPH &&
+    return (editorState.getMode() == CommandState.Mode.COMMAND || editorState.getMode() == CommandState.Mode.VISUAL) &&
+           state == State.NEW_COMMAND && currentArg != Argument.Type.CHARACTER && currentArg != Argument.Type.DIGRAPH &&
            Character.isDigit(chKey) &&
            (count != 0 || chKey != '0');
   }
@@ -256,7 +243,6 @@ public class KeyHandler {
   }
 
   private void handleCharArgument(@NotNull KeyStroke key, char chKey) {
-    logger.debug("currentArg is Character");
     // We are expecting a character argument - is this a regular character the user typed?
     // Some special keys can be handled as character arguments - let's check for them here.
     if (chKey == 0) {
@@ -284,12 +270,13 @@ public class KeyHandler {
     }
   }
 
-  private boolean handleDigraph(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull DataContext context, @Nullable Node node) {
+  private boolean handleDigraph(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull DataContext context,
+                                @Nullable Node node) {
     if (digraph == null && !(node instanceof CommandNode) && DigraphSequence.isDigraphStart(key)) {
       digraph = new DigraphSequence();
     }
     if (digraph != null) {
-      DigraphSequence.DigraphResult res = digraph.processKey(key, editor, context);
+      DigraphSequence.DigraphResult res = digraph.processKey(key, editor);
       switch (res.getResult()) {
         case DigraphSequence.DigraphResult.RES_OK:
           return true;
@@ -301,11 +288,13 @@ public class KeyHandler {
             currentArg = Argument.Type.CHARACTER;
           }
           digraph = null;
-          handleKey(editor, res.getStroke(), context);
+          final KeyStroke stroke = res.getStroke();
+          if (stroke == null) {
+            return false;
+          }
+          handleKey(editor, stroke, context);
           return true;
       }
-
-      logger.debug("digraph done");
     }
     return false;
   }
@@ -323,24 +312,20 @@ public class KeyHandler {
       cmd = top;
     }
 
-    if (logger.isDebugEnabled()) {
-      logger.debug("cmd=" + cmd);
-    }
     // If we have a command and a motion command argument, both could possibly have their own counts. We
     // need to adjust the counts so the motion gets the product of both counts and the count associated with
     // the command gets reset. Example 3c2w (change 2 words, three times) becomes c6w (change 6 words)
-    Argument arg = cmd.getArgument();
-    if (logger.isDebugEnabled()) {
-      logger.debug("arg=" + arg);
-    }
+    final Argument arg = cmd.getArgument();
     if (arg != null && arg.getType() == Argument.Type.MOTION) {
-      Command mot = arg.getMotion();
+      final Command mot = arg.getMotion();
       // If no count was entered for either command then nothing changes. If either had a count then
       // the motion gets the product of both.
+      if (mot != null) {
         int cnt = cmd.getRawCount() == 0 && mot.getRawCount() == 0 ? 0 : cmd.getCount() * mot.getCount();
-      cmd.setCount(0);
         mot.setCount(cnt);
       }
+      cmd.setCount(0);
+    }
 
     // If we were in "operator pending" mode, reset back to normal mode.
     if (editorState.getMappingMode() == KeyParser.MAPPING_OP_PEND) {
@@ -352,34 +337,30 @@ public class KeyHandler {
     editorState.setCommand(cmd);
 
     lastWasBS = ((cmd.getFlags() & Command.FLAG_IS_BACKSPACE) != 0);
-    logger.debug("lastWasBS=" + lastWasBS);
 
     Project project = editor.getProject();
     if (cmd.getType().isRead() || project == null || EditorHelper.canEdit(project, editor)) {
       if (ApplicationManager.getApplication().isDispatchThread()) {
         Runnable action = new ActionRunner(editor, context, cmd, key);
+        String name = cmd.getAction().getTemplatePresentation().getText();
+        name = name != null ? "Vim " + name : "";
         if (cmd.getType().isWrite()) {
-          RunnableHelper.runWriteCommand(project, action, cmd.getActionId(), null);
+          RunnableHelper.runWriteCommand(project, action, name, action);
         }
         else {
-          RunnableHelper.runReadCommand(project, action, cmd.getActionId(), null);
+          RunnableHelper.runReadCommand(project, action, name, action);
         }
       }
     }
     else {
-      logger.info("write command on read-only file");
       VimPlugin.indicateError();
       reset(editor);
     }
   }
 
-  private boolean handleArgumentNode(@NotNull Editor editor,
-                                     @NotNull KeyStroke key,
-                                     @NotNull DataContext context,
-                                     @NotNull CommandState editorState,
-                                     boolean shouldRecord,
+  private boolean handleArgumentNode(@NotNull Editor editor, @NotNull KeyStroke key, @NotNull DataContext context,
+                                     @NotNull CommandState editorState, boolean shouldRecord,
                                      @NotNull ArgumentNode node) {
-    logger.debug("argument node");
     // Create a new command based on what the user has typed so far, excluding this keystroke.
     Command cmd = new Command(count, node.getActionId(), node.getAction(), node.getCmdType(), node.getFlags());
     cmd.setKeys(keys);
@@ -398,8 +379,7 @@ public class KeyHandler {
         // commands
         if ((node.getFlags() & Command.FLAG_OP_PEND) != 0) {
           //CommandState.getInstance().setMappingMode(KeyParser.MAPPING_OP_PEND);
-          editorState.pushState(editorState.getMode(), editorState.getSubMode(),
-                                KeyParser.MAPPING_OP_PEND);
+          editorState.pushState(editorState.getMode(), editorState.getSubMode(), KeyParser.MAPPING_OP_PEND);
         }
         break;
       case EX_STRING:
@@ -421,7 +401,6 @@ public class KeyHandler {
   }
 
   private void handleCommandNode(@NotNull Editor editor, @NotNull DataContext context, @NotNull CommandNode node) {
-    logger.debug("command node");
     // If all does well we are ready to process this command
     state = State.READY;
     // Did we just get the completed sequence for a motion command argument?
@@ -429,15 +408,13 @@ public class KeyHandler {
       // We have been expecting a motion argument - is this one?
       if (node.getCmdType() == Command.Type.MOTION) {
         // Create the motion command and add it to the stack
-        Command cmd = new Command(count, node.getActionId(), node.getAction(),
-                                  node.getCmdType(), node.getFlags());
+        Command cmd = new Command(count, node.getActionId(), node.getAction(), node.getCmdType(), node.getFlags());
         cmd.setKeys(keys);
         currentCmd.push(cmd);
       }
       else if (node.getCmdType() == Command.Type.RESET) {
         currentCmd.clear();
-        Command cmd = new Command(1, node.getActionId(), node.getAction(),
-                                  node.getCmdType(), node.getFlags());
+        Command cmd = new Command(1, node.getActionId(), node.getAction(), node.getCmdType(), node.getFlags());
         cmd.setKeys(keys);
         currentCmd.push(cmd);
       }
@@ -456,23 +433,20 @@ public class KeyHandler {
     // The user entered a valid command that doesn't take any arguments
     else {
       // Create the command and add it to the stack
-      Command cmd = new Command(count, node.getActionId(), node.getAction(),
-                                node.getCmdType(), node.getFlags());
+      Command cmd = new Command(count, node.getActionId(), node.getAction(), node.getCmdType(), node.getFlags());
       cmd.setKeys(keys);
       currentCmd.push(cmd);
 
       // This is a sanity check that the command has a valid action. This should only fail if the
       // programmer made a typo or forgot to add the action to the plugin.xml file
       if (cmd.getAction() == null) {
-        logger.error("NULL action for keys '" + keys + "'");
         state = State.ERROR;
       }
     }
   }
 
-  private void handleBranchNode(@NotNull Editor editor, @NotNull DataContext context, @NotNull CommandState editorState, char key,
-                                @NotNull BranchNode node) {
-    logger.debug("branch node");
+  private void handleBranchNode(@NotNull Editor editor, @NotNull DataContext context, @NotNull CommandState editorState,
+                                char key, @NotNull BranchNode node) {
     // Flag that we aren't allowing any more count digits (unless it's OK)
     if ((node.getFlags() & Command.FLAG_ALLOW_MID_COUNT) == 0) {
       state = State.COMMAND;
@@ -505,16 +479,12 @@ public class KeyHandler {
    * @param name    The name of the action to execute
    * @param context The context to run it in
    */
-  public static void executeAction(String name, DataContext context) {
-    logger.debug("executing action " + name);
+  public static void executeAction(@NotNull String name, @NotNull DataContext context) {
     ActionManager aMgr = ActionManager.getInstance();
     AnAction action = aMgr.getAction(name);
     if (action != null) {
       executeAction(action, context);
     }
-    else {
-      logger.debug("Unknown action");
-    }
   }
 
   /**
@@ -523,22 +493,15 @@ public class KeyHandler {
    * @param action  The action to execute
    * @param context The context to run it in
    */
-  public static void executeAction(AnAction action, DataContext context) {
-    if (logger.isDebugEnabled()) {
-      logger.debug("executing action " + action);
-    }
-
+  public static void executeAction(@NotNull AnAction action, @NotNull DataContext context) {
     // Hopefully all the arguments are sufficient. So far they all seem to work OK.
     // We don't have a specific InputEvent so that is null
     // What is "place"? Leave it the empty string for now.
     // Is the template presentation sufficient?
     // What are the modifiers? Is zero OK?
-    action.actionPerformed(new AnActionEvent(
-      null,
-      context,
-      "",
-      action.getTemplatePresentation(),
-      ActionManager.getInstance(), // API change - don't merge
+    action.actionPerformed(
+      new AnActionEvent(null, context, "", action.getTemplatePresentation(), ActionManager.getInstance(),
+                        // API change - don't merge
                         0));
   }
 
@@ -553,7 +516,6 @@ public class KeyHandler {
     keys = new ArrayList<KeyStroke>();
     CommandState editorState = CommandState.getInstance(editor);
     editorState.setCurrentNode(KeyParser.getInstance().getKeyRoot(editorState.getMappingMode()));
-    logger.debug("partialReset");
   }
 
   /**
@@ -567,7 +529,6 @@ public class KeyHandler {
     currentCmd.clear();
     currentArg = Argument.Type.NONE;
     digraph = null;
-    logger.debug("reset");
   }
 
   /**
@@ -602,9 +563,8 @@ public class KeyHandler {
       boolean wasRecording = editorState.isRecording();
 
       executeAction(cmd.getAction(), context);
-      if (editorState.getMode() == CommandState.Mode.INSERT ||
-          editorState.getMode() == CommandState.Mode.REPLACE) {
-        CommandGroups.getInstance().getChange().processCommand(editor, context, cmd);
+      if (editorState.getMode() == CommandState.Mode.INSERT || editorState.getMode() == CommandState.Mode.REPLACE) {
+        CommandGroups.getInstance().getChange().processCommand(editor, cmd);
       }
 
       // Now that the command has been executed let's clean up a few things.
@@ -627,7 +587,7 @@ public class KeyHandler {
       KeyHandler.getInstance().reset(editor);
 
       if (wasRecording && editorState.isRecording()) {
-        CommandGroups.getInstance().getRegister().addKeyStroke(key);
+        CommandGroups.getInstance().getRegister().recordKeyStroke(key);
       }
     }
 
@@ -648,13 +608,12 @@ public class KeyHandler {
   private int count;
   private List<KeyStroke> keys;
   private State state;
-  private Stack<Command> currentCmd = new Stack<Command>();
+  @NotNull private Stack<Command> currentCmd = new Stack<Command>();
   @NotNull private Argument.Type currentArg;
   private TypedActionHandler origHandler;
-  private DigraphSequence digraph = null;
+  @Nullable private DigraphSequence digraph = null;
   private char lastChar;
   private boolean lastWasBS;
 
   private static KeyHandler instance;
-  private static Logger logger = Logger.getInstance(KeyHandler.class.getName());
 }

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

@@ -1,3 +1,21 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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.google.common.base.Joiner;
@@ -6,24 +24,19 @@ import com.google.common.io.Resources;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
+import com.intellij.openapi.actionSystem.Shortcut;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.application.PathManager;
-import com.intellij.openapi.application.ex.ApplicationEx;
-import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.components.impl.stores.StorageUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.keymap.impl.KeymapImpl;
 import com.intellij.openapi.keymap.impl.KeymapManagerImpl;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.maddyhome.idea.vim.ui.VimKeymapDialog;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -31,6 +44,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 
 import static com.google.common.io.ByteStreams.toByteArray;
 
@@ -56,10 +72,6 @@ public class VimKeyMapUtil {
    */
   public static boolean installKeyBoardBindings() {
     LOG.debug("Check for keyboard bindings");
-    if (isVimKeymapInstalled()) {
-      return true;
-    }
-
     final LocalFileSystem localFileSystem = LocalFileSystem.getInstance();
     if (localFileSystem.refreshAndFindFileByPath(KEYMAPS_PATH) == null) {
       reportError("Failed to install vim keymap. Empty keymaps folder");
@@ -71,9 +83,11 @@ public class VimKeyMapUtil {
       final byte[] bytes = toByteArray(retrieveSourceKeymapStream());
       Files.write(bytes, new File(INSTALLED_VIM_KEYMAP_PATH));
       final Document document = StorageUtil.loadDocument(bytes);
-      if (!ApplicationManager.getApplication().isUnitTestMode()) {
+      if (document != null && !ApplicationManager.getApplication().isUnitTestMode()) {
         // Prompt user to select the parent for the Vim keyboard
-        configureVimParentKeymap(INSTALLED_VIM_KEYMAP_PATH, document, false);
+        if (!configureVimParentKeymap(INSTALLED_VIM_KEYMAP_PATH, document, true)) {
+          return false;
+        }
       }
       installKeymap(document);
     } catch (IOException e) {
@@ -90,7 +104,7 @@ public class VimKeyMapUtil {
     return true;
   }
 
-  private static void installKeymap(Document document) throws InvalidDataException {
+  private static void installKeymap(@Nullable Document document) throws InvalidDataException {
     if (document == null) {
       throw new InvalidDataException();
     }
@@ -101,47 +115,53 @@ public class VimKeyMapUtil {
     keymapManager.addKeymap(vimKeyMap);
   }
 
-  private static void requestRestartOrShutdown(final Project project) {
-    final ApplicationEx app = ApplicationManagerEx.getApplicationEx();
-    if (app.isRestartCapable()) {
-      if (Messages.showDialog(project, "Restart " + ApplicationNamesInfo.getInstance().getProductName() + " to activate changes?",
-                              VimPlugin.IDEAVIM_NOTIFICATION_TITLE, new String[]{"&Restart", "&Postpone"}, 0,
-                              Messages.getQuestionIcon()) == 0) {
-        app.restart();
-      }
-    } else {
-      if (Messages.showDialog(project, "Shut down " + ApplicationNamesInfo.getInstance().getProductName() + " to activate changes?",
-                              VimPlugin.IDEAVIM_NOTIFICATION_TITLE, new String[]{"&Shut Down", "&Postpone"}, 0,
-                              Messages.getQuestionIcon()) == 0) {
-        app.exit(true);
-      }
-    }
-  }
-
   /**
    * Changes parent keymap for the Vim
    *
    * @return true if document was changed successfully
    */
-  private static boolean configureVimParentKeymap(final String path, final Document document, final boolean showNotification) throws IOException {
+  private static boolean configureVimParentKeymap(final String path, @NotNull final Document document,
+                                                  final boolean showNotification)
+    throws IOException, InvalidDataException {
     final Element rootElement = document.getRootElement();
-    final String parentKeymap = rootElement.getAttributeValue("parent");
-    final VimKeymapDialog vimKeymapDialog = new VimKeymapDialog(parentKeymap);
+    final String parentKeymapName = rootElement.getAttributeValue("parent");
+    final VimKeymapDialog vimKeymapDialog = new VimKeymapDialog(parentKeymapName);
     vimKeymapDialog.show();
     if (vimKeymapDialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
       return false;
     }
     rootElement.removeAttribute("parent");
-    final Keymap selectedKeymap = vimKeymapDialog.getSelectedKeymap();
-    final String keymapName = selectedKeymap.getName();
+    final Keymap parentKeymap = vimKeymapDialog.getSelectedKeymap();
+    final String keymapName = parentKeymap.getName();
+    VimKeymapConflictResolveUtil.resolveConflicts(rootElement, parentKeymap);
+    // We cannot set a user-defined modifiable keymap as the parent of our Vim keymap so we have to copy its shortcuts
+    if (parentKeymap.canModify()) {
+      final KeymapImpl vimKeyMap = new KeymapImpl();
+      final KeymapManager keymapManager = KeymapManager.getInstance();
+      final KeymapManagerImpl keymapManagerImpl = (KeymapManagerImpl)keymapManager;
+      final Keymap[] allKeymaps = keymapManagerImpl.getAllKeymaps();
+      vimKeyMap.readExternal(rootElement, allKeymaps);
+      final HashSet<String> ownActions = new HashSet<String>(Arrays.asList(vimKeyMap.getOwnActionIds()));
+      final KeymapImpl parentKeymapImpl = (KeymapImpl)parentKeymap;
+      for (String parentAction : parentKeymapImpl.getOwnActionIds()) {
+        if (!ownActions.contains(parentAction)) {
+          final List<Shortcut> shortcuts = Arrays.asList(parentKeymap.getShortcuts(parentAction));
+          rootElement.addContent(VimKeymapConflictResolveUtil.createActionElement(parentAction, shortcuts));
+        }
+      }
+      final Keymap grandParentKeymap = parentKeymap.getParent();
+      rootElement.setAttribute("parent", grandParentKeymap.getName());
+    }
+    else {
       rootElement.setAttribute("parent", keymapName);
-
+    }
+    VimPlugin.getInstance().setPreviousKeyMap(keymapName);
     // Save modified keymap to the file
     JDOMUtil.writeDocument(document, path, "\n");
     if (showNotification) {
       Notifications.Bus.notify(new Notification(VimPlugin.IDEAVIM_NOTIFICATION_ID, VimPlugin.IDEAVIM_NOTIFICATION_TITLE,
                                                 "Successfully configured vim keymap to be based on " +
-                                                  selectedKeymap.getPresentableName(),
+                                                parentKeymap.getPresentableName(),
                                                 NotificationType.INFORMATION));
     }
 
@@ -194,30 +214,6 @@ public class VimKeyMapUtil {
     return true;
   }
 
-
-  public static void reconfigureParentKeymap(final Project project) {
-    final VirtualFile vimKeymapFile = getVimKeymapFile();
-    if (vimKeymapFile == null) {
-      reportError("Failed to find Vim keymap");
-      return;
-    }
-
-    try {
-      final Document document = StorageUtil.loadDocument(new FileInputStream(vimKeymapFile.getPath()));
-      // Prompt user to select the parent for the Vim keyboard
-      if (configureVimParentKeymap(vimKeymapFile.getPath(), document, true)) {
-        installKeymap(document);
-        requestRestartOrShutdown(project);
-      }
-    } catch (FileNotFoundException e) {
-      reportError("Failed to install vim keymap.", e);
-    } catch (IOException e) {
-      reportError("Failed to install vim keymap.", e);
-    } catch (InvalidDataException e) {
-      reportError("Failed to install vim keymap. Vim.xml file is corrupted", e);
-    }
-  }
-
   @NotNull
   private static InputStream retrieveSourceKeymapStream() throws IOException {
     String keymapPath = PATH_JOINER.join(PathManager.getPluginsPath(), VimPlugin.IDEAVIM_NOTIFICATION_TITLE, VIM_XML);
@@ -241,9 +237,4 @@ public class VimKeyMapUtil {
     Notifications.Bus.notify(new Notification(VimPlugin.IDEAVIM_NOTIFICATION_ID, VimPlugin.IDEAVIM_NOTIFICATION_TITLE,
                                               message + String.valueOf(e), NotificationType.ERROR));
   }
-
-  @Nullable
-  public static VirtualFile getVimKeymapFile() {
-    return LocalFileSystem.getInstance().refreshAndFindFileByPath(INSTALLED_VIM_KEYMAP_PATH);
-  }
 }

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

@@ -0,0 +1,242 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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.google.common.collect.ImmutableList;
+import com.intellij.openapi.actionSystem.KeyboardShortcut;
+import com.intellij.openapi.actionSystem.MouseShortcut;
+import com.intellij.openapi.actionSystem.Shortcut;
+import com.intellij.openapi.keymap.Keymap;
+import com.intellij.openapi.keymap.impl.KeymapImpl;
+import com.intellij.openapi.util.SystemInfo;
+import org.jdom.Element;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.util.*;
+
+import static com.google.common.collect.Lists.newLinkedList;
+import static com.google.common.collect.Maps.newHashMap;
+
+/**
+ * User: zolotov
+ * Date: 1/8/13
+ */
+public class VimKeymapConflictResolveUtil {
+  private static final String SHIFT = "shift";
+  private static final String CONTROL = "control";
+  private static final String META = "meta";
+  private static final String ALT = "alt";
+  private static final String ALT_GRAPH = "altGraph";
+  private static final String DOUBLE_CLICK = "doubleClick";
+
+  private static final String VIM_KEY_HANDLER_ACTION_ID = "VimKeyHandler";
+  private static final String ACTION_TAG = "action";
+  private static final String KEYBOARD_SHORTCUT_TAG = "keyboard-shortcut";
+  private static final String MOUSE_SHORTCUT_TAG = "mouse-shortcut";
+  private static final String ID_ATTRIBUTE = "id";
+  private static final String FIRST_KEYSTROKE_ATTRIBUTE = "first-keystroke";
+  private static final String KEYSTROKE_ATTRIBUTE = "keystroke";
+  private static final String SECOND_KEYSTROKE_ATTRIBUTE = "second-keystroke";
+
+  private static final List<Integer> ALTERNATIVE_MODIFIERS = ImmutableList.of(
+    InputEvent.ALT_DOWN_MASK,
+    InputEvent.CTRL_DOWN_MASK,
+    InputEvent.SHIFT_DOWN_MASK,
+    InputEvent.META_DOWN_MASK,
+    InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK,
+    InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK,
+    InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK,
+    InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK,
+    InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK);
+
+  public static void resolveConflicts(Element targetKeymapRoot, Keymap parentKeymap) {
+    final Collection<String> vimHandlingShortcuts = getVimHandlingShortcuts(targetKeymapRoot);
+    final Map<String, List<Shortcut>> shortcutsToOverride = retrieveShortcutsToOverride(vimHandlingShortcuts, parentKeymap);
+    overrideShortcuts(targetKeymapRoot, shortcutsToOverride);
+  }
+
+  /**
+   * @param targetKeymapRoot root element of Vim keymap
+   * @return all shortcuts in string representation that should be handled by Vim plugin
+   */
+  private static Collection<String> getVimHandlingShortcuts(Element targetKeymapRoot) {
+    Element vimKeyHandlerAction = retrieveActionElement(targetKeymapRoot);
+    if (vimKeyHandlerAction != null) {
+      Collection<String> result = newLinkedList();
+      for (Object childAction : vimKeyHandlerAction.getChildren()) {
+        if (childAction instanceof Element) {
+          Element shortcut = (Element)childAction;
+          result.add(shortcut.getAttributeValue(FIRST_KEYSTROKE_ATTRIBUTE));
+        }
+      }
+      return result;
+    }
+    return Collections.emptyList();
+  }
+
+  /**
+   * @param targetKeymapRoot root element of Vim keymap
+   * @return Retrieve VimKeyHandler action element
+   */
+  @Nullable
+  private static Element retrieveActionElement(Element targetKeymapRoot) {
+    Element vimKeyHandlerAction = null;
+    for (Object child : targetKeymapRoot.getChildren(ACTION_TAG)) {
+      if (child instanceof Element) {
+        Element action = (Element)child;
+        if (VIM_KEY_HANDLER_ACTION_ID.equals(action.getAttributeValue(ID_ATTRIBUTE))) {
+          vimKeyHandlerAction = action;
+          break;
+        }
+      }
+    }
+    return vimKeyHandlerAction;
+  }
+
+  /**
+   * @param vimHandlingShortcuts collection of shortcuts that should be handled by Vim plugin
+   * @param parentKeymap         selected parent keymap for vim keymap
+   * @return mapping of action names to its shortcuts that we should save in Vim-keymap
+   *         (or empty list of shortcuts if action just should be disabled)
+   */
+  private static Map<String, List<Shortcut>> retrieveShortcutsToOverride(Collection<String> vimHandlingShortcuts, Keymap parentKeymap) {
+    Map<String, List<Shortcut>> result = newHashMap();
+    for (String shortcut : vimHandlingShortcuts) {
+      final Map<String, ArrayList<KeyboardShortcut>> conflicts = parentKeymap.getConflicts("", KeyboardShortcut.fromString(shortcut));
+      for (Map.Entry<String, ArrayList<KeyboardShortcut>> conflict : conflicts.entrySet()) {
+        String actionName = conflict.getKey();
+        final ArrayList<KeyboardShortcut> conflictedShortcuts = conflict.getValue();
+        if (result.containsKey(actionName)) {
+          // found another conflict for already overridden action
+          List<Shortcut> overridesShortcuts = result.get(actionName);
+          for (KeyboardShortcut conflictedShortcut : conflictedShortcuts) {
+            overridesShortcuts.remove(conflictedShortcut);
+          }
+        }
+        else {
+          // let's override action with all non-conflict shortcuts
+          List<Shortcut> overriddenShortcuts = newLinkedList();
+          for (Shortcut actionShortcut : parentKeymap.getShortcuts(actionName)) {
+            if (!(actionShortcut instanceof KeyboardShortcut) || !conflictedShortcuts.contains(actionShortcut)) {
+              overriddenShortcuts.add(actionShortcut);
+            }
+          }
+          if (overriddenShortcuts.isEmpty()) {
+            for (Integer modifier : ALTERNATIVE_MODIFIERS) {
+              if (!SystemInfo.isMac && (modifier & InputEvent.META_DOWN_MASK) != 0) {
+                continue;
+              }
+              final KeyStroke originalStroke = KeyStroke.getKeyStroke(shortcut);
+              final int modifiers = originalStroke.getModifiers() | modifier;
+              //noinspection MagicConstant
+              final KeyStroke stroke = KeyStroke.getKeyStroke(originalStroke.getKeyCode(), modifiers);
+              final KeyboardShortcut alternativeShortcut = new KeyboardShortcut(stroke, null);
+              if (parentKeymap.getConflicts("", alternativeShortcut).isEmpty()) {
+                overriddenShortcuts.add(alternativeShortcut);
+                break;
+              }
+            }
+
+          }
+          result.put(actionName, overriddenShortcuts);
+        }
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Fill vim keymap with overridden actions.
+   * Only keyboard and mouse shortcuts will be overridden.
+   *
+   * @param targetKeymapRoot    root element of Vim keymap
+   * @param shortcutsToOverride overriding mapping: actions -> shortcuts_should_be_saved
+   */
+
+  private static void overrideShortcuts(Element targetKeymapRoot, Map<String, List<Shortcut>> shortcutsToOverride) {
+    for (Map.Entry<String, List<Shortcut>> action : shortcutsToOverride.entrySet()) {
+      targetKeymapRoot.addContent(createActionElement(action.getKey(), action.getValue()));
+    }
+  }
+
+  public static Element createActionElement(String actionName, List<Shortcut> shortcuts) {
+    final Element overridesAction = new Element(ACTION_TAG);
+    overridesAction.setAttribute(ID_ATTRIBUTE, actionName);
+    for (Shortcut shortcut : shortcuts) {
+      if (shortcut instanceof KeyboardShortcut) {
+        KeyboardShortcut keyboardShortcut = (KeyboardShortcut)shortcut;
+        final String firstShortcutString = KeymapImpl.getKeyShortcutString(keyboardShortcut.getFirstKeyStroke());
+        final Element shortcutElement = createShortcutElement(KEYBOARD_SHORTCUT_TAG, FIRST_KEYSTROKE_ATTRIBUTE,
+                                                              firstShortcutString);
+        overridesAction.addContent(shortcutElement);
+        final KeyStroke secondKeyStroke = keyboardShortcut.getSecondKeyStroke();
+        if (secondKeyStroke != null) {
+          final String secondShortcutString = KeymapImpl.getKeyShortcutString(secondKeyStroke);
+          shortcutElement.setAttribute(SECOND_KEYSTROKE_ATTRIBUTE, secondShortcutString);
+        }
+      }
+      else if (shortcut instanceof MouseShortcut) {
+        overridesAction.addContent(createShortcutElement(MOUSE_SHORTCUT_TAG, KEYSTROKE_ATTRIBUTE, getMouseShortcutString((MouseShortcut)shortcut)));
+      }
+    }
+    return overridesAction;
+  }
+
+  private static Element createShortcutElement(String elementName, String shortcutAttributeName, String shortcut) {
+    final Element shortcutElement = new Element(elementName);
+    shortcutElement.setAttribute(shortcutAttributeName, shortcut);
+    return shortcutElement;
+  }
+
+  /**
+   * Create string representation of mouse shortcut
+   * KeymapImpl has implementation for mouse shortcut marshaling, but it is private :-(
+   *
+   * @param shortcut mouse shortcut
+   * @return string representation of mouse shortcut
+   */
+  private static String getMouseShortcutString(MouseShortcut shortcut) {
+    StringBuilder builder = new StringBuilder();
+    int modifiers = shortcut.getModifiers();
+    if ((MouseEvent.SHIFT_DOWN_MASK & modifiers) > 0) {
+      builder.append(SHIFT).append(' ');
+    }
+    if ((MouseEvent.CTRL_DOWN_MASK & modifiers) > 0) {
+      builder.append(CONTROL).append(' ');
+    }
+    if ((MouseEvent.META_DOWN_MASK & modifiers) > 0) {
+      builder.append(META).append(' ');
+    }
+    if ((MouseEvent.ALT_DOWN_MASK & modifiers) > 0) {
+      builder.append(ALT).append(' ');
+    }
+    if ((MouseEvent.ALT_GRAPH_DOWN_MASK & modifiers) > 0) {
+      builder.append(ALT_GRAPH).append(' ');
+    }
+    builder.append("button").append(shortcut.getButton()).append(' ');
+    if (shortcut.getClickCount() > 1) {
+      builder.append(DOUBLE_CLICK);
+    }
+    return builder.toString().trim();
+  }
+
+}

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

@@ -1,25 +1,29 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 The IdeaVim authors
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
+import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ex.ApplicationEx;
 import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.components.ApplicationComponent;
@@ -39,25 +43,23 @@ 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.util.SystemInfo;
 import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.WindowManager;
 import com.maddyhome.idea.vim.command.CommandState;
 import com.maddyhome.idea.vim.ex.CommandParser;
 import com.maddyhome.idea.vim.group.*;
-import com.maddyhome.idea.vim.helper.DelegateCommandListener;
-import com.maddyhome.idea.vim.helper.DocumentManager;
-import com.maddyhome.idea.vim.helper.EditorData;
-import com.maddyhome.idea.vim.helper.EditorDataContext;
-import com.maddyhome.idea.vim.key.RegisterActions;
+import com.maddyhome.idea.vim.helper.*;
 import com.maddyhome.idea.vim.option.Options;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
 
 /**
- * This plugin attempts to emulate the keybinding and general functionality of Vim and gVim. See the supplied
+ * This plugin attempts to emulate the key binding and general functionality of Vim and gVim. See the supplied
  * documentation for a complete list of supported and unsupported Vim emulation. The code base contains some debugging
  * output that can be enabled in necessary.
  * <p/>
@@ -80,18 +82,19 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
   private static final String IDEAVIM_COMPONENT_NAME = "VimPlugin";
   public static final String IDEAVIM_NOTIFICATION_ID = "ideavim";
   public static final String IDEAVIM_NOTIFICATION_TITLE = "IdeaVim";
+  public static final int STATE_VERSION = 2;
 
   private static final boolean BLOCK_CURSOR_VIM_VALUE = true;
   private static final boolean ANIMATED_SCROLLING_VIM_VALUE = false;
   private static final boolean REFRAIN_FROM_SCROLLING_VIM_VALUE = true;
 
   private VimTypedActionHandler vimHandler;
-  private RegisterActions actions;
   private boolean isBlockCursor = false;
   private boolean isAnimatedScrolling = false;
   private boolean isRefrainFromScrolling = false;
   private boolean error = false;
 
+  private int previousStateVersion = 0;
   private String previousKeyMap = "";
 
   // It is enabled by default to avoid any special configuration after plugin installation
@@ -110,6 +113,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     LOG.debug("VimPlugin ctr");
   }
 
+  @NotNull
   public static VimPlugin getInstance() {
     return (VimPlugin)ApplicationManager.getApplication().getComponent(IDEAVIM_COMPONENT_NAME);
   }
@@ -140,6 +144,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
 
     ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
+        updateState();
         checkAndInstallKeymap();
       }
     });
@@ -154,11 +159,50 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     // Add some listeners so we can handle special events
     setupListeners();
 
-    getActions();
+    // Register vim actions in command mode
+    RegisterActions.registerActions();
+
+    // Register ex handlers
+    CommandParser.getInstance().registerHandlers();
 
     LOG.debug("done");
   }
 
+  private void updateState() {
+    if (isEnabled() && !ApplicationManager.getApplication().isUnitTestMode()) {
+      boolean requiresRestart = false;
+      if (previousStateVersion < 1 && SystemInfo.isMac && VimKeyMapUtil.isVimKeymapInstalled()) {
+        if (Messages.showYesNoDialog("Vim keymap generator has been updated to create keymaps more compatible " +
+                                     "with base keymaps.\n\nDo you want to reconfigure your Vim keymap?\n\n" +
+                                     "Warning: Any custom shortcuts will be lost!\n\n" +
+                                     "(You can do it later using Tools | Reconfigure Vim Keymap).",
+                                     IDEAVIM_NOTIFICATION_TITLE,
+                                     Messages.getQuestionIcon()) == Messages.YES) {
+          KeyHandler.executeAction("VimReconfigureKeymap", SimpleDataContext.getProjectContext(null));
+        }
+      }
+      if (previousStateVersion < 2 && SystemInfo.isMac) {
+        final MacKeyRepeat keyRepeat = MacKeyRepeat.getInstance();
+        final Boolean enabled = keyRepeat.isEnabled();
+        if (enabled == null || !enabled) {
+          if (Messages.showYesNoDialog("Do you want to enable repeating keys in Mac OS X on press and hold " +
+                                       "(requires restart)?\n\n" +
+                                       "(You can do it manually by running 'defaults write -g " +
+                                       "ApplePressAndHoldEnabled 0' in the console).",
+                                       IDEAVIM_NOTIFICATION_TITLE,
+                                       Messages.getQuestionIcon()) == Messages.YES) {
+            keyRepeat.setEnabled(true);
+            requiresRestart = true;
+          }
+        }
+      }
+      if (requiresRestart) {
+        final ApplicationEx app = ApplicationManagerEx.getApplicationEx();
+        app.restart();
+      }
+    }
+  }
+
   private static void checkAndInstallKeymap() {
     // Ensure that Vim keymap is installed and install if not.
     // Moreover we can use installed keymap as indicator of the first time installed plugin
@@ -210,7 +254,8 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
 
         if (VimPlugin.isEnabled()) {
           // Turn on insert mode if editor doesn't have any file
-          if (!EditorData.isFileEditor(editor) && !CommandState.inInsertMode(editor)) {
+          if (!EditorData.isFileEditor(editor) && editor.getDocument().isWritable() &&
+              !CommandState.inInsertMode(editor)) {
             KeyHandler.getInstance().handleKey(editor, KeyStroke.getKeyStroke('i'), new EditorDataContext(editor));
           }
           editor.getSettings().setBlockCursor(!CommandState.inInsertMode(editor));
@@ -230,7 +275,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     // Since the Vim plugin custom actions aren't available to the call to <code>initComponent()</code>
     // we need to force the generation of the key map when the first project is opened.
     ProjectManager.getInstance().addProjectManagerListener(new ProjectManagerAdapter() {
-      public void projectOpened(final Project project) {
+      public void projectOpened(@NotNull final Project project) {
         project.getMessageBus().connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new MotionGroup.MotionEditorChange());
         project.getMessageBus().connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileGroup.SelectionCheck());
         project.getMessageBus().connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new SearchGroup.EditorSelectionCheck());
@@ -256,12 +301,17 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
   }
 
   @Override
-  public void loadState(final Element element) {
+  public void loadState(@NotNull final Element element) {
     LOG.debug("Loading state");
 
     // Restore whether the plugin is enabled or not
     Element state = element.getChild("state");
     if (state != null) {
+      try {
+        previousStateVersion = Integer.valueOf(state.getAttributeValue("version"));
+      }
+      catch (NumberFormatException ignored) {
+      }
       enabled = Boolean.valueOf(state.getAttributeValue("enabled"));
       previousKeyMap = state.getAttributeValue("keymap");
     }
@@ -276,6 +326,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     final Element element = new Element("ideavim");
     // Save whether the plugin is enabled or not
     final Element state = new Element("state");
+    state.setAttribute("version", Integer.toString(STATE_VERSION));
     state.setAttribute("enabled", Boolean.toString(enabled));
     state.setAttribute("keymap", previousKeyMap);
     element.addContent(state);
@@ -308,7 +359,7 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
   }
 
   /**
-   * Inidicate to the user that an error has occurred. Just beep.
+   * Indicate to the user that an error has occurred. Just beep.
    */
   public static void indicateError() {
     if (ApplicationManager.getApplication().isUnitTestMode()) {
@@ -323,11 +374,11 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     showMessage(msg);
   }
 
-  public static void showMessage(String msg) {
+  public static void showMessage(@Nullable String msg) {
     ProjectManager pm = ProjectManager.getInstance();
-    Project[] projs = pm.getOpenProjects();
-    for (Project proj : projs) {
-      StatusBar bar = WindowManager.getInstance().getStatusBar(proj);
+    Project[] projects = pm.getOpenProjects();
+    for (Project project : projects) {
+      StatusBar bar = WindowManager.getInstance().getStatusBar(project);
       if (bar != null) {
         if (msg == null || msg.length() == 0) {
           bar.setInfo("");
@@ -380,17 +431,6 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
     }
   }
 
-  private RegisterActions getActions() {
-    if (actions == null) {
-      // Register vim actions in command mode
-      actions = RegisterActions.getInstance();
-      // Register ex handlers
-      CommandParser.getInstance().registerHandlers();
-    }
-
-    return actions;
-  }
-
   public boolean isError() {
     return error;
   }

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

@@ -1,3 +1,21 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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.actionSystem.AnActionEvent;

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

@@ -1,9 +1,27 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * This action allows to reconfigure base parent keymap for the Vim keymap
@@ -11,12 +29,13 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
  */
 public class VimReconfigureKeymapAction extends AnAction implements DumbAware {
   @Override
-  public void update(final AnActionEvent e) {
+  public void update(@NotNull final AnActionEvent e) {
     e.getPresentation().setEnabled(VimPlugin.isEnabled());
   }
 
   @Override
-  public void actionPerformed(final AnActionEvent e) {
-      VimKeyMapUtil.reconfigureParentKeymap(e.getData(PlatformDataKeys.PROJECT));
+  public void actionPerformed(@NotNull final AnActionEvent e) {
+    VimKeyMapUtil.installKeyBoardBindings();
+    VimKeyMapUtil.switchKeymapBindings(true);
   }
 }

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

@@ -1,76 +0,0 @@
-package com.maddyhome.idea.vim;
-
-/*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
- *
- * 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.
- */
-
-import java.util.HashSet;
-
-public class VimSettings {
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  public void setEnabled(boolean enabled) {
-    this.enabled = enabled;
-  }
-
-  public HashSet getChoices() {
-    return choices;
-  }
-
-  public void setChoices(HashSet choices) {
-    this.choices = choices;
-  }
-
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-
-    final VimSettings that = (VimSettings)o;
-
-    if (enabled != that.enabled) {
-      return false;
-    }
-
-    return choices.equals(that.choices);
-  }
-
-  public int hashCode() {
-    int result;
-    result = (enabled ? 1 : 0);
-    result = 29 * result + choices.hashCode();
-    return result;
-  }
-
-  public String toString() {
-    final StringBuffer sb = new StringBuffer();
-    sb.append("VimSettings");
-    sb.append("{enabled=").append(enabled);
-    sb.append(", choices=").append(choices);
-    sb.append('}');
-    return sb.toString();
-  }
-
-  private boolean enabled;
-  private HashSet choices = new HashSet();
-}

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim;
+
 import com.intellij.codeInsight.lookup.LookupEx;
 import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.openapi.actionSystem.DataContext;
@@ -75,6 +74,10 @@ public class VimTypedActionHandler implements TypedActionHandler {
       return;
     }
 
+    // Run key handler outside of the key typed command for creating our own undoable commands
+    SwingUtilities.invokeLater(new Runnable() {
+      @Override
+      public void run() {
         try {
           handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), context);
         }
@@ -82,6 +85,8 @@ public class VimTypedActionHandler implements TypedActionHandler {
           logger.error(e);
         }
       }
+    });
+  }
 
   private TypedActionHandler origHandler;
   private KeyHandler handler;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,22 +13,24 @@ package com.maddyhome.idea.vim.action;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action;
+
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.diagnostic.Logger;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class AbstractDelegateAction extends AnAction implements DelegateAction {
   protected AbstractDelegateAction() {
   }
 
-  protected AbstractDelegateAction(AnAction origAction) {
+  protected AbstractDelegateAction(@NotNull AnAction origAction) {
     setOrigAction(origAction);
   }
 
-  public void setOrigAction(AnAction origAction) {
+  public void setOrigAction(@NotNull AnAction origAction) {
     if (logger.isDebugEnabled()) {
       logger.debug("origAction=" + origAction);
     }

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

@@ -1,12 +1,11 @@
-package com.maddyhome.idea.vim.action;
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -14,26 +13,28 @@ package com.maddyhome.idea.vim.action;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action;
+
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class AbstractDelegateEditorAction extends EditorAction implements DelegateAction {
   protected AbstractDelegateEditorAction(EditorActionHandler handler) {
     super(handler);
   }
 
-  protected AbstractDelegateEditorAction(EditorActionHandler handler, EditorAction origAction) {
+  protected AbstractDelegateEditorAction(EditorActionHandler handler, @NotNull EditorAction origAction) {
     this(handler);
     setOrigAction(origAction);
   }
 
-  public void setOrigAction(AnAction origAction) {
+  public void setOrigAction(@NotNull AnAction origAction) {
     if (logger.isDebugEnabled()) {
       logger.debug("origAction=" + origAction);
     }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action;
+
 import com.intellij.openapi.actionSystem.AnAction;
 
 public interface DelegateAction {

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  *
@@ -35,7 +35,7 @@ public class ExEntryAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       CommandGroups.getInstance().getProcess().startExCommand(editor, context, cmd);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action;
+
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
 
 public class OriginalDelegateAction extends AbstractDelegateAction {
-  public void actionPerformed(AnActionEvent event) {
+  public void actionPerformed(@NotNull AnActionEvent event) {
     Editor editor = event.getData(PlatformDataKeys.EDITOR);
     if (editor != null) {
       getOrigAction().actionPerformed(event);

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action;
+
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.event.KeyEvent;
@@ -34,7 +34,7 @@ public class PassThruDelegateAction extends AbstractDelegateAction {
     this.stroke = stroke;
   }
 
-  public void actionPerformed(AnActionEvent event) {
+  public void actionPerformed(@NotNull AnActionEvent event) {
     if (logger.isDebugEnabled()) {
       logger.debug("actionPerformed key=" + stroke);
     }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2006 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
@@ -27,7 +26,6 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -44,11 +42,11 @@ public class PassThruDelegateEditorAction extends AbstractDelegateEditorAction {
       this.origHandler = handler;
     }
 
-    public void execute(@Nullable Editor editor, @NotNull DataContext dataContext) {
+    public void execute(@NotNull Editor editor, @NotNull DataContext dataContext) {
       if (logger.isDebugEnabled()) {
         logger.debug("actionPerformed key=" + stroke);
       }
-      if (editor == null || !VimPlugin.isEnabled()) {
+      if (!VimPlugin.isEnabled()) {
         origHandler.execute(editor, dataContext);
       }
       else {

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action;
+
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.handler.ResetModeHandler;
 

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

@@ -1,36 +0,0 @@
-package com.maddyhome.idea.vim.action;
-
-/*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
- *
- * 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.
- */
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.diagnostic.Logger;
-
-/**
- *
- */
-public class TxActionWrapper extends AbstractDelegateAction {
-
-  public void actionPerformed(AnActionEvent event) {
-    logger.debug("actionPerformed");
-    getOrigAction().actionPerformed(event);
-  }
-
-  private static Logger logger = Logger.getInstance(TxActionWrapper.class.getName());
-}

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
 import com.maddyhome.idea.vim.helper.UndoRedoHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class RedoAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       return UndoRedoHelper.redo(context);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -29,6 +28,7 @@ import com.maddyhome.idea.vim.command.CommandState;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
 import com.maddyhome.idea.vim.key.KeyParser;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -38,7 +38,7 @@ public class RepeatChangeAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, Command command) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command command) {
       CommandState state = CommandState.getInstance(editor);
       Command cmd = state.getLastChangeCommand();
       if (cmd != null) {
@@ -64,7 +64,9 @@ public class RepeatChangeAction extends EditorAction {
           // oops
         }
         state.popState();
+        if (save != null) {
           state.setCommand(save);
+        }
         state.saveLastChangeCommand(cmd);
         CommandGroups.getInstance().getRegister().selectRegister(reg);
 

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.ex.CommandParser;
 import com.maddyhome.idea.vim.ex.ExException;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,7 @@ public class RepeatExCommandAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, Command command) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command command) {
       int count = command.getCount();
       try {
         return CommandParser.getInstance().processLastCommand(editor, context, count);

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
 import com.maddyhome.idea.vim.helper.UndoRedoHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class UndoAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       return UndoRedoHelper.undo(context);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
 import com.maddyhome.idea.vim.helper.CharacterHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,7 @@ public class ChangeCaseLowerMotionAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, @NotNull Argument argument) {
       return CommandGroups.getInstance().getChange().changeCaseMotion(editor, context, count, rawCount,
                                                                       CharacterHelper.CASE_LOWER, argument);
     }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -28,6 +27,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.CharacterHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -37,8 +37,10 @@ public class ChangeCaseLowerVisualAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
-      return CommandGroups.getInstance().getChange().changeCaseRange(InjectedLanguageUtil.getTopLevelEditor(editor), context, range, CharacterHelper.CASE_LOWER);
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
+      return CommandGroups.getInstance().getChange().changeCaseRange(InjectedLanguageUtil.getTopLevelEditor(editor),
+                                                                     range, CharacterHelper.CASE_LOWER);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class ChangeCaseToggleCharacterAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().changeCaseToggleCharacter(editor, context, count);
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+      return CommandGroups.getInstance().getChange().changeCaseToggleCharacter(editor, count);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
 import com.maddyhome.idea.vim.helper.CharacterHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,7 @@ public class ChangeCaseToggleMotionAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, @NotNull Argument argument) {
       return CommandGroups.getInstance().getChange().changeCaseMotion(editor, context, count, rawCount,
                                                                       CharacterHelper.CASE_TOGGLE, argument);
     }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -27,6 +26,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.CharacterHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -36,8 +36,9 @@ public class ChangeCaseToggleVisualAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
-      return CommandGroups.getInstance().getChange().changeCaseRange(editor, context, range, CharacterHelper.CASE_TOGGLE);
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
+      return CommandGroups.getInstance().getChange().changeCaseRange(editor, range, CharacterHelper.CASE_TOGGLE);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
 import com.maddyhome.idea.vim.helper.CharacterHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,7 @@ public class ChangeCaseUpperMotionAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, @NotNull Argument argument) {
       return CommandGroups.getInstance().getChange().changeCaseMotion(editor, context, count, rawCount,
                                                                       CharacterHelper.CASE_UPPER, argument);
     }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -27,6 +26,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.CharacterHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -36,8 +36,9 @@ public class ChangeCaseUpperVisualAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
-      return CommandGroups.getInstance().getChange().changeCaseRange(editor, context, range, CharacterHelper.CASE_UPPER);
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
+      return CommandGroups.getInstance().getChange().changeCaseRange(editor, range, CharacterHelper.CASE_UPPER);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class ChangeCharacterAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().changeCharacter(editor, context, count, argument.getCharacter());
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, @NotNull Argument argument) {
+      return CommandGroups.getInstance().getChange().changeCharacter(editor, count, argument.getCharacter());
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ChangeCharactersAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getChange().changeCharacters(editor, context, count);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ChangeEndOfLineAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getChange().changeEndOfLine(editor, context, count);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -27,6 +26,7 @@ import com.maddyhome.idea.vim.ex.LineRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -36,7 +36,7 @@ public class ChangeLastGlobalSearchReplaceAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
       LineRange range = new LineRange(0, EditorHelper.getLineCount(editor) - 1);
       return CommandGroups.getInstance().getSearch().searchAndReplace(editor, context, range, "s", "//~/&");
     }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.ex.LineRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,7 @@ public class ChangeLastSearchReplaceAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
       int line = editor.getCaretModel().getLogicalPosition().line;
       LineRange range = new LineRange(line, line);
       return CommandGroups.getInstance().getSearch().searchAndReplace(editor, context, range, "s", "//~/");

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ChangeLineAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getChange().changeLine(editor, context, count);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ChangeMotionAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, @NotNull Argument argument) {
       return CommandGroups.getInstance().getChange().changeMotion(editor, context, count, rawCount, argument);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2006 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class ChangeNumberDecAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().changeNumber(editor, context, -count);
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+      return CommandGroups.getInstance().getChange().changeNumber(editor, -count);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2006 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class ChangeNumberIncAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().changeNumber(editor, context, count);
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+      return CommandGroups.getInstance().getChange().changeNumber(editor, count);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ChangeReplaceAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getChange().changeReplace(editor, context);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -27,6 +26,7 @@ import com.maddyhome.idea.vim.command.SelectionType;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -36,7 +36,8 @@ public class ChangeVisualAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       final SelectionType type = range.isMultiple() ? SelectionType.BLOCK_WISE : SelectionType.CHARACTER_WISE;
       return CommandGroups.getInstance().getChange().changeRange(editor, context, range, type);
     }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,8 +35,8 @@ public class ChangeVisualCharacterAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
-      return CommandGroups.getInstance().getChange().changeCharacterRange(editor, context, range,
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd, @NotNull TextRange range) {
+      return CommandGroups.getInstance().getChange().changeCharacterRange(editor, range,
                                                                           cmd.getArgument().getCharacter());
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -28,6 +27,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -37,7 +37,8 @@ public class ChangeVisualLinesAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
                             EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
 

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -28,6 +27,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -37,7 +37,8 @@ public class ChangeVisualLinesEndAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       if (range.isMultiple()) {
         int[] starts = range.getStartOffsets();
         int[] ends = range.getEndOffsets();

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class FilterCountLinesAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       CommandGroups.getInstance().getProcess().startFilterCommand(editor, context, cmd);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
@@ -28,6 +27,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.group.MotionGroup;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -37,7 +37,7 @@ public class FilterMotionAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       TextRange range = MotionGroup.getMotionRange(editor, context, cmd.getCount(), cmd.getRawCount(),
                                                    cmd.getArgument(), false, false);
       if (range == null) {

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.change;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.change;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.change;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class FilterVisualLinesAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       CommandGroups.getInstance().getProcess().startFilterCommand(editor, context, cmd);
       CommandGroups.getInstance().getMotion().resetVisual(editor, true);
 

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class DeleteCharacterAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().deleteCharacter(editor, context, 1);
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+      return CommandGroups.getInstance().getChange().deleteCharacter(editor, 1, false);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class DeleteCharacterLeftAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().deleteCharacter(editor, context, -count);
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+      return CommandGroups.getInstance().getChange().deleteCharacter(editor, -count, false);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class DeleteCharacterRightAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().deleteCharacter(editor, context, count);
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+      return CommandGroups.getInstance().getChange().deleteCharacter(editor, count, false);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class DeleteEndOfLineAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().deleteEndOfLine(editor, context, count);
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+      return CommandGroups.getInstance().getChange().deleteEndOfLine(editor, count);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,12 +34,12 @@ public class DeleteJoinLinesAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
       if (editor.isOneLineMode()) {
         return false;
       }
 
-      return CommandGroups.getInstance().getChange().deleteJoinLines(editor, context, count, false);
+      return CommandGroups.getInstance().getChange().deleteJoinLines(editor, count, false);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,12 +34,12 @@ public class DeleteJoinLinesSpacesAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
       if (editor.isOneLineMode()) {
         return false;
       }
 
-      return CommandGroups.getInstance().getChange().deleteJoinLines(editor, context, count, true);
+      return CommandGroups.getInstance().getChange().deleteJoinLines(editor, count, true);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,12 +35,13 @@ public class DeleteJoinVisualLinesAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       if (editor.isOneLineMode()) {
         return false;
       }
 
-      return CommandGroups.getInstance().getChange().deleteJoinRange(editor, context, range, false);
+      return CommandGroups.getInstance().getChange().deleteJoinRange(editor, range, false);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,12 +35,13 @@ public class DeleteJoinVisualLinesSpacesAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       if (editor.isOneLineMode()) {
         return false;
       }
 
-      return CommandGroups.getInstance().getChange().deleteJoinRange(editor, context, range, true);
+      return CommandGroups.getInstance().getChange().deleteJoinRange(editor, range, true);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class DeleteLineAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      return CommandGroups.getInstance().getChange().deleteLine(editor, context, count);
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+      return CommandGroups.getInstance().getChange().deleteLine(editor, count);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class DeleteMotionAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, DataContext context, int count, int rawCount, @NotNull Argument argument) {
       return CommandGroups.getInstance().getChange().deleteMotion(editor, context, count, rawCount, argument, false);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -29,6 +28,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -38,15 +38,16 @@ public class DeleteVisualAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       CommandState.SubMode mode = CommandState.getInstance(editor).getSubMode();
       if (mode == CommandState.SubMode.VISUAL_LINE) {
         range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
                               EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
       }
 
-      return CommandGroups.getInstance().getChange().deleteRange(editor, context, range,
-                                                                 SelectionType.fromSubMode(mode));
+      return CommandGroups.getInstance().getChange().deleteRange(editor, range,
+                                                                 SelectionType.fromSubMode(mode), false);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -29,6 +28,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -38,17 +38,18 @@ public class DeleteVisualLinesAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       CommandState.SubMode mode = CommandState.getInstance(editor).getSubMode();
       if (mode == CommandState.SubMode.VISUAL_BLOCK) {
-        return CommandGroups.getInstance().getChange().deleteRange(editor, context, range,
-                                                                   SelectionType.fromSubMode(mode));
+        return CommandGroups.getInstance().getChange().deleteRange(editor, range,
+                                                                   SelectionType.fromSubMode(mode), false);
       }
       else {
         range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
                               EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
 
-        return CommandGroups.getInstance().getChange().deleteRange(editor, context, range, SelectionType.LINE_WISE);
+        return CommandGroups.getInstance().getChange().deleteRange(editor, range, SelectionType.LINE_WISE, false);
       }
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.delete;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.delete;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.delete;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -28,6 +27,7 @@ import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
 import com.maddyhome.idea.vim.helper.EditorHelper;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -37,7 +37,8 @@ public class DeleteVisualLinesEndAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       if (range.isMultiple()) {
         int[] starts = range.getStartOffsets();
         int[] ends = range.getEndOffsets();
@@ -48,15 +49,15 @@ public class DeleteVisualLinesEndAction extends EditorAction {
         }
 
         range = new TextRange(starts, ends);
-        return CommandGroups.getInstance().getChange().deleteRange(editor, context, range,
-                                                                   SelectionType.BLOCK_WISE);
+        return CommandGroups.getInstance().getChange().deleteRange(editor, range,
+                                                                   SelectionType.BLOCK_WISE, false);
       }
       else {
         range = new TextRange(EditorHelper.getLineStartForOffset(editor, range.getStartOffset()),
                               EditorHelper.getLineEndForOffset(editor, range.getEndOffset()) + 1);
 
-        return CommandGroups.getInstance().getChange().deleteRange(editor, context, range,
-                                                                   SelectionType.LINE_WISE);
+        return CommandGroups.getInstance().getChange().deleteRange(editor, range,
+                                                                   SelectionType.LINE_WISE, false);
       }
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertAfterCursorAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       CommandGroups.getInstance().getChange().insertAfterCursor(editor, context);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertAfterLineEndAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       CommandGroups.getInstance().getChange().insertAfterLineEnd(editor, context);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertAtPreviousInsertAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       CommandGroups.getInstance().getChange().insertAtPreviousInsert(editor, context);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertBeforeCursorAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       CommandGroups.getInstance().getChange().insertBeforeCursor(editor, context);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertBeforeFirstNonBlankAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       CommandGroups.getInstance().getChange().insertBeforeFirstNonBlank(editor, context);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertCharacterAboveCursorAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       if (editor.isOneLineMode()) {
         return false;
       }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertCharacterBelowCursorAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       if (editor.isOneLineMode()) {
         return false;
       }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class InsertDeleteInsertedTextAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, Command cmd) {
-      return CommandGroups.getInstance().getChange().insertDeleteInsertedText(editor, context);
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
+      return CommandGroups.getInstance().getChange().insertDeleteInsertedText(editor);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class InsertDeletePreviousWordAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, Command cmd) {
-      return CommandGroups.getInstance().getChange().insertDeletePreviousWord(editor, context);
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
+      return CommandGroups.getInstance().getChange().insertDeletePreviousWord(editor);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.maddyhome.idea.vim.group.CommandGroups;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,13 +34,8 @@ public class InsertEnterAction extends EditorAction {
   }
 
   private static class Handler extends EditorActionHandler {
-    public void execute(Editor editor, DataContext context) {
-      editor = InjectedLanguageUtil.getTopLevelEditor(editor);
-      if (editor.isOneLineMode()) {
-        return;
-      }
-
-      CommandGroups.getInstance().getChange().processEnter(editor, context);
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
+      CommandGroups.getInstance().getChange().processEnter(InjectedLanguageUtil.getTopLevelEditor(editor), context);
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.maddyhome.idea.vim.group.CommandGroups;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertExitModeAction extends EditorAction {
   }
 
   private static class Handler extends EditorActionHandler {
-    public void execute(Editor editor, DataContext context) {
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
       CommandGroups.getInstance().getChange().processEscape(InjectedLanguageUtil.getTopLevelEditor(editor), context);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.maddyhome.idea.vim.group.CommandGroups;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertHelpAction extends EditorAction {
   }
 
   private static class Handler extends EditorActionHandler {
-    public void execute(Editor editor, DataContext context) {
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
       CommandGroups.getInstance().getChange().insertHelp(InjectedLanguageUtil.getTopLevelEditor(editor), context);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.maddyhome.idea.vim.group.CommandGroups;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertInsertAction extends EditorAction {
   }
 
   private static class Handler extends EditorActionHandler {
-    public void execute(Editor editor, DataContext context) {
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
       CommandGroups.getInstance().getChange().processInsert(InjectedLanguageUtil.getTopLevelEditor(editor), context);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertLineStartAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       CommandGroups.getInstance().getChange().insertLineStart(editor, context);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertNewLineAboveAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       if (editor.isOneLineMode()) {
         return false;
       }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertNewLineBelowAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       if (editor.isOneLineMode()) {
         return false;
       }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.maddyhome.idea.vim.group.CommandGroups;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertPreviousInsertAction extends EditorAction {
   }
 
   private static class Handler extends EditorActionHandler {
-    public void execute(Editor editor, DataContext context) {
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
       CommandGroups.getInstance().getChange().insertPreviousInsert(InjectedLanguageUtil.getTopLevelEditor(editor), context, false);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.maddyhome.idea.vim.group.CommandGroups;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertPreviousInsertExitAction extends EditorAction {
   }
 
   private static class Handler extends EditorActionHandler {
-    public void execute(Editor editor, DataContext context) {
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
       CommandGroups.getInstance().getChange().insertPreviousInsert(InjectedLanguageUtil.getTopLevelEditor(editor), context, true);
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class InsertRegisterAction extends EditorAction {
   }
 
   private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, Command cmd) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
       return CommandGroups.getInstance().getChange().insertRegister(editor, context, cmd.getArgument().getCharacter());
     }
   }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.maddyhome.idea.vim.group.CommandGroups;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class InsertSingleCommandAction extends EditorAction {
   }
 
   private static class Handler extends EditorActionHandler {
-    public void execute(Editor editor, DataContext context) {
-      CommandGroups.getInstance().getChange().processSingleCommand(InjectedLanguageUtil.getTopLevelEditor(editor), context);
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
+      CommandGroups.getInstance().getChange().processSingleCommand(InjectedLanguageUtil.getTopLevelEditor(editor));
     }
   }
 }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,8 @@ public class VisualBlockAppendAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       if (editor.isOneLineMode()) {
         return false;
       }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.insert;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.insert;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.insert;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,8 @@ public class VisualBlockInsertAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
       if (editor.isOneLineMode()) {
         return false;
       }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.shift;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.shift;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.shift;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,8 +34,8 @@ public class AutoIndentLinesAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
-      CommandGroups.getInstance().getChange().autoIndentLines(editor, context, count);
+    public boolean execute(Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
+      CommandGroups.getInstance().getChange().autoIndentLines(context);
 
       return true;
     }

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.shift;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.shift;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.shift;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ShiftLeftLinesAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       CommandGroups.getInstance().getChange().indentLines(editor, context, count, -1);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.shift;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.shift;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.shift;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ShiftLeftMotionAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, @NotNull Argument argument) {
       CommandGroups.getInstance().getChange().indentMotion(editor, context, count, rawCount, argument, -1);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.shift;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.shift;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.shift;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,7 @@ public class ShiftLeftVisualAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd, @NotNull TextRange range) {
       CommandGroups.getInstance().getChange().indentRange(editor, context, range, cmd.getCount(), -1);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.shift;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.shift;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.shift;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ShiftRightLinesAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       CommandGroups.getInstance().getChange().indentLines(editor, context, count, 1);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.shift;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.change.shift;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.shift;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class ShiftRightMotionAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, @NotNull Argument argument) {
       CommandGroups.getInstance().getChange().indentMotion(editor, context, count, rawCount, argument, 1);
 
       return true;

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

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.change.shift;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,10 +13,11 @@ package com.maddyhome.idea.vim.action.change.shift;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.change.shift;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
@@ -26,6 +25,7 @@ import com.maddyhome.idea.vim.command.Command;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -35,7 +35,7 @@ public class ShiftRightVisualAction extends EditorAction {
   }
 
   private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(Editor editor, DataContext context, Command cmd, TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd, @NotNull TextRange range) {
       CommandGroups.getInstance().getChange().indentRange(editor, context, range, cmd.getCount(), 1);
 
       return true;

src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorAction.java

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.copy;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.copy;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.copy;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class PutTextAfterCursorAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getCopy().putTextAfterCursor(editor, context, count, true, false);
     }
   }

src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorActionMoveCursor.java

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.copy;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.copy;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.copy;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class PutTextAfterCursorActionMoveCursor extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getCopy().putTextAfterCursor(editor, context, count, true, true);
     }
   }

src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorNoIndentAction.java

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.copy;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.copy;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.copy;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class PutTextAfterCursorNoIndentAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getCopy().putTextAfterCursor(editor, context, count, false, false);
     }
   }

src/com/maddyhome/idea/vim/action/copy/PutTextBeforeCursorAction.java

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.copy;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.copy;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.copy;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class PutTextBeforeCursorAction extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getCopy().putTextBeforeCursor(editor, context, count, true, false);
     }
   }

src/com/maddyhome/idea/vim/action/copy/PutTextBeforeCursorActionMoveCursor.java

@@ -1,13 +1,11 @@
-package com.maddyhome.idea.vim.action.copy;
-
 /*
- * IdeaVim - A Vim emulator plugin for IntelliJ Idea
- * Copyright (C) 2003-2005 Rick Maddy
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2013 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 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
@@ -15,16 +13,18 @@ package com.maddyhome.idea.vim.action.copy;
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+package com.maddyhome.idea.vim.action.copy;
+
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.maddyhome.idea.vim.command.Argument;
 import com.maddyhome.idea.vim.group.CommandGroups;
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
+import org.jetbrains.annotations.NotNull;
 
 /**
  */
@@ -34,7 +34,7 @@ public class PutTextBeforeCursorActionMoveCursor extends EditorAction {
   }
 
   private static class Handler extends ChangeEditorActionHandler {
-    public boolean execute(Editor editor, DataContext context, int count, int rawCount, Argument argument) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, int count, int rawCount, Argument argument) {
       return CommandGroups.getInstance().getCopy().putTextBeforeCursor(editor, context, count, true, true);
     }
   }