rename command to run-inferred-block

Author: kylebarron

package.json

@@ -13,14 +13,19 @@
     "Other"
   ],
   "activationEvents": [
-    "onCommand:vscode-jupyter-python.sayHello"
+    "onCommand:vscode-jupyter-python.run-inferred-block",
+    "onCommand:vscode-jupyter-python.run-inferred-block-and-move-down"
   ],
   "main": "./out/extension",
   "contributes": {
     "commands": [
       {
-        "command": "vscode-jupyter-python.sayHello",
-        "title": "Run python code cell"
+        "command": "vscode-jupyter-python.run-inferred-block",
+        "title": "Run inferred code block"
+      },
+      {
+        "command": "vscode-jupyter-python.run-inferred-block-and-move-down",
+        "title": "Run inferred code block and move down"
       }
     ],
     "configuration": {

src/extension.ts

@@ -2,7 +2,10 @@
 // The module 'vscode' contains the VS Code extensibility API
 // Import the module and reference it with the alias vscode in your code below
 import * as vscode from "vscode";
-import { runEntireFile, runInferredCodeBlock } from "./run-code";
+import {
+  runInferredCodeBlock,
+  runInferredCodeBlockAndMoveDown,
+} from "./run-code";
 
 // this method is called when your extension is activated
 // your extension is activated the very first time the command is executed
@@ -13,23 +16,21 @@ export function activate(context: vscode.ExtensionContext) {
     'Congratulations, your extension "vscode-jupyter-python" is now active!'
   );
 
-  const tmp = vscode.workspace.getConfiguration("vscode-jupyter-python");
-  const expandCode = tmp.get("expandCode");
-
-
   // The command has been defined in the package.json file
   // Now provide the implementation of the command with  registerCommand
   // The commandId parameter must match the command field in package.json
-  let disposable = vscode.commands.registerCommand("vscode-jupyter-python.sayHello", async () => {
-    // The code you place here will be executed every time your command is executed
+  let disposable1 = vscode.commands.registerCommand(
+    "vscode-jupyter-python.run-inferred-block",
+    async () => runInferredCodeBlock()
+  );
 
-    // Display a message box to the user
-    // vscode.window.showInformationMessage(`Hello World ${expandCode} from vscode-jupyter-python!`);
-    // await vscode.commands.executeCommand('jupyter.execSelectionInteractive', "print('sent to Interactive Window by package')\n");
-    runInferredCodeBlock();
-  });
+  let disposable2 = vscode.commands.registerCommand(
+    "vscode-jupyter-python.run-inferred-block-and-move-down",
+    async () => runInferredCodeBlockAndMoveDown()
+  );
 
-  context.subscriptions.push(disposable);
+  context.subscriptions.push(disposable1);
+  context.subscriptions.push(disposable2);
 }
 
 // this method is called when your extension is deactivated

src/run-code.ts

@@ -9,31 +9,34 @@ export function runEntireFile() {
   vscode.commands.executeCommand("jupyter.execSelectionInteractive", text);
 }
 
-export function runInferredCodeBlock() {
+export function runInferredCodeBlock(): void {
   const textEditor = vscode.window.activeTextEditor;
-  console.log('textEditor', textEditor);
+  console.log("textEditor", textEditor);
   if (!textEditor) {
     return;
   }
 
   const initialCursorPosition = textEditor?.selection.anchor;
-  console.log('initialCursorPosition', initialCursorPosition);
+  console.log("initialCursorPosition", initialCursorPosition);
 
   const expandedCodeRange = getExpandedCodeRegion(
     textEditor,
     initialCursorPosition
   );
-  console.log('expandedCodeRange', expandedCodeRange);
+  console.log("expandedCodeRange", expandedCodeRange);
 
   const text = textEditor.document.getText(expandedCodeRange);
-  console.log('text', text);
+  console.log("text", text);
   vscode.commands.executeCommand("jupyter.execSelectionInteractive", text);
 
   // TODO: move cursor to end of range
   const endPosition = new Position(expandedCodeRange.end.line + 1, 0);
   const newSelection = new Selection(endPosition, endPosition);
   textEditor.selections = [newSelection];
+}
 
+export function runInferredCodeBlockAndMoveDown(): void {
+  runInferredCodeBlock();
 }
 
 function getExpandedCodeRegion(
@@ -42,13 +45,13 @@ function getExpandedCodeRegion(
 ): Range {
   // Assuming that no text is selected
   const beginRange = new Range(initialPosition, initialPosition);
-  console.log('beginRange', beginRange);
+  console.log("beginRange", beginRange);
 
   const initialIndentText = getInitialIndentText(editor, initialPosition);
-  console.log('initialIndentText', initialIndentText);
+  console.log("initialIndentText", initialIndentText);
 
   const finalRange = expandRangeDownward(editor, beginRange, initialIndentText);
-  console.log('finalRange', finalRange);
+  console.log("finalRange", finalRange);
   return finalRange;
 }
 
@@ -89,7 +92,7 @@ function expandRangeDownward(
     document.lineAt(nextLineNum).text.match(expandRegex)
   ) {
     nextLineNum += 1;
-    console.log('adding a line number')
+    console.log("adding a line number");
   }
 
   const endPosition = document.lineAt(nextLineNum + 1).range.end;

src/test/run-test.ts

@@ -1,7 +1,5 @@
 import * as path from 'path';
 
-// @ts-expect-error not sure why ts can't find its types
-// It seems to be missing a types field in package.json?
 import { runTests } from '@vscode/test-electron';
 
 async function main() {