<C-r> <C-w> (insert word under cursor) in search/commmand line

Fixes VSCodeVim#4102

src/actions/commands/actions.ts

@@ -422,6 +422,29 @@ class CommandInsertRegisterContentInSearchMode extends BaseCommand {
   }
 }
 
+@RegisterAction
+class CommandInsertWord extends BaseCommand {
+  modes = [ModeName.CommandlineInProgress, ModeName.SearchInProgressMode];
+  keys = ['<C-r>', '<C-w>'];
+
+  public async exec(position: Position, vimState: VimState): Promise<VimState> {
+    const word = TextEditor.getWord(position);
+
+    if (word !== undefined) {
+      if (vimState.currentMode === ModeName.SearchInProgressMode) {
+        const searchState = globalState.searchState!;
+        searchState.searchString += word;
+      } else {
+        vimState.currentCommandlineText += word;
+      }
+
+      vimState.statusBarCursorCharacterPos += word.length;
+    }
+
+    return vimState;
+  }
+}
+
 @RegisterAction
 class CommandRecordMacro extends BaseCommand {
   modes = [ModeName.Normal, ModeName.Visual, ModeName.VisualLine];

test/cmd_line/command.test.ts

@@ -155,4 +155,18 @@ suite('cmd_line/search command', () => {
     assert.equal(StatusBar.Get().trim(), ':|');
     await modeHandler.handleKeyEvent('<Esc>');
   });
+
+  test('<C-r> <C-w> insert word under cursor on command line', async () => {
+    await modeHandler.handleMultipleKeyEvents('iabc'.split(''));
+    await modeHandler.handleMultipleKeyEvents(['<Esc>', ':', '<C-r>', '<C-w>']);
+    const statusBar = StatusBar.Get().trim();
+    assert.equal(statusBar, ':abc|', 'Failed to insert word');
+  });
+
+  test('<C-r> <C-w> insert word under cursor in search mode', async () => {
+    await modeHandler.handleMultipleKeyEvents('iabc'.split(''));
+    await modeHandler.handleMultipleKeyEvents(['<Esc>', '/', '<C-r>', '<C-w>']);
+    const statusBar = StatusBar.Get().trim();
+    assert.equal(statusBar, '/abc|', 'Failed to insert word');
+  });
 });