From e2f604767dea243d5d3a0d307c8c77d27e58ecac Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 16 Jun 2023 11:40:36 -0700
Subject: dlt demo work
---
extension/src/activation/activate.ts | 6 ++++++
extension/src/continueIdeClient.ts | 2 +-
extension/src/terminal/terminalEmulator.ts | 7 ++++---
3 files changed, 11 insertions(+), 4 deletions(-)
(limited to 'extension/src')
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 77010241..32726c86 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -59,6 +59,9 @@ export function activateExtension(
name: "Continue",
});
terminal.dispose();
+ if (!ideProtocolClient.continueTerminal) {
+ ideProtocolClient.continueTerminal = capturedTerminal;
+ }
});
// If any terminals are open to start, replace them
@@ -77,6 +80,9 @@ export function activateExtension(
}
);
terminal.dispose();
+ if (!ideProtocolClient.continueTerminal) {
+ ideProtocolClient.continueTerminal = capturedTerminal;
+ }
});
extensionContext = context;
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index a889d3dc..9a93a4ef 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -323,7 +323,7 @@ class IdeProtocolClient {
return rangeInFiles;
}
- private continueTerminal: CapturedTerminal | undefined;
+ public continueTerminal: CapturedTerminal | undefined;
async runCommand(command: string) {
if (!this.continueTerminal || this.continueTerminal.isClosed()) {
diff --git a/extension/src/terminal/terminalEmulator.ts b/extension/src/terminal/terminalEmulator.ts
index 9d90b331..ff2060f8 100644
--- a/extension/src/terminal/terminalEmulator.ts
+++ b/extension/src/terminal/terminalEmulator.ts
@@ -76,7 +76,8 @@ export class CapturedTerminal {
(lines.length > 0 &&
(last_line.includes("bash-") || last_line.includes(") $ ")) &&
last_line.includes("$")) ||
- (last_line.includes("]> ") && last_line.includes(") ["))
+ (last_line.includes("]> ") && last_line.includes(") [")) ||
+ (last_line.includes(" (") && last_line.includes(")>"))
);
}
@@ -98,7 +99,7 @@ export class CapturedTerminal {
if (!this.hasRunCommand) {
this.hasRunCommand = true;
// Let the first bash- prompt appear and let python env be opened
- await this.waitForCommandToFinish();
+ // await this.waitForCommandToFinish();
}
if (this.commandQueue.length === 0) {
@@ -154,7 +155,7 @@ export class CapturedTerminal {
// Create the pseudo terminal
this.ptyProcess = pty.spawn(this.shellCmd, [], {
name: "xterm-256color",
- cols: 160, // TODO: Get size of vscode terminal, and change with resize
+ cols: 250, // No way to get the size of VS Code terminal, or listen to resize, so make it just bigger than most conceivable VS Code widths
rows: 26,
cwd: getRootDir(),
env,
--
cgit v1.2.3-70-g09d2