Skip to content

Complete running terminal command when its tab is closed #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lars Vogel (vogella) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Complete running terminal command when its tab is closed #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions ...se.ui.terminal.tm/src/com/microsoft/copilot/eclipse/ui/terminal/tm/RunInTerminalTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,20 @@ public class RunInTerminalTool implements IRunInTerminalTool {
private static final String POWERSHELL_SCRIPT_ENV = "COPILOT_POWERSHELL_INTEGRATION_SCRIPT";
private static final String COMMAND_CANCELLED_MESSAGE = "Terminal command cancelled.";
private static final String COMMAND_INTERRUPTED_MESSAGE = "Terminal command interrupted by a new command.";
private static final String TERMINAL_CLOSED_MESSAGE = "Terminal was closed before the command finished.";

// Non-background terminal field
private ITerminalViewControl persistentTerminalViewControl;
private volatile ITerminalViewControl persistentTerminalViewControl;

// Terminal UI-related fields
private ITerminalControl terminalControl;
private CTabFolder tabFolder;
private CTabItem copilotTabItem;
private volatile CTabItem copilotTabItem;
private Supplier<Image> terminalIconSupplier;

// Output and command state
private StringBuilder sb;
private volatile ForegroundCommand foregroundCommand;
private final AtomicReference<ForegroundCommand> foregroundCommand = new AtomicReference<>();

