Merge branch 'main' into DH-18347_panels-dont-show

Author: bmingles

CONTRIBUTING.md

@@ -97,6 +97,7 @@ npx vsce ls
 
 #### Pre-Release Versions
 1. Make sure you are in a clean branch whose HEAD points to the commit to publish.
+1. `npm install` to ensure npm packages up to date
 1. Make sure you are logged in with `vsce` using a personal access token for a user in the https://dev.azure.com/deephaven-oss/ org. `npx vsce login deephaven`
 1. Run `npm run publish:prerelease`
 

README.md

@@ -10,12 +10,21 @@ Once installed, there will be a new icon in the `activity bar` (the sidebar cont
 
 ![VS Code Activity Bar](./docs/assets/dh-activity-bar.gif)
 
-The "SERVERS" tree will show the status of any configured servers. To run a script against a running server, simply click the `Run Deephaven File` action at the top of a file supported by the server (`python` or `groovy`).
+The "SERVERS" tree will show the status of any configured servers. 
+
+
+## Running Code
+To run a script against a running server, simply click the `Run Deephaven File` action at the top of a file supported by the server (`python` or `groovy`).
 
 ![Connect to Community Server](./docs/assets/dhc-connect-to-server.gif)
 
 A new connection will show up in the "CONNECTIONS" tree, and the "PANELS" should show any variables exposed on the connection. To disconnect, hover over the connection item and click the trash icon.
 
+### Markdown Code Blocks
+Python and Groovy codeblocks in Markdown files can be run by clicking the "Run Deephaven Block" action directly above the codeblock.
+
+![Markdown Codeblocks](docs/assets/markdown-codeblocks.png)
+
 ## Configuration
 
 A single Community server `http://localhost:10000/` is configured by default and doesn't require any additional config. Additional connections can be configured in `VS Code` settings.
@@ -28,6 +37,8 @@ Community servers can be configured via the `"deephaven.coreServers"` setting in
 
 ![Community Server Settings](./docs/assets/add-community-server.gif)
 
+#### Self-signed SSL Certificates
+If you are running a Community server with a self-signed SSL certificate, vscode will need to be run in an environment that has the `NODE_EXTRA_CA_CERTS` environment variable set to the path of the cert that was used to sign your cert. Depending on your setup, this could be the server certificate or a CA certificate.
 
 ### Enterprise Servers
 Enterprise servers can be configured via the `"deephaven.enterpriseServers"` setting in `VS Code` user or workspace settings.

docs/assets/markdown-codeblocks.png

@@ -1,6 +1,6 @@
 {
   "name": "vscode-deephaven",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "displayName": "Deephaven VS Code",
   "description": "",
   "publisher": "deephaven",
@@ -147,6 +147,11 @@
         "title": "Run Deephaven File",
         "icon": "$(run-all)"
       },
+      {
+        "command": "vscode-deephaven.runMarkdownCodeblock",
+        "title": "Run Deephaven Markdown Codeblock",
+        "icon": "$(run)"
+      },
       {
         "command": "vscode-deephaven.runSelection",
         "title": "Run Deephaven Selected Lines",
@@ -677,6 +682,10 @@
           "command": "vscode-deephaven.runCode",
           "when": "editorLangId == python || editorLangId == groovy"
         },
+        {
+          "command": "vscode-deephaven.runMarkdownCodeblock",
+          "when": "false"
+        },
         {
           "command": "vscode-deephaven.runSelection",
           "when": "editorLangId == python || editorLangId == groovy"
@@ -866,7 +875,7 @@
   },
   "devDependencies": {
     "@deephaven-enterprise/jsapi-types": "^1.20240723.124-beta",
-    "@deephaven/jsapi-types": "^1.0.0-dev0.36.1",
+    "@deephaven/jsapi-types": "^1.0.0-dev0.37.3",
     "@types/node": "22.5.4",
     "@types/vscode": "^1.91.0",
     "@types/ws": "^8.5.10",

package-lock.json

@@ -31,6 +31,7 @@ export const REFRESH_SERVER_CONNECTION_TREE_CMD = cmd(
 );
 export const REFRESH_VARIABLE_PANELS_CMD = cmd('refreshVariablePanels');
 export const RUN_CODE_COMMAND = cmd('runCode');
+export const RUN_MARKDOWN_CODEBLOCK_CMD = cmd('runMarkdownCodeBlock');
 export const RUN_SELECTION_COMMAND = cmd('runSelection');
 export const SEARCH_CONNECTIONS_CMD = cmd('searchConnections');
 export const SEARCH_PANELS_CMD = cmd('searchPanels');

package.json

@@ -14,7 +14,6 @@ import {
   createConnectionQuickPickOptions,
   createConnectStatusBarItem,
   getConsoleType,
-  getEditorForUri,
   isSupportedLanguageId,
   Logger,
   updateConnectionStatusBarItem,
@@ -135,7 +134,11 @@ export class ConnectionController extends ControllerBase implements Disposable {
 
     const editor = vscode.window.activeTextEditor;
 
-    if (editor == null || !isSupportedLanguageId(editor.document.languageId)) {
+    if (
+      editor == null ||
+      (!isSupportedLanguageId(editor.document.languageId) &&
+        editor.document.languageId !== 'markdown')
+    ) {
       this._connectStatusBarItem.hide();
       return;
     }
@@ -158,7 +161,8 @@ export class ConnectionController extends ControllerBase implements Disposable {
 
   connectEditor = async (
     connectionOrServer: ConnectionState | ServerState,
-    editor: vscode.TextEditor
+    uri: vscode.Uri,
+    languageId: string
   ): Promise<void> => {
     updateConnectionStatusBarItem(this._connectStatusBarItem, 'connecting');
 
@@ -167,7 +171,7 @@ export class ConnectionController extends ControllerBase implements Disposable {
     if ('url' in connectionOrServer) {
       const cn = await this._serverManager.connectToServer(
         connectionOrServer.url,
-        getConsoleType(editor.document.languageId)
+        getConsoleType(languageId)
       );
 
       if (cn == null) {
@@ -179,7 +183,11 @@ export class ConnectionController extends ControllerBase implements Disposable {
     }
 
     try {
-      await this._serverManager.setEditorConnection(editor, connectionOrServer);
+      await this._serverManager.setEditorConnection(
+        uri,
+        languageId,
+        connectionOrServer
+      );
     } catch (err) {
       updateConnectionStatusBarItem(this._connectStatusBarItem, 'disconnected');
 
@@ -202,27 +210,27 @@ export class ConnectionController extends ControllerBase implements Disposable {
 
   /**
    * Get or create a connection for the given uri.
-   * @param uri
+   * @param uri Uri to get or create a connection for.
+   * @param languageId Language id to use for the connection.
    */
   getOrCreateConnection = async (
-    uri: vscode.Uri
+    uri: vscode.Uri,
+    languageId: string
   ): Promise<ConnectionState | null> => {
     assertDefined(this._outputChannel, 'outputChannel');
     assertDefined(this._serverManager, 'serverManager');
     assertDefined(this._toaster, 'toaster');
 
-    const editor = await getEditorForUri(uri);
-
     // Get existing connection for the editor
-    let dhService = await this._serverManager.getEditorConnection(editor);
+    let dhService = await this._serverManager.getEditorConnection(uri);
 
     if (dhService != null) {
       return dhService;
     }
 
     const supportingConnections = await getConnectionsForConsoleType(
       this._serverManager.getConnections(),
-      editor.document.languageId as ConsoleType
+      languageId as ConsoleType
     );
 
     const availableServers = this._serverManager.getServers({
@@ -233,29 +241,29 @@ export class ConnectionController extends ControllerBase implements Disposable {
     if (supportingConnections.length === 1 && availableServers.length === 0) {
       // If we only have 1 supporting connection, and no available servers, use
       // the available connection.
-      await this.connectEditor(supportingConnections[0], editor);
+      await this.connectEditor(supportingConnections[0], uri, languageId);
     } else if (
       // If there are no active connections that can support the editor, and we
       // only have 1 available server, just connect to it instead of prompting the
       // user to select an available server / connection.
       supportingConnections.length === 0 &&
       availableServers.length === 1
     ) {
-      await this.connectEditor(availableServers[0], editor);
+      await this.connectEditor(availableServers[0], uri, languageId);
     } else {
       // If there are multiple options to select, prompt the user to select one.
-      const isSelected = await this.onPromptUserToSelectConnection();
+      const isSelected = await this.onPromptUserToSelectConnection(languageId);
 
       // User cancelled the selection or an error occurred
       if (!isSelected) {
         return null;
       }
     }
 
-    dhService = await this._serverManager.getEditorConnection(editor);
+    dhService = await this._serverManager.getEditorConnection(uri);
 
     if (dhService == null) {
-      const logMsg = `No active connection found supporting '${editor.document.languageId}' console type.`;
+      const logMsg = `No active connection found supporting '${languageId}' console type.`;
       logger.debug(logMsg);
       this._outputChannel.appendLine(logMsg);
       this._toaster.error(logMsg);
@@ -341,12 +349,20 @@ export class ConnectionController extends ControllerBase implements Disposable {
    * 2. A list of running servers composed of:
    *   - DHC servers that don't yet have a connection
    *   - All running DHE servers
+   * @param languageId Optional language id to use for the connection. Defaults
+   * to the language id of the active editor.
    */
-  onPromptUserToSelectConnection = async (): Promise<boolean> => {
+  onPromptUserToSelectConnection = async (
+    languageId?: string
+  ): Promise<boolean> => {
     assertDefined(vscode.window.activeTextEditor, 'activeTextEditor');
     assertDefined(this._serverManager, 'serverManager');
 
     const editor = vscode.window.activeTextEditor;
+    const uri = editor.document.uri;
+    if (languageId == null) {
+      languageId = editor.document.languageId;
+    }
 
     const updateStatusPromise = this._serverManager.updateStatus();
 
@@ -382,12 +398,11 @@ export class ConnectionController extends ControllerBase implements Disposable {
     const connectionsForConsoleType: ConnectionState[] =
       await getConnectionsForConsoleType(
         this._serverManager.getConnections(),
-        editor.document.languageId as ConsoleType
+        languageId as ConsoleType
       );
 
-    const editorActiveConnectionUrl = this._serverManager.getUriConnection(
-      editor.document.uri
-    )?.serverUrl;
+    const editorActiveConnectionUrl =
+      this._serverManager.getUriConnection(uri)?.serverUrl;
 
     let selectedCnResult: ConnectionState | ServerState | null = null;
 
@@ -396,7 +411,7 @@ export class ConnectionController extends ControllerBase implements Disposable {
         createConnectionQuickPickOptions(
           [...runningDHCServersWithoutConnections, ...runningDHEServers],
           connectionsForConsoleType,
-          editor.document.languageId,
+          languageId,
           editorActiveConnectionUrl
         )
       );
@@ -405,7 +420,7 @@ export class ConnectionController extends ControllerBase implements Disposable {
         return false;
       }
 
-      await this.connectEditor(selectedCnResult, editor);
+      await this.connectEditor(selectedCnResult, uri, languageId);
 
       return true;
     } catch (err) {