Bumped version

New URL for the plugin page
More release notes
2025-08-17 16:31:45 +02:00 · 2013-11-11 15:36:03 +04:00 · 2013-11-08 18:18:38 +04:00 · 2013-11-08 18:17:11 +04:00 · 2013-11-08 18:11:15 +04:00 · 2013-11-08 17:56:58 +04:00
434 changed files with 5533 additions and 6191 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,8 +4,29 @@ The Changelog
 History of changes in IdeaVim for the IntelliJ platform.


-0.29, TBD
---------
+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.

--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ 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


@@ -68,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
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version-id:0.29
+version-id:0.30
 platform-version:110.0
 idea.download.url=http://download.jetbrains.com/idea/ideaIU-12.1.zip
 build.number=x
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -1,8 +1,14 @@
-<idea-plugin url="http://plugins.intellij.net/plugin/?id=164">
+<idea-plugin url="http://plugins.jetbrains.com/plugin/164">
  <name>IdeaVim</name>
  <id>IdeaVIM</id>
  <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>
@@ -347,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"/>
--- a/src/com/maddyhome/idea/vim/KeyHandler.java
+++ b/src/com/maddyhome/idea/vim/KeyHandler.java
@@ -1,30 +1,29 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
          }
@@ -218,45 +206,43 @@ public class KeyHandler {
    }
  }

-  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) {
-        KeyHandler.executeAction("VimEditorEscape", context);
-        //getOriginalHandler().execute(editor, key.getKeyChar(), context);
+        CommandProcessor.getInstance().executeCommand(editor.getProject(), new Runnable() {
+          @Override
+          public void run() {
+            KeyHandler.executeAction("VimEditorEscape", context);
+          }
+        }, "", null);
      }
      VimPlugin.indicateError();
    }
-
-      reset(editor);
-    }
+    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 &&
-             key.getKeyCode() == KeyEvent.VK_DELETE && count != 0;
+    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 &&
-             Character.isDigit(chKey) &&
-             (count != 0 || chKey != '0');
+    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');
  }

  private boolean isEditorReset(@NotNull KeyStroke key, @NotNull CommandState editorState) {
    return (editorState.getMode() == CommandState.Mode.COMMAND || state == State.COMMAND) &&
-        (key.getKeyCode() == KeyEvent.VK_ESCAPE ||
-         (key.getKeyCode() == KeyEvent.VK_C && (key.getModifiers() & KeyEvent.CTRL_MASK) != 0) ||
-         (key.getKeyCode() == '[' && (key.getModifiers() & KeyEvent.CTRL_MASK) != 0));
+           (key.getKeyCode() == KeyEvent.VK_ESCAPE ||
+            (key.getKeyCode() == KeyEvent.VK_C && (key.getModifiers() & KeyEvent.CTRL_MASK) != 0) ||
+            (key.getKeyCode() == '[' && (key.getModifiers() & KeyEvent.CTRL_MASK) != 0));
  }

  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,23 +312,19 @@ 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.
-      int cnt = cmd.getRawCount() == 0 && mot.getRawCount() == 0 ? 0 : cmd.getCount() * mot.getCount();
+      if (mot != null) {
+        int cnt = cmd.getRawCount() == 0 && mot.getRawCount() == 0 ? 0 : cmd.getCount() * mot.getCount();
+        mot.setCount(cnt);
+      }
      cmd.setCount(0);
-      mot.setCount(cnt);
    }

    // If we were in "operator pending" mode, reset back to normal mode.