/**
* Constructor for RunInTerminalTool.
Expand All @@ -89,7 +90,7 @@ public CompletableFuture<String> executeCommand(String command, boolean isBackgr
: new ForegroundCommand(commandFuture, hasShellIntegrationMarker());

if (commandState != null) {
foregroundCommand = commandState;
foregroundCommand.set(commandState);
if (!commandState.useMarker()) {
// Retain only the last line (prompt) in the output buffer
if (!sb.isEmpty()) {
Expand All @@ -108,9 +109,10 @@ public CompletableFuture<String> executeCommand(String command, boolean isBackgr
final String finalCommand = TerminalCommandProcessor.formatForExecution(command, useBracketedPaste());

synchronized (lock) {
if (!isBackground && this.persistentTerminalViewControl != null) {
ITerminalViewControl persistentControl = this.persistentTerminalViewControl;
if (!isBackground && persistentControl != null) {
revealTerminal();
sendCommand(this.persistentTerminalViewControl, finalCommand);
sendCommand(persistentControl, finalCommand);
return commandFuture;
}

Expand Down Expand Up @@ -216,7 +218,7 @@ public void cancelCurrentCommand() {
}

private void closeRunningForegroundTerminal(String completionMessage) {
ForegroundCommand commandState = foregroundCommand;
ForegroundCommand commandState = foregroundCommand.get();
if (commandState != null && !commandState.future().isDone()) {
closeCurrentForegroundTerminal(completionMessage);
}
Expand All @@ -226,8 +228,7 @@ private void closeCurrentForegroundTerminal(String completionMessage) {
ForegroundCommand commandState = null;
CTabItem tabItem = null;
synchronized (lock) {
commandState = foregroundCommand;
foregroundCommand = null;
commandState = foregroundCommand.getAndSet(null);
persistentTerminalViewControl = null;
tabItem = copilotTabItem;
copilotTabItem = null;
Expand All @@ -249,8 +250,8 @@ private void closeCurrentForegroundTerminal(String completionMessage) {
}

private void clearForegroundCommand(ForegroundCommand commandState) {
if (commandState != null && foregroundCommand == commandState) {
foregroundCommand = null;
if (commandState != null) {
foregroundCommand.compareAndSet(commandState, null);
}
}

Expand Down Expand Up @@ -346,7 +347,7 @@ private ITerminalServiceOutputStreamMonitorListener buildOutputStreamMonitorList
output.append(content);

// Detect completion based on platform strategy
ForegroundCommand commandState = foregroundCommand;
ForegroundCommand commandState = foregroundCommand.get();
if (!isBackground && commandState != null && !commandState.future().isDone()) {
CompletionCheckResult completionResult = commandState.useMarker()
? TerminalCommandProcessor.tryCompleteWithMarker(output)
Expand All @@ -360,9 +361,7 @@ private void handleCompletionResult(ForegroundCommand commandState, CompletionCh
if (completionResult.state() == CompletionCheckState.INCOMPLETE) {
return;
}
if (foregroundCommand == commandState) {
foregroundCommand = null;
}
foregroundCommand.compareAndSet(commandState, null);
if (!commandState.future().isDone()) {
commandState.future().complete(completionResult.output());
}
Expand All @@ -372,8 +371,15 @@ private DisposeListener buildDisposeListener(String executionId, boolean isBackg
return e -> {
if (isBackground) {
backgroundCommandOutputs.remove(executionId);
} else {
} else if (e.widget == copilotTabItem) {
// No lock here: this runs on the UI thread and lock holders wait on syncExec.
copilotTabItem = null;
persistentTerminalViewControl = null;
sb.setLength(0);
ForegroundCommand commandState = foregroundCommand.getAndSet(null);
if (commandState != null && !commandState.future().isDone()) {
commandState.future().complete(TERMINAL_CLOSED_MESSAGE);
}
}

if (backgroundCommandOutputs.isEmpty() && persistentTerminalViewControl == null) {
Expand All @@ -383,7 +389,8 @@ private DisposeListener buildDisposeListener(String executionId, boolean isBackg
}

private void revealTerminal() {
if (tabFolder != null && copilotTabItem != null) {
CTabItem tabItem = copilotTabItem;
if (tabFolder != null && tabItem != null) {
Display.getDefault().syncExec(() -> {
try {
IWorkbenchPage page = getActivePage();
Expand All @@ -393,8 +400,8 @@ private void revealTerminal() {
tabFolder = view.getAdapter(CTabFolder.class);
}
}
if (tabFolder != null && !tabFolder.isDisposed()) {
tabFolder.setSelection(copilotTabItem);
if (tabFolder != null && !tabFolder.isDisposed() && !tabItem.isDisposed()) {
tabFolder.setSelection(tabItem);
}
} catch (PartInitException e) {
// Skip exception
Expand Down
45 changes: 26 additions & 19 deletions ....eclipse.ui.terminal/src/com/microsoft/copilot/eclipse/ui/terminal/RunInTerminalTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,20 @@ public class RunInTerminalTool implements IRunInTerminalTool {
private static final String POWERSHELL_SCRIPT_ENV = "COPILOT_POWERSHELL_INTEGRATION_SCRIPT";
private static final String COMMAND_CANCELLED_MESSAGE = "Terminal command cancelled.";
private static final String COMMAND_INTERRUPTED_MESSAGE = "Terminal command interrupted by a new command.";
private static final String TERMINAL_CLOSED_MESSAGE = "Terminal was closed before the command finished.";

// Non-background terminal field
private ITerminalViewControl persistentTerminalViewControl;
private volatile ITerminalViewControl persistentTerminalViewControl;

// Terminal UI-related fields
private ITerminalControl terminalControl;
private CTabFolder tabFolder;
private CTabItem copilotTabItem;
private volatile CTabItem copilotTabItem;
private Supplier<Image> terminalIconSupplier;

// Output and command state
private StringBuilder sb;
private volatile ForegroundCommand foregroundCommand;
private final AtomicReference<ForegroundCommand> foregroundCommand = new AtomicReference<>();

/**
* Constructor for RunInTerminalTool.
Expand All @@ -89,7 +90,7 @@ public CompletableFuture<String> executeCommand(String command, boolean isBackgr
: new ForegroundCommand(commandFuture, hasShellIntegrationMarker());

if (commandState != null) {
foregroundCommand = commandState;
foregroundCommand.set(commandState);
if (!commandState.useMarker()) {
// Retain only the last line (prompt) in the output buffer
if (!sb.isEmpty()) {
Expand All @@ -108,9 +109,10 @@ public CompletableFuture<String> executeCommand(String command, boolean isBackgr
final String finalCommand = TerminalCommandProcessor.formatForExecution(command, useBracketedPaste());

synchronized (lock) {
if (!isBackground && this.persistentTerminalViewControl != null) {
ITerminalViewControl persistentControl = this.persistentTerminalViewControl;
if (!isBackground && persistentControl != null) {
revealTerminal();
sendCommand(this.persistentTerminalViewControl, finalCommand);
sendCommand(persistentControl, finalCommand);
return commandFuture;
}

Expand Down Expand Up @@ -217,7 +219,7 @@ public void cancelCurrentCommand() {
}

private void closeRunningForegroundTerminal(String completionMessage) {
ForegroundCommand commandState = foregroundCommand;
ForegroundCommand commandState = foregroundCommand.get();
if (commandState != null && !commandState.future().isDone()) {
closeCurrentForegroundTerminal(completionMessage);
}
Expand All @@ -227,8 +229,7 @@ private void closeCurrentForegroundTerminal(String completionMessage) {
ForegroundCommand commandState = null;
CTabItem tabItem = null;
synchronized (lock) {
commandState = foregroundCommand;
foregroundCommand = null;
commandState = foregroundCommand.getAndSet(null);
persistentTerminalViewControl = null;
tabItem = copilotTabItem;
copilotTabItem = null;
Expand All @@ -250,8 +251,8 @@ private void closeCurrentForegroundTerminal(String completionMessage) {
}

private void clearForegroundCommand(ForegroundCommand commandState) {
if (commandState != null && foregroundCommand == commandState) {
foregroundCommand = null;
if (commandState != null) {
foregroundCommand.compareAndSet(commandState, null);
}
}

Expand Down Expand Up @@ -345,7 +346,7 @@ private ITerminalServiceOutputStreamMonitorListener buildOutputStreamMonitorList
output.append(content);

// Detect completion based on platform strategy
ForegroundCommand commandState = foregroundCommand;
ForegroundCommand commandState = foregroundCommand.get();
if (!isBackground && commandState != null && !commandState.future().isDone()) {
CompletionCheckResult completionResult = commandState.useMarker()
? TerminalCommandProcessor.tryCompleteWithMarker(output)
Expand All @@ -359,9 +360,7 @@ private void handleCompletionResult(ForegroundCommand commandState, CompletionCh
if (completionResult.state() == CompletionCheckState.INCOMPLETE) {
return;
}
if (foregroundCommand == commandState) {
foregroundCommand = null;
}
foregroundCommand.compareAndSet(commandState, null);
if (!commandState.future().isDone()) {
commandState.future().complete(completionResult.output());
}
Expand All @@ -371,8 +370,15 @@ private DisposeListener buildDisposeListener(String executionId, boolean isBackg
return e -> {
if (isBackground) {
backgroundCommandOutputs.remove(executionId);
} else {
} else if (e.widget == copilotTabItem) {
// No lock here: this runs on the UI thread and lock holders wait on syncExec.
copilotTabItem = null;
persistentTerminalViewControl = null;
sb.setLength(0);
ForegroundCommand commandState = foregroundCommand.getAndSet(null);
if (commandState != null && !commandState.future().isDone()) {
commandState.future().complete(TERMINAL_CLOSED_MESSAGE);
}
}

if (backgroundCommandOutputs.isEmpty() && persistentTerminalViewControl == null) {
Expand All @@ -382,7 +388,8 @@ private DisposeListener buildDisposeListener(String executionId, boolean isBackg
}

private void revealTerminal() {
if (tabFolder != null && copilotTabItem != null) {
CTabItem tabItem = copilotTabItem;
if (tabFolder != null && tabItem != null) {
Display.getDefault().syncExec(() -> {
try {
IWorkbenchPage page = getActivePage();
Expand All @@ -392,8 +399,8 @@ private void revealTerminal() {
tabFolder = view.getAdapter(CTabFolder.class);
}
}
if (tabFolder != null && !tabFolder.isDisposed()) {
tabFolder.setSelection(copilotTabItem);
if (tabFolder != null && !tabFolder.isDisposed() && !tabItem.isDisposed()) {
tabFolder.setSelection(tabItem);
}
} catch (PartInitException e) {
// Skip exception
Expand Down