Support *-app.py and *_app.py filename patterns (#19)

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 <!-- Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. -->
 
+## 0.1.5
+
+- Recognize files named \*-app.py and \*\_app.py as potentially Shiny apps, enabling the "Run Shiny App" and "Debug Shiny App" buttons. (We continue to recognize app.py, app-\*.py, and app\_\*.py.) (#19)
+- Stop using an exported API from the ms-python.python extension that has been deprecated and replaced. (#19)
+
 ## 0.1.4
 
 - No code changes; required a new version number to recover from continuous integration issue.

package.json

@@ -2,7 +2,7 @@
   "name": "shiny-python",
   "displayName": "Shiny for Python",
   "description": "Shiny for Python support",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "publisher": "Posit",
   "icon": "logo.png",
   "repository": {

src/extension.ts

@@ -49,7 +49,8 @@ function updateContext(): boolean {
     !!editor &&
     editor.document.languageId === "python" &&
     !editor.document.isUntitled &&
-    /^app([_-].+)?\.py$/i.test(path.basename(editor.document.fileName ?? "")) &&
+    !!editor.document.fileName &&
+    isShinyAppUsername(editor.document.fileName) &&
     editor.document.getText().search(/\bshiny\b/) >= 0;
   vscode.commands.executeCommand("setContext", "shiny.python.active", active);
   return active;
@@ -114,3 +115,28 @@ class Throttler {
     this._pending = false;
   }
 }
+
+function isShinyAppUsername(filename: string): boolean {
+  filename = path.basename(filename);
+
+  // Only .py files
+  if (!/\.py$/i.test(filename)) {
+    return false;
+  }
+
+  // Accepted patterns:
+  // app.py
+  // app-*.py
+  // app_*.py
+  // *-app.py
+  // *_app.py
+  if (/^app\.py$/i.test(filename)) {
+    return true;
+  } else if (/^app[-_]/i.test(filename)) {
+    return true;
+  } else if (/[-_]app\.py$/i.test(filename)) {
+    return true;
+  }
+
+  return false;
+}

src/run.ts

@@ -13,11 +13,16 @@ export async function runApp(context: vscode.ExtensionContext) {
     // only to re-use a terminal if it's using the same interpreter.
     const pythonAPI =
       vscode.extensions.getExtension("ms-python.python")!.exports;
-    const pythonExecCommand = (
-      await pythonAPI.environment.getExecutionDetails(
-        vscode.window.activeTextEditor?.document.uri
-      )
-    ).execCommand.join(" ");
+
+    // The getActiveEnvironmentPath docstring says: "Note that this can be an
+    // invalid environment, use resolveEnvironment to get full details."
+    const unresolvedEnv = pythonAPI.environments.getActiveEnvironmentPath(
+      vscode.window.activeTextEditor?.document.uri
+    );
+    const resolvedEnv = await pythonAPI.environments.resolveEnvironment(
+      unresolvedEnv
+    );
+    const pythonExecCommand = resolvedEnv.path;
 
     const shinyTerminals = vscode.window.terminals.filter(
       (term) => term.name === TERMINAL_NAME