Implement delete-indentation as a command

README.md

@@ -232,7 +232,7 @@ Alt key is mapped to the Meta prefix (`M`) by default and you can configure for
 | `C-x C-l` (`M-l`)                                |                 | Convert to lower case (On the Emacs' original behavior, `C-x C-l` and `M-l` are assigned to the different functionalities. However, this extension assigns these keys to the same `emacs-mcx.transformToLowercase` command which calls `editor.action.transformToLowercase` command internally and works similarly to both the original Emacs' functionalities based on the context. Upper case and title case (below) are same) |
 | `C-x C-u` (`M-u`)                                |                 | Convert to upper case                                                                                                                                                                                                                                                                                                                                                                                                            |
 | `M-c`                                            |                 | Convert to title case                                                                                                                                                                                                                                                                                                                                                                                                            |
-| `M-S-6` (`M-^` with US keyboard)                 |                 | Merge the previous and the current line (delete-indentation)                                                                                                                                                                                                                                                                                                                                                                     |
+| `M-S-6` (`M-^` with US keyboard)                 |                 | join two lines cleanly (delete-indentation)                                                                                                                                                                                                                                                                                                                                                                                      |
 
 ## Mark Commands
 

keybindings.json

@@ -601,9 +601,8 @@
     },
     {
       "key": "meta+shift+6",
-      "command": "emacs-mcx.executeCommands",
-      "when": "editorTextFocus && !editorReadOnly",
-      "args": ["emacs-mcx.previousLine", "editor.action.joinLines"]
+      "command": "emacs-mcx.deleteIndentation",
+      "when": "editorTextFocus && !editorReadOnly"
     },
     // Cancel
     {

package.json

@@ -3658,40 +3658,24 @@
       },
       {
         "key": "alt+shift+6",
-        "command": "emacs-mcx.executeCommands",
-        "when": "editorTextFocus && !editorReadOnly && !config.emacs-mcx.useMetaPrefixMacCmd",
-        "args": [
-          "emacs-mcx.previousLine",
-          "editor.action.joinLines"
-        ]
+        "command": "emacs-mcx.deleteIndentation",
+        "when": "editorTextFocus && !editorReadOnly && !config.emacs-mcx.useMetaPrefixMacCmd"
       },
       {
         "key": "alt+shift+6",
         "mac": "cmd+shift+6",
-        "command": "emacs-mcx.executeCommands",
-        "when": "editorTextFocus && !editorReadOnly && config.emacs-mcx.useMetaPrefixMacCmd",
-        "args": [
-          "emacs-mcx.previousLine",
-          "editor.action.joinLines"
-        ]
+        "command": "emacs-mcx.deleteIndentation",
+        "when": "editorTextFocus && !editorReadOnly && config.emacs-mcx.useMetaPrefixMacCmd"
       },
       {
         "key": "escape shift+6",
-        "command": "emacs-mcx.executeCommands",
-        "when": "editorTextFocus && !editorReadOnly && config.emacs-mcx.useMetaPrefixEscape",
-        "args": [
-          "emacs-mcx.previousLine",
-          "editor.action.joinLines"
-        ]
+        "command": "emacs-mcx.deleteIndentation",
+        "when": "editorTextFocus && !editorReadOnly && config.emacs-mcx.useMetaPrefixEscape"
       },
       {
         "key": "ctrl+[ shift+6",
-        "command": "emacs-mcx.executeCommands",
-        "when": "editorTextFocus && !editorReadOnly && config.emacs-mcx.useMetaPrefixCtrlLeftBracket",
-        "args": [
-          "emacs-mcx.previousLine",
-          "editor.action.joinLines"
-        ]
+        "command": "emacs-mcx.deleteIndentation",
+        "when": "editorTextFocus && !editorReadOnly && config.emacs-mcx.useMetaPrefixCtrlLeftBracket"
       },
       {
         "key": "escape",

src/commands/indent.ts

@@ -0,0 +1,12 @@
+import * as vscode from "vscode";
+import { TextEditor } from "vscode";
+import { EmacsCommand } from ".";
+
+export class DeleteIndentation extends EmacsCommand {
+  public readonly id = "deleteIndentation";
+
+  public async run(textEditor: TextEditor, isInMarkMode: boolean, prefixArgument: number | undefined): Promise<void> {
+    await this.emacsController.runCommand("previousLine");
+    await vscode.commands.executeCommand("editor.action.joinLines");
+  }
+}

src/emulator.ts

@@ -4,7 +4,8 @@
 import * as CaseCommands from "./commands/case";
 import { DeleteBlankLines } from "./commands/delete-blank-lines";
 import * as EditCommands from "./commands/edit";
-import * as IndentCommands from "./commands/tab";
+import * as TabCommands from "./commands/tab";
+import * as IndentCommands from "./commands/indent";
 import * as FindCommands from "./commands/find";
 import * as KillCommands from "./commands/kill";
 import * as MoveCommands from "./commands/move";
@@ -165,7 +166,9 @@
     this.commandRegistry.register(new DeleteBlankLines(this));
     this.commandRegistry.register(new RecenterTopBottom(this));
 
-    this.commandRegistry.register(new IndentCommands.TabToTabStop(this));
+    this.commandRegistry.register(new TabCommands.TabToTabStop(this));
+
+    this.commandRegistry.register(new IndentCommands.DeleteIndentation(this));
 
     const searchState: FindCommands.SearchState = {
       startSelections: undefined,
@@ -575,7 +578,7 @@
 
   public executeCommandWithPrefixArgument<T>(
     command: string,
     args: any = null,
     prefixArgumentKey = "prefixArgument",
   ): Thenable<T | undefined> {
     const prefixArgument = this.prefixArgumentHandler.getPrefixArgument();

src/extension.ts

@@ -83,7 +83,7 @@
 
   function registerEmulatorCommand(
     commandName: string,
     callback: (emulator: EmacsEmulator, ...args: Unreliable<any>[]) => unknown,
     onNoEmulator?: (...args: unknown[]) => unknown,
   ) {
     const disposable = vscode.commands.registerCommand(commandName, (...args) => {
@@ -335,6 +335,10 @@
     emulator.runCommand("tabToTabStop");
   });
 
+  registerEmulatorCommand("emacs-mcx.deleteIndentation", (emulator) => {
+    emulator.runCommand("deleteIndentation");
+  });
+
   registerEmulatorCommand("emacs-mcx.paredit.forwardSexp", (emulator) => {
     emulator.runCommand("paredit.forwardSexp");
   });
@@ -397,7 +401,7 @@
     return emulator.insertRegister(arg);
   });
 
   vscode.commands.registerCommand("emacs-mcx.executeCommands", async (...args: any[]) => {
     if (1 <= args.length) {
       executeCommands(args[0]);
     }

src/test/suite/commands/indent.test.ts

@@ -0,0 +1,25 @@
+import * as vscode from "vscode";
+import { EmacsEmulator } from "../../../emulator";
+import { assertTextEqual, cleanUpWorkspace, setEmptyCursors, assertCursorsEqual, setupWorkspace } from "../utils";
+
+suite("DeleteIndentation", () => {
+  let activeTextEditor: vscode.TextEditor;
+  let emulator: EmacsEmulator;
+
+  const initialText = "0123456789\nabcdefghij\nABCDEFGHIJ";
+
+  setup(async () => {
+    activeTextEditor = await setupWorkspace(initialText, { language: "javascript" });
+    activeTextEditor.options.tabSize = 2;
+    emulator = new EmacsEmulator(activeTextEditor);
+  });
+
+  teardown(cleanUpWorkspace);
+
+  test("merge the current line with the previous line", async () => {
+    setEmptyCursors(activeTextEditor, [1, 2]);
+    await emulator.runCommand("deleteIndentation");
+    assertTextEqual(activeTextEditor, "0123456789 abcdefghij\nABCDEFGHIJ");
+    assertCursorsEqual(activeTextEditor, [0, 10]);
+  });
+});