From 43d55d705d204ebc7ecb05bdaec2b32b6cb9d07f Mon Sep 17 00:00:00 2001
From: sestinj <sestinj@gmail.com>
Date: Thu, 10 Aug 2023 01:39:09 -0700
Subject: Remove clientgen, fix windows startup errors

---
 extension/src/activation/environmentSetup.ts | 15 ++++++++++++---
 extension/src/debugPanel.ts                  |  4 ++--
 extension/src/util/util.ts                   |  9 +--------
 3 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'extension/src')

diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index c2ac0b22..f0e41ca9 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -237,10 +237,14 @@ export async function startContinuePythonServer() {
     };
     try {
       const child = spawn(destination, {
-        detached: true,
-        stdio: "ignore",
         windowsHide: true,
       });
+      child.stdout.on("data", (data: any) => {
+        console.log(`stdout: ${data}`);
+      });
+      child.stderr.on("data", (data: any) => {
+        console.log(`stderr: ${data}`);
+      });
       child.on("error", (err: any) => {
         if (attempts < maxAttempts) {
           retry();
@@ -248,7 +252,12 @@ export async function startContinuePythonServer() {
           console.error("Failed to start subprocess.", err);
         }
       });
-      child.unref();
+      child.on("exit", (code: any, signal: any) => {
+        console.log("Subprocess exited with code", code, signal);
+      });
+      child.on("close", (code: any, signal: any) => {
+        console.log("Subprocess closed with code", code, signal);
+      });
     } catch (e: any) {
       console.log("Error starting server:", e);
       retry();
diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts
index e6dade37..61ff455a 100644
--- a/extension/src/debugPanel.ts
+++ b/extension/src/debugPanel.ts
@@ -5,7 +5,7 @@ import {
   getNonce,
   openEditorAndRevealRange,
 } from "./util/vscode";
-import { RangeInFile } from "./client";
+import { RangeInFile } from "../schema/RangeInFile";
 import { setFocusedOnContinueInput } from "./commands";
 const WebSocket = require("ws");
 
@@ -112,7 +112,7 @@ export function setupDebugPanel(
     }
 
     const rangeInFile: RangeInFile = {
-      range: e.selections[0],
+      range: e.selections[0] as any,
       filepath: e.textEditor.document.fileName,
     };
     const filesystem = {
diff --git a/extension/src/util/util.ts b/extension/src/util/util.ts
index dfc10c90..15b34267 100644
--- a/extension/src/util/util.ts
+++ b/extension/src/util/util.ts
@@ -1,4 +1,4 @@
-import { RangeInFile, SerializedDebugContext } from "../client";
+import { RangeInFile } from "../../schema/RangeInFile";
 import * as fs from "fs";
 const os = require("os");
 
@@ -95,13 +95,6 @@ export function codeSelectionsToVirtualFileSystem(
   return virtualFileSystem;
 }
 
-export function addFileSystemToDebugContext(
-  ctx: SerializedDebugContext
-): SerializedDebugContext {
-  ctx.filesystem = codeSelectionsToVirtualFileSystem(ctx.rangesInFiles);
-  return ctx;
-}
-
 export function debounced(delay: number, fn: Function) {
   let timerId: NodeJS.Timeout | null;
   return function (...args: any[]) {
-- 
cgit v1.2.3-70-g09d2