From cc7ef4631f8f1bd141788c8e3117df1aca16b308 Mon Sep 17 00:00:00 2001 From: Ty Dunn Date: Wed, 21 Jun 2023 15:02:20 -0700 Subject: removing captured terminal --- extension/src/continueIdeClient.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'extension/src/continueIdeClient.ts') diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts index fbad5f5d..202077de 100644 --- a/extension/src/continueIdeClient.ts +++ b/extension/src/continueIdeClient.ts @@ -12,7 +12,6 @@ import { debugPanelWebview, setupDebugPanel } from "./debugPanel"; import { FileEditWithFullContents } from "../schema/FileEditWithFullContents"; import fs = require("fs"); import { WebsocketMessenger } from "./util/messenger"; -import { CapturedTerminal } from "./terminal/terminalEmulator"; import { decorationManager } from "./decorations"; class IdeProtocolClient { @@ -326,17 +325,10 @@ class IdeProtocolClient { return rangeInFiles; } - public continueTerminal: CapturedTerminal | undefined; - async runCommand(command: string) { - if (!this.continueTerminal || this.continueTerminal.isClosed()) { - this.continueTerminal = new CapturedTerminal({ - name: "Continue", - }); - } - - this.continueTerminal.show(); - return await this.continueTerminal.runCommand(command); + const terminal = vscode.window.createTerminal(); + terminal.show(); + terminal.sendText(command); } sendCommandOutput(output: string) { -- cgit v1.2.3-70-g09d2 From 24198f9724fbc42b128d93fcb612bcd60f1837e1 Mon Sep 17 00:00:00 2001 From: Ty Dunn Date: Wed, 21 Jun 2023 21:36:24 -0700 Subject: run existing terminal if possible --- extension/src/continueIdeClient.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'extension/src/continueIdeClient.ts') diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts index 202077de..3a77e348 100644 --- a/extension/src/continueIdeClient.ts +++ b/extension/src/continueIdeClient.ts @@ -326,9 +326,13 @@ class IdeProtocolClient { } async runCommand(command: string) { - const terminal = vscode.window.createTerminal(); - terminal.show(); - terminal.sendText(command); + if (vscode.window.terminals.length) { + vscode.window.terminals[0].sendText(command); + } else { + const terminal = vscode.window.createTerminal(); + terminal.show(); + terminal.sendText(command); + } } sendCommandOutput(output: string) { -- cgit v1.2.3-70-g09d2 From 19db6b37e742e398807e4b63fd7806a4260f067e Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Mon, 26 Jun 2023 22:00:03 -0700 Subject: quotes around paths --- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- extension/src/activation/environmentSetup.ts | 18 ++++++++---------- extension/src/continueIdeClient.ts | 6 +++--- 4 files changed, 14 insertions(+), 16 deletions(-) (limited to 'extension/src/continueIdeClient.ts') diff --git a/extension/package-lock.json b/extension/package-lock.json index fcd4c755..0359ad49 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "0.0.70", + "version": "0.0.71", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "continue", - "version": "0.0.70", + "version": "0.0.71", "license": "Apache-2.0", "dependencies": { "@electron/rebuild": "^3.2.10", diff --git a/extension/package.json b/extension/package.json index b56c60f4..96ffbd98 100644 --- a/extension/package.json +++ b/extension/package.json @@ -14,7 +14,7 @@ "displayName": "Continue", "pricing": "Free", "description": "Accelerating software development with language models", - "version": "0.0.70", + "version": "0.0.71", "publisher": "Continue", "engines": { "vscode": "^1.74.0" diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts index 6138dc64..c99ed1dd 100644 --- a/extension/src/activation/environmentSetup.ts +++ b/extension/src/activation/environmentSetup.ts @@ -108,17 +108,15 @@ async function setupPythonEnv() { console.log("Setting up python env for Continue extension..."); const [pythonCmd, pipCmd] = await getPythonPipCommands(); - const [activateCmd, pipUpgradeCmd, touchCmd] = getActivateUpgradeTouchCommands( - pythonCmd, - pipCmd - ); + const [activateCmd, pipUpgradeCmd, touchCmd] = + getActivateUpgradeTouchCommands(pythonCmd, pipCmd); if (checkEnvExists()) { console.log("Python env already exists, skipping..."); } else { // Assemble the command to create the env const createEnvCommand = [ - `cd ${path.join(getExtensionUri().fsPath, "scripts")}`, + `cd "${path.join(getExtensionUri().fsPath, "scripts")}"`, `${pythonCmd} -m venv env`, ].join("; "); @@ -132,11 +130,11 @@ async function setupPythonEnv() { break; } else { // Remove the env and try again - const removeCommand = `rm -rf ${path.join( + const removeCommand = `rm -rf "${path.join( getExtensionUri().fsPath, "scripts", "env" - )}`; + )}"`; await runCommand(removeCommand); } } @@ -151,7 +149,7 @@ async function setupPythonEnv() { console.log("Python requirements already installed, skipping..."); } else { const installRequirementsCommand = [ - `cd ${path.join(getExtensionUri().fsPath, "scripts")}`, + `cd "${path.join(getExtensionUri().fsPath, "scripts")}"`, activateCmd, pipUpgradeCmd, `${pipCmd} install -r requirements.txt`, @@ -229,10 +227,10 @@ export async function startContinuePythonServer() { pythonCmd = "python"; } - let command = `cd ${path.join( + let command = `cd "${path.join( getExtensionUri().fsPath, "scripts" - )} && ${activateCmd} && cd .. && ${pythonCmd} -m scripts.run_continue_server`; + )}" && ${activateCmd} && cd .. && ${pythonCmd} -m scripts.run_continue_server`; return await retryThenFail(async () => { console.log("Starting Continue python server..."); diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts index 3a77e348..08a0b74d 100644 --- a/extension/src/continueIdeClient.ts +++ b/extension/src/continueIdeClient.ts @@ -329,9 +329,9 @@ class IdeProtocolClient { if (vscode.window.terminals.length) { vscode.window.terminals[0].sendText(command); } else { - const terminal = vscode.window.createTerminal(); - terminal.show(); - terminal.sendText(command); + const terminal = vscode.window.createTerminal(); + terminal.show(); + terminal.sendText(command); } } -- cgit v1.2.3-70-g09d2