Added focused element type (#17)

Author: AndreasArvidsson

package.json

@@ -37,6 +37,10 @@
 			{
 				"command": "command-server.runCommand",
 				"title": "Read command description from a file and execute the command"
+			},
+			{
+				"command": "command-server.getFocusedElementType",
+				"title": "Returns the type of the currently focused element in vscode"
 			}
 		],
 		"keybindings": [
@@ -49,6 +53,34 @@
 				"command": "command-server.runCommand",
 				"key": "ctrl+shift+alt+p",
 				"mac": "cmd+shift+alt+p"
+			},
+			{
+				"command": "command-server.runCommand",
+				"key": "ctrl+shift+f17",
+				"mac": "cmd+shift+f17",
+				"when": "editorTextFocus",
+				"args": "textEditor"
+			},
+			{
+				"command": "command-server.runCommand",
+				"key": "ctrl+shift+alt+p",
+				"mac": "cmd+shift+alt+p",
+				"when": "editorTextFocus",
+				"args": "textEditor"
+			},
+			{
+				"command": "command-server.runCommand",
+				"key": "ctrl+shift+f17",
+				"mac": "cmd+shift+f17",
+				"when": "terminalFocus",
+				"args": "terminal"
+			},
+			{
+				"command": "command-server.runCommand",
+				"key": "ctrl+shift+alt+p",
+				"mac": "cmd+shift+alt+p",
+				"when": "terminalFocus",
+				"args": "terminal"
 			}
 		],
 		"configuration": {

src/commandRunner.ts

@@ -5,7 +5,7 @@ import * as vscode from "vscode";
 import { readRequest, writeResponse } from "./io";
 import { getResponsePath } from "./paths";
 import { any } from "./regex";
-import { Request, Response } from "./types";
+import { Request } from "./types";
 
 export default class CommandRunner {
   allowRegex!: RegExp;
@@ -53,7 +53,7 @@ export default class CommandRunner {
   async runCommand() {
     const responseFile = await open(getResponsePath(), "wx");
 
-    var request: Request;
+    let request: Request;
 
     try {
       request = await readRequest();
@@ -86,7 +86,7 @@ export default class CommandRunner {
 
       const commandPromise = vscode.commands.executeCommand(commandId, ...args);
 
-      var commandReturnValue = null;
+      let commandReturnValue = null;
 
       if (returnCommandOutput) {
         commandReturnValue = await commandPromise;
@@ -102,7 +102,7 @@ export default class CommandRunner {
       });
     } catch (err) {
       await writeResponse(responseFile, {
-        error: err.message,
+        error: (err as Error).message,
         uuid,
         warnings,
       });

src/extension.ts

@@ -1,22 +1,36 @@
 import * as vscode from "vscode";
 
-import { initializeCommunicationDir } from "./initializeCommunicationDir";
 import CommandRunner from "./commandRunner";
+import { initializeCommunicationDir } from "./initializeCommunicationDir";
 import { getInboundSignal } from "./signal";
+import { FocusedElementType } from "./types";
 
 export function activate(context: vscode.ExtensionContext) {
   initializeCommunicationDir();
 
   const commandRunner = new CommandRunner();
+  let focusedElementType: FocusedElementType | undefined;
 
   context.subscriptions.push(
     vscode.commands.registerCommand(
       "command-server.runCommand",
-      commandRunner.runCommand
+      (focusedElementType_?: FocusedElementType) => {
+        focusedElementType = focusedElementType_;
+        return commandRunner.runCommand();
+      }
+    ),
+    vscode.commands.registerCommand(
+      "command-server.getFocusedElementType",
+      () => focusedElementType ?? null
     )
   );
 
   return {
+    /**
+     * The type of the focused element in vscode at the moment of the command being executed.
+     */
+    getFocusedElementType: () => focusedElementType,
+
     /**
      * These signals can be used as a form of IPC to indicate that an event has
      * occurred.

src/types.ts

@@ -51,3 +51,8 @@ export interface Response {
    */
   warnings: string[];
 }
+
+/**
+ * The type of the focused element in vscode at the moment of the command being executed.
+ */
+export type FocusedElementType = "textEditor" | "terminal";