Skip to content

Commit 82dac48

Browse files
committed
Reveal panel/editor when running a recent command/dir
Fixes microsoft#141619
1 parent 5c6672c commit 82dac48

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

src/vs/workbench/contrib/terminal/browser/terminalActions.ts

+23-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/w
3333
import { CLOSE_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
3434
import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
3535
import { FindInFilesCommand, IFindInFilesArgs } from 'vs/workbench/contrib/search/browser/searchActions';
36-
import { Direction, ICreateTerminalOptions, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
36+
import { Direction, ICreateTerminalOptions, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
3737
import { TerminalQuickAccessProvider } from 'vs/workbench/contrib/terminal/browser/terminalQuickAccess';
3838
import { IRemoteTerminalAttachTarget, ITerminalConfigHelper, ITerminalProfileService, TerminalCommandId, TERMINAL_ACTION_CATEGORY } from 'vs/workbench/contrib/terminal/common/terminal';
3939
import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
@@ -311,7 +311,17 @@ export function registerTerminalActions() {
311311
});
312312
}
313313
async run(accessor: ServicesAccessor): Promise<void> {
314-
await accessor.get(ITerminalService).activeInstance?.runRecent('command');
314+
const terminalGroupService = accessor.get(ITerminalGroupService);
315+
const terminalEditorService = accessor.get(ITerminalEditorService);
316+
const instance = accessor.get(ITerminalService).activeInstance;
317+
if (instance) {
318+
await instance.runRecent('command');
319+
if (instance?.target === TerminalLocation.Editor) {
320+
terminalEditorService.revealActiveEditor();
321+
} else {
322+
terminalGroupService.showPanel(false);
323+
}
324+
}
315325
}
316326
});
317327
registerAction2(class extends Action2 {
@@ -325,7 +335,17 @@ export function registerTerminalActions() {
325335
});
326336
}
327337
async run(accessor: ServicesAccessor): Promise<void> {
328-
await accessor.get(ITerminalService).activeInstance?.runRecent('cwd');
338+
const terminalGroupService = accessor.get(ITerminalGroupService);
339+
const terminalEditorService = accessor.get(ITerminalEditorService);
340+
const instance = accessor.get(ITerminalService).activeInstance;
341+
if (instance) {
342+
await instance.runRecent('cwd');
343+
if (instance?.target === TerminalLocation.Editor) {
344+
terminalEditorService.revealActiveEditor();
345+
} else {
346+
terminalGroupService.showPanel(false);
347+
}
348+
}
329349
}
330350
});
331351
registerAction2(class extends Action2 {

0 commit comments

Comments
 (0)