@@ -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;
@@ -506,15 +480,11 @@ public class KeyHandler {
   * @param context The context to run it in
   */
  public static void executeAction(@NotNull String name, @NotNull DataContext context) {
-    logger.debug("executing action " + name);
    ActionManager aMgr = ActionManager.getInstance();
    AnAction action = aMgr.getAction(name);
    if (action != null) {
      executeAction(action, context);
    }
-    else {
-      logger.debug("Unknown action");
-    }
  }

  /**
@@ -524,22 +494,15 @@ public class KeyHandler {
   * @param context The context to run it in
   */
  public static void executeAction(@NotNull AnAction action, @NotNull DataContext context) {
-    if (logger.isDebugEnabled()) {
-      logger.debug("executing action " + action);
-    }
-
    // Hopefully all the arguments are sufficient. So far they all seem to work OK.
    // We don't have a specific InputEvent so that is null
    // What is "place"? Leave it the empty string for now.
    // Is the template presentation sufficient?
    // What are the modifiers? Is zero OK?
-    action.actionPerformed(new AnActionEvent(
-      null,
-      context,
-      "",
-      action.getTemplatePresentation(),
-      ActionManager.getInstance(), // API change - don't merge
-      0));
+    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,8 +563,7 @@ public class KeyHandler {
      boolean wasRecording = editorState.isRecording();

      executeAction(cmd.getAction(), context);
-      if (editorState.getMode() == CommandState.Mode.INSERT ||
-          editorState.getMode() == CommandState.Mode.REPLACE) {
+      if (editorState.getMode() == CommandState.Mode.INSERT || editorState.getMode() == CommandState.Mode.REPLACE) {
        CommandGroups.getInstance().getChange().processCommand(editor, cmd);
      }

@@ -656,5 +616,4 @@ public class KeyHandler {
  private boolean lastWasBS;

  private static KeyHandler instance;
-  private static Logger logger = Logger.getInstance(KeyHandler.class.getName());
 }
--- a/src/com/maddyhome/idea/vim/key/RegisterActions.java
+++ b/src/com/maddyhome/idea/vim/key/RegisterActions.java
--- a/src/com/maddyhome/idea/vim/VimKeyMapUtil.java
+++ b/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;
--- a/src/com/maddyhome/idea/vim/VimKeymapConflictResolveUtil.java
+++ b/src/com/maddyhome/idea/vim/VimKeymapConflictResolveUtil.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.collect.ImmutableList;
--- a/src/com/maddyhome/idea/vim/VimPlugin.java
+++ b/src/com/maddyhome/idea/vim/VimPlugin.java
@@ -1,17 +1,19 @@
 /*
- * 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;

@@ -48,7 +50,6 @@ 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.*;
-import com.maddyhome.idea.vim.key.RegisterActions;
 import com.maddyhome.idea.vim.option.Options;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
@@ -58,7 +59,7 @@ 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/>
@@ -88,7 +89,6 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent
  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;
@@ -159,7 +159,11 @@ 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");
  }
@@ -355,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()) {
@@ -372,9 +376,9 @@ public class VimPlugin implements ApplicationComponent, PersistentStateComponent

  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("");
@@ -427,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;
  }
--- a/src/com/maddyhome/idea/vim/VimPluginToggleAction.java
+++ b/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;
--- a/src/com/maddyhome/idea/vim/VimReconfigureKeymapAction.java
+++ b/src/com/maddyhome/idea/vim/VimReconfigureKeymapAction.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.AnAction;
--- a/src/com/maddyhome/idea/vim/VimSettings.java
+++ b/src/com/maddyhome/idea/vim/VimSettings.java
@@ -1,80 +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 org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-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(@Nullable 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;
-  }
-
-  @NotNull
-  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();
-}
--- a/src/com/maddyhome/idea/vim/VimTypedActionHandler.java
+++ b/src/com/maddyhome/idea/vim/VimTypedActionHandler.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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,12 +74,18 @@ public class VimTypedActionHandler implements TypedActionHandler {
      return;
    }

-    try {
-      handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), context);
-    }
-    catch (Throwable e) {
-      logger.error(e);
-    }
+    // Run key handler outside of the key typed command for creating our own undoable commands
+    SwingUtilities.invokeLater(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          handler.handleKey(editor, KeyStroke.getKeyStroke(charTyped), context);
+        }
+        catch (Throwable e) {
+          logger.error(e);
+        }
+      }
+    });
  }

  private TypedActionHandler origHandler;
--- a/src/com/maddyhome/idea/vim/action/AbstractDelegateAction.java
+++ b/src/com/maddyhome/idea/vim/action/AbstractDelegateAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/AbstractDelegateEditorAction.java
+++ b/src/com/maddyhome/idea/vim/action/AbstractDelegateEditorAction.java
@@ -1,23 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/DelegateAction.java
+++ b/src/com/maddyhome/idea/vim/action/DelegateAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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 {
--- a/src/com/maddyhome/idea/vim/action/ExEntryAction.java
+++ b/src/com/maddyhome/idea/vim/action/ExEntryAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,7 @@ public class ExEntryAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, @NotNull Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
      CommandGroups.getInstance().getProcess().startExCommand(editor, context, cmd);

      return true;
--- a/src/com/maddyhome/idea/vim/action/OriginalDelegateAction.java
+++ b/src/com/maddyhome/idea/vim/action/OriginalDelegateAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/PassThruDelegateAction.java
+++ b/src/com/maddyhome/idea/vim/action/PassThruDelegateAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/PassThruDelegateEditorAction.java
+++ b/src/com/maddyhome/idea/vim/action/PassThruDelegateEditorAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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 {
--- a/src/com/maddyhome/idea/vim/action/ResetModeAction.java
+++ b/src/com/maddyhome/idea/vim/action/ResetModeAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;

--- a/src/com/maddyhome/idea/vim/action/TxActionWrapper.java
+++ b/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());
-}
--- a/src/com/maddyhome/idea/vim/action/change/RedoAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/RedoAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class RedoAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, @NotNull DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
      return UndoRedoHelper.redo(context);
    }
  }
--- a/src/com/maddyhome/idea/vim/action/change/RepeatChangeAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/RepeatChangeAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -39,7 +38,7 @@ public class RepeatChangeAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(Editor editor, @NotNull DataContext context, @NotNull 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) {
@@ -65,7 +64,9 @@ public class RepeatChangeAction extends EditorAction {
          // oops
        }
        state.popState();
-        state.setCommand(save);
+        if (save != null) {
+          state.setCommand(save);
+        }
        state.saveLastChangeCommand(cmd);
        CommandGroups.getInstance().getRegister().selectRegister(reg);

--- a/src/com/maddyhome/idea/vim/action/change/RepeatExCommandAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/RepeatExCommandAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,7 @@ public class RepeatExCommandAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(@NotNull Editor editor, DataContext context, @NotNull 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);
--- a/src/com/maddyhome/idea/vim/action/change/UndoAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/UndoAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class UndoAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(Editor editor, @NotNull DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
      return UndoRedoHelper.undo(context);
    }
  }
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerMotionAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerMotionAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerVisualAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerVisualAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -38,7 +37,8 @@ public class ChangeCaseLowerVisualAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, Command cmd, TextRange range) {
+    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);
    }
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleCharacterAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleCharacterAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleMotionAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleMotionAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleVisualAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleVisualAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -37,7 +36,8 @@ public class ChangeCaseToggleVisualAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, Command cmd, TextRange range) {
+    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);
    }
  }
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperMotionAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperMotionAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperVisualAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperVisualAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -37,7 +36,8 @@ public class ChangeCaseUpperVisualAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, Command cmd, TextRange range) {
+    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);
    }
  }
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCharacterAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCharacterAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeCharactersAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeCharactersAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeEndOfLineAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeEndOfLineAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeLastGlobalSearchReplaceAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeLastGlobalSearchReplaceAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeLastSearchReplaceAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeLastSearchReplaceAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeMotionAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeMotionAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeNumberDecAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeNumberDecAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeNumberIncAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeNumberIncAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeReplaceAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeReplaceAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -37,7 +36,8 @@ public class ChangeVisualAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, Command cmd, @NotNull 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);
    }
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualCharacterAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualCharacterAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,7 @@ public class ChangeVisualCharacterAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, @NotNull Command cmd, @NotNull TextRange 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());
    }
--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -38,7 +37,8 @@ public class ChangeVisualLinesAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull 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);

--- a/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesEndAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesEndAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -38,7 +37,8 @@ public class ChangeVisualLinesEndAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, Command cmd, @NotNull 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();
--- a/src/com/maddyhome/idea/vim/action/change/change/FilterCountLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/FilterCountLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class FilterCountLinesAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, @NotNull Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
      CommandGroups.getInstance().getProcess().startFilterCommand(editor, context, cmd);

      return true;
--- a/src/com/maddyhome/idea/vim/action/change/change/FilterMotionAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/FilterMotionAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -38,7 +37,7 @@ public class FilterMotionAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, @NotNull 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) {
--- a/src/com/maddyhome/idea/vim/action/change/change/FilterVisualLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/change/FilterVisualLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class FilterVisualLinesAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, @NotNull 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);

--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterLeftAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterLeftAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterRightAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterRightAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteEndOfLineAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteEndOfLineAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesSpacesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesSpacesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,8 @@ public class DeleteJoinVisualLinesAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, Command cmd, @NotNull TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
      if (editor.isOneLineMode()) {
        return false;
      }
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesSpacesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesSpacesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,8 @@ public class DeleteJoinVisualLinesSpacesAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, Command cmd, @NotNull TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
      if (editor.isOneLineMode()) {
        return false;
      }
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteLineAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteLineAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteMotionAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteMotionAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -39,7 +38,8 @@ public class DeleteVisualAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull 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()),
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -39,7 +38,8 @@ public class DeleteVisualLinesAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull 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, range,
--- a/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesEndAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesEndAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -38,7 +37,8 @@ public class DeleteVisualLinesEndAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, DataContext context, Command cmd, @NotNull 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();
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertAfterCursorAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertAfterCursorAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertAfterLineEndAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertAfterLineEndAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertAtPreviousInsertAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertAtPreviousInsertAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertBeforeCursorAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertBeforeCursorAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertBeforeFirstNonBlankAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertBeforeFirstNonBlankAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertCharacterAboveCursorAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertCharacterAboveCursorAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class InsertCharacterAboveCursorAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
      if (editor.isOneLineMode()) {
        return false;
      }
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertCharacterBelowCursorAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertCharacterBelowCursorAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class InsertCharacterBelowCursorAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, Command cmd) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
      if (editor.isOneLineMode()) {
        return false;
      }
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertDeleteInsertedTextAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertDeleteInsertedTextAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class InsertDeleteInsertedTextAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(@NotNull Editor editor, DataContext context, Command cmd) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
      return CommandGroups.getInstance().getChange().insertDeleteInsertedText(editor);
    }
  }
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertDeletePreviousWordAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertDeletePreviousWordAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class InsertDeletePreviousWordAction extends EditorAction {
  }

  private static class Handler extends AbstractEditorActionHandler {
-    public boolean execute(@NotNull Editor editor, DataContext context, Command cmd) {
+    public boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd) {
      return CommandGroups.getInstance().getChange().insertDeletePreviousWord(editor);
    }
  }
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertEnterAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertEnterAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class InsertEnterAction extends EditorAction {
  }

  private static class Handler extends EditorActionHandler {
-    public void execute(Editor editor, @NotNull DataContext context) {
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
      CommandGroups.getInstance().getChange().processEnter(InjectedLanguageUtil.getTopLevelEditor(editor), context);
    }
  }
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertExitModeAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertExitModeAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertHelpAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertHelpAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertInsertAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertInsertAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertLineStartAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertLineStartAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertNewLineAboveAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertNewLineAboveAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertNewLineBelowAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertNewLineBelowAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertExitAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertExitAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertRegisterAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertRegisterAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/insert/InsertSingleCommandAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/InsertSingleCommandAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -35,7 +34,7 @@ public class InsertSingleCommandAction extends EditorAction {
  }

  private static class Handler extends EditorActionHandler {
-    public void execute(@NotNull Editor editor, DataContext context) {
+    public void execute(@NotNull Editor editor, @NotNull DataContext context) {
      CommandGroups.getInstance().getChange().processSingleCommand(InjectedLanguageUtil.getTopLevelEditor(editor));
    }
  }
--- a/src/com/maddyhome/idea/vim/action/change/insert/VisualBlockAppendAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/VisualBlockAppendAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,8 @@ public class VisualBlockAppendAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, Command cmd, @NotNull TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
      if (editor.isOneLineMode()) {
        return false;
      }
--- a/src/com/maddyhome/idea/vim/action/change/insert/VisualBlockInsertAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/insert/VisualBlockInsertAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,8 @@ public class VisualBlockInsertAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, Command cmd, @NotNull TextRange range) {
+    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
+                              @NotNull TextRange range) {
      if (editor.isOneLineMode()) {
        return false;
      }
--- a/src/com/maddyhome/idea/vim/action/change/shift/AutoIndentLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/shift/AutoIndentLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/shift/ShiftLeftLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/shift/ShiftLeftLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/shift/ShiftLeftMotionAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/shift/ShiftLeftMotionAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/shift/ShiftLeftVisualAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/shift/ShiftLeftVisualAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,7 @@ public class ShiftLeftVisualAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull 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;
--- a/src/com/maddyhome/idea/vim/action/change/shift/ShiftRightLinesAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/shift/ShiftRightLinesAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/shift/ShiftRightMotionAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/shift/ShiftRightMotionAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/change/shift/ShiftRightVisualAction.java
+++ b/src/com/maddyhome/idea/vim/action/change/shift/ShiftRightVisualAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
@@ -36,7 +35,7 @@ public class ShiftRightVisualAction extends EditorAction {
  }

  private static class Handler extends VisualOperatorActionHandler {
-    protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull 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;
--- a/src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorAction.java
+++ b/src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorActionMoveCursor.java
+++ b/src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorActionMoveCursor.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorNoIndentAction.java
+++ b/src/com/maddyhome/idea/vim/action/copy/PutTextAfterCursorNoIndentAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/copy/PutTextBeforeCursorAction.java
+++ b/src/com/maddyhome/idea/vim/action/copy/PutTextBeforeCursorAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/copy/PutTextBeforeCursorActionMoveCursor.java
+++ b/src/com/maddyhome/idea/vim/action/copy/PutTextBeforeCursorActionMoveCursor.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/copy/PutTextBeforeCursorNoIndentAction.java
+++ b/src/com/maddyhome/idea/vim/action/copy/PutTextBeforeCursorNoIndentAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/copy/PutVisualTextAction.java
+++ b/src/com/maddyhome/idea/vim/action/copy/PutVisualTextAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/src/com/maddyhome/idea/vim/action/copy/PutVisualTextMoveCursorAction.java
+++ b/src/com/maddyhome/idea/vim/action/copy/PutVisualTextMoveCursorAction.java
@@ -1,24 +1,23 @@
-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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ * 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;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrey Vlasovskikh	43e9469546	Bumped version	2013-11-11 15:36:03 +04:00
Andrey Vlasovskikh	23bb0679dd	New URL for the plugin page	2013-11-08 18:18:38 +04:00
Andrey Vlasovskikh	04c41414da	More release notes	2013-11-08 18:17:11 +04:00
Andrey Vlasovskikh	3490d83ce6	Draft of release notes for 0.30	2013-11-08 18:11:15 +04:00
Andrey Vlasovskikh	13fc780287	Remove editor selection after undo	2013-11-08 17:56:58 +04:00
Andrey Vlasovskikh	f0c234a5de	Nullability annotations for 'cmd' parameter of execute() methods	2013-11-08 17:44:19 +04:00
Andrey Vlasovskikh	7f8050e645	Removed unused argument	2013-11-08 17:31:48 +04:00
Andrey Vlasovskikh	e8b27724c9	Nullability annotations for execute() methods of action handlers	2013-11-08 17:07:13 +04:00
Andrey Vlasovskikh	327cd2c524	EA-43519 Fixed IOOBE: EditorImpl.offsetToLogicalLine	2013-11-08 15:52:22 +04:00
Andrey Vlasovskikh	1366e859be	Removed a note about <Esc> in completion windows	2013-11-07 20:43:35 +04:00
Andrey Vlasovskikh	17b779b494	Launch Vim action handler for <Esc> in completion windows (VIM-193)	2013-11-07 20:33:59 +04:00
Andrey Vlasovskikh	7e30b7c7a7	Merge branch 'warning-removal'	2013-09-17 00:18:34 +04:00
Andrey Vlasovskikh	b1b8c49c43	Removed unnecessary generate actions override	2013-08-31 16:14:21 +04:00
Andrey Vlasovskikh	876c35c212	Removed old unused undo classes	2013-08-30 16:48:24 +04:00
Andrey Vlasovskikh	e758e3d457	Removed unused VimSettings	2013-08-30 16:45:42 +04:00
Andrey Vlasovskikh	91e7bfce1d	Fixed setting command count	2013-08-30 16:39:56 +04:00
Andrey Vlasovskikh	2e6c53fb52	Typos	2013-08-30 16:04:34 +04:00
Andrey Vlasovskikh	510edeb9a6	Reformat code	2013-08-30 16:03:11 +04:00
Andrey Vlasovskikh	8566e7bf46	Fixed potential NPE	2013-08-30 15:57:38 +04:00
Andrey Vlasovskikh	7dfea2feb6	Removed unused parameter	2013-08-30 15:52:13 +04:00
Andrey Vlasovskikh	fcb9de1930	@Nullable	2013-08-30 15:51:51 +04:00
Andrey Vlasovskikh	2c7a3b877c	Argument is always true	2013-08-30 15:47:37 +04:00
Andrey Vlasovskikh	e4ae7f8566	Removed unnecessary logger	2013-08-30 15:45:46 +04:00
Andrey Vlasovskikh	94f8544dfa	Removed unnecessary Ascii class	2013-08-30 15:42:08 +04:00
Andrey Vlasovskikh	0159155e1c	Removed unused ErrorHandler class	2013-08-30 15:41:21 +04:00
Andrey Vlasovskikh	b45e32dd3f	Cleanup	2013-08-12 19:40:44 +04:00
Andrey Vlasovskikh	f3d66b3356	VIM-551 Argument of ':put' is optional	2013-08-12 19:39:59 +04:00
Andrey Vlasovskikh	f21190cb24	VIM-550 ':put' creates a new line	2013-08-12 19:38:33 +04:00
Andrey Vlasovskikh	9554eb0990	Extracted VimTestCase.typeText()	2013-08-12 18:40:51 +04:00
Andrey Vlasovskikh	9c04525df8	Extracted VimTestCase.runExCommand()	2013-08-12 18:26:52 +04:00
Andrey Vlasovskikh	26555c6ad6	VIM-425 Read config from .ideavimrc if available	2013-08-12 17:56:32 +04:00
Andrey Vlasovskikh	d6ee29dc91	Refactored Options.loadVimrc()	2013-08-12 17:54:26 +04:00
Andrey Vlasovskikh	e6dacd0b84	Cleanup	2013-08-12 17:38:11 +04:00
Andrey Vlasovskikh	acf75ad080	Cleanup	2013-08-12 17:01:38 +04:00
Andrey Vlasovskikh	92067b2577	VIM-440 Fixed ':e' open file dialog	2013-08-12 16:59:43 +04:00
Andrey Vlasovskikh	24f197ce99	Use SwingUtilities.invokeLater() for consistency	2013-08-12 16:52:33 +04:00
Andrey Vlasovskikh	39cc7db50b	Typos	2013-08-09 00:47:05 +04:00
Andrey Vlasovskikh	510a6d12a7	Replace StringBuffer with concatenation	2013-08-09 00:44:25 +04:00
Andrey Vlasovskikh	cb8c1ea4b5	Fixed possible NPE	2013-08-09 00:43:27 +04:00
Andrey Vlasovskikh	3284102dde	Specify size in toArray()	2013-08-09 00:40:50 +04:00
Andrey Vlasovskikh	4a5457ad49	Removed unused method	2013-08-09 00:40:21 +04:00
Andrey Vlasovskikh	39ed9265d7	Converted a RegisterActions class instance into a function	2013-08-09 00:30:52 +04:00
Andrey Vlasovskikh	2fc721f220	Typo	2013-08-09 00:19:20 +04:00
Andrey Vlasovskikh	28c658810f	Split RegisterActions constructor into several methods	2013-08-09 00:18:08 +04:00
Andrey Vlasovskikh	2f2ecc252e	Updated copyright years in sources	2013-08-09 00:06:38 +04:00
Andrey Vlasovskikh	9f2613c56a	Moved RegisterActions to the root IdeaVim package This class is an entry point to nearly all Vim actions, so it should be easier to discover.	2013-08-08 23:47:00 +04:00
Andrey Vlasovskikh	a58929d4fb	Added forgotten release date for 0.29	2013-08-08 21:12:41 +04:00
Andrey Vlasovskikh	fa13be1e15	Updated link to build server	2013-08-08 21:11:20 +04:00
Andrey Vlasovskikh	7a4d900b06	VIM-98 Invoke actions in separate commands for better Undo/Redo Vim actions used to be invoked inside a key typing command and didn't have their own commands. Now they've got separate commands with unique group IDs in order to stop them from being merged into combined Undo/Redo steps. The Undo/Redo behaviour still differs from Vim: typing in a single Insert mode session is split into several Undo chunks depending on timing. An Undo step may require one more Undo step for moving the cursor to its position before Undo.	2013-08-08 20:56:28 +04:00