Skip to content

fix: prevent Terminal view from stealing focus after CLI command execution #195

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

Merged
jdneo merged 4 commits into from
May 15, 2026
Merged

fix: prevent Terminal view from stealing focus after CLI command execution #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faf414f
fix: prevent Terminal view from stealing focus after CLI command exec…
rsd-darshan May 14, 2026
d82abef
Merge branch 'main' into fix/terminal-focus-steal
rsd-darshan May 14, 2026
ddea8cb
refactor: rename bringTerminalViewAndCopilotConsoleToFront to revealT…
rsd-darshan May 15, 2026
e45b21e
Merge branch 'main' into fix/terminal-focus-steal
rsd-darshan May 15, 2026
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
10 changes: 5 additions & 5 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 @@ -97,7 +97,7 @@ public CompletableFuture<String> executeCommand(String command, boolean isBackgr

synchronized (lock) {
if (!isBackground && this.persistentTerminalViewControl != null) {
bringTerminalViewAndCopilotConsoleToFront();
revealTerminal();
this.persistentTerminalViewControl.pasteString(finalCommand);
return this.resultFuture;
}
Expand All @@ -122,7 +122,7 @@ public CompletableFuture<String> executeCommand(String command, boolean isBackgr

if (!isBackground) {
this.persistentTerminalViewControl = terminalViewControl;
bringTerminalViewAndCopilotConsoleToFront();
revealTerminal();
}
terminalViewControl.pasteString(finalCommand);
} else {
Expand Down Expand Up @@ -205,7 +205,7 @@ private ITerminalControl getTerminalControl(String terminalTitle, boolean isBack
try {
IWorkbenchPage page = getActivePage();
if (page != null) {
IViewPart view = page.showView(IUIConstants.ID);
IViewPart view = page.showView(IUIConstants.ID, null, IWorkbenchPage.VIEW_VISIBLE);
if (view != null) {
tabFolder = view.getAdapter(CTabFolder.class);
if (tabFolder != null) {
Expand Down Expand Up @@ -360,13 +360,13 @@ private DisposeListener buildDisposeListener(String executionId, boolean isBackg
};
}

private void bringTerminalViewAndCopilotConsoleToFront() {
private void revealTerminal() {
if (tabFolder != null && copilotTabItem != null) {
Display.getDefault().syncExec(() -> {
try {
IWorkbenchPage page = getActivePage();
if (page != null) {
IViewPart view = page.showView(IUIConstants.ID);
IViewPart view = page.showView(IUIConstants.ID, null, IWorkbenchPage.VIEW_VISIBLE);
if (tabFolder.isDisposed() && view != null) {
tabFolder = view.getAdapter(CTabFolder.class);
}
Expand Down
10 changes: 5 additions & 5 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 @@ -99,7 +99,7 @@ public CompletableFuture<String> executeCommand(String command, boolean isBackgr

synchronized (lock) {
if (!isBackground && this.persistentTerminalViewControl != null) {
bringTerminalViewAndCopilotConsoleToFront();
revealTerminal();
this.persistentTerminalViewControl.pasteString(finalCommand);
return this.resultFuture;
}
Expand All @@ -124,7 +124,7 @@ public CompletableFuture<String> executeCommand(String command, boolean isBackgr

if (!isBackground) {
this.persistentTerminalViewControl = terminalViewControl;
bringTerminalViewAndCopilotConsoleToFront();
revealTerminal();
}
terminalViewControl.pasteString(finalCommand);
} else {
Expand Down Expand Up @@ -208,7 +208,7 @@ private ITerminalControl getTerminalControl(String terminalTitle, boolean isBack
try {
IWorkbenchPage page = getActivePage();
if (page != null) {
IViewPart view = page.showView(IUIConstants.ID);
IViewPart view = page.showView(IUIConstants.ID, null, IWorkbenchPage.VIEW_VISIBLE);
if (view != null) {
tabFolder = view.getAdapter(CTabFolder.class);
if (tabFolder != null) {
Expand Down Expand Up @@ -360,13 +360,13 @@ private DisposeListener buildDisposeListener(String executionId, boolean isBackg
};
}

private void bringTerminalViewAndCopilotConsoleToFront() {
private void revealTerminal() {
if (tabFolder != null && copilotTabItem != null) {
Display.getDefault().syncExec(() -> {
try {
IWorkbenchPage page = getActivePage();
if (page != null) {
IViewPart view = page.showView(IUIConstants.ID);
IViewPart view = page.showView(IUIConstants.ID, null, IWorkbenchPage.VIEW_VISIBLE);
if (tabFolder.isDisposed() && view != null) {
tabFolder = view.getAdapter(CTabFolder.class);
}
Expand Down
Loading