code: Align to esbonio.sphinx.pythonCommand changes

Author: alcarney

code/package.json

@@ -406,15 +406,6 @@
                         "default": false,
                         "description": "Enable lsp-devtools integration for sphinx agent instances."
                     },
-                    "esbonio.sphinx.pythonPath": {
-                        "scope": "resource",
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        },
-                        "default": [],
-                        "description": "List of paths to use when constructing the value of PYTHONPATH. Used to inject the sphinx agent into the target environment."
-                    },
                     "esbonio.preview.showLineMarkers": {
                         "scope": "resource",
                         "type": "boolean",

code/src/node/client.ts

@@ -24,18 +24,30 @@ export interface SphinxClientConfig {
   /**
    * The python command used to launch the client
    */
-  pythonCommand: string[]
+  pythonCommand: PythonCommand
 
   /**
    * The sphinx-build command in use
    */
   buildCommand: string[]
 
+}
+
+export interface PythonCommand {
   /**
-   * The working directory of the client
+   * The command that was invoked
    */
-  cwd: string
+  command: string[]
+
+  /**
+   * The environment variables the command was launched with
+   */
+  env: { [key: string]: string }
 
+  /**
+   * The working directory the command was launched in
+   */
+  cwd: string
 }
 
 export interface ClientCreatedNotification {
@@ -297,7 +309,7 @@ export class EsbonioClient {
       'esbonio',
       'Esbonio Language Server',
       server,
-      this.getLanguageClientOptions(config)
+      this.getLanguageClientOptions(pythonCommand, config)
     )
     this.registerHandlers(client)
     return client
@@ -335,7 +347,7 @@ export class EsbonioClient {
    * Returns the LanguageClient options that are common to both modes of
    * transport.
    */
-  private getLanguageClientOptions(config: vscode.WorkspaceConfiguration): LanguageClientOptions {
+  private getLanguageClientOptions(pythonCommand: string[], config: vscode.WorkspaceConfiguration): LanguageClientOptions {
     let documentSelector = config.get<TextDocumentFilter[]>("server.documentSelector")
     if (!documentSelector || documentSelector.length === 0) {
       documentSelector = Server.DEFAULT_SELECTOR
@@ -348,8 +360,14 @@ export class EsbonioClient {
         maxRestartCount: 0
       },
       initializationOptions: {
+        // Fallback sphinx configuration
         sphinx: {
-          fallbackEnv: vscode.Uri.joinPath(this.extensionUri, "bundled", "env").fsPath,
+          pythonCommand: {
+            command: [...pythonCommand, "-S"],
+            env: {
+              PYTHONPATH: vscode.Uri.joinPath(this.extensionUri, "bundled", "env").fsPath
+            }
+          }
         }
       },
       middleware: {

code/src/node/processTreeView.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import { Notifications, Events } from "../common/constants";
 import { OutputChannelLogger } from '../common/log'
 
-import { AppCreatedNotification, ClientCreatedNotification, ClientDestroyedNotification, ClientErroredNotification, EsbonioClient, SphinxClientConfig, SphinxInfo } from './client';
+import { AppCreatedNotification, ClientCreatedNotification, ClientDestroyedNotification, ClientErroredNotification, EsbonioClient, PythonCommand, SphinxClientConfig, SphinxInfo } from './client';
 
 /**
  * Tree View provider that visualises the Sphinx processes currently
@@ -101,10 +101,10 @@ export class SphinxProcessProvider implements vscode.TreeDataProvider<ProcessTre
 
       case 'python':
         let pyCmd: string[] = []
-        element.command?.forEach(c => pyCmd.push(`- ${c}`))
+        element.command?.command.forEach(c => pyCmd.push(`- ${c}`))
 
         return {
-          label: element.command?.join(' '),
+          label: element.command?.command.join(' '),
           iconPath: vscode.ThemeIcon.File,
           tooltip: new vscode.MarkdownString(`**Python Command**\n  ${pyCmd.join('\n  ')}`),
           resourceUri: vscode.Uri.parse('file:///test.py'),  // Needed to pull in the icon for Python
@@ -146,7 +146,7 @@ export class SphinxProcessProvider implements vscode.TreeDataProvider<ProcessTre
     if (!element) {
       for (let process of this.sphinxClients.values()) {
 
-        let cwd = process.config.cwd
+        let cwd = process.config.pythonCommand.cwd
         let node: ProcessContainerNode = { kind: 'container', name: cwd, path: cwd }
         result.push(node)
       }
@@ -157,7 +157,7 @@ export class SphinxProcessProvider implements vscode.TreeDataProvider<ProcessTre
     switch (element.kind) {
       case 'container':
         for (let [id, process] of this.sphinxClients.entries()) {
-          if (element.name === process.config.cwd) {
+          if (element.name === process.config.pythonCommand.cwd) {
             let node: SphinxProcessNode = { kind: 'sphinxProcess', id: id }
             result.push(node)
           }
@@ -279,7 +279,7 @@ type ProcessTreeNode = ProcessContainerNode | SphinxProcessNode | SphinxBuilderN
  */
 interface PythonCommandNode {
   kind: 'python'
-  command: string[] | undefined
+  command: PythonCommand | undefined
 }
 
 /**