@@ -33,7 +33,7 @@ import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/w
33
33
import { CLOSE_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands' ;
34
34
import { ResourceContextKey } from 'vs/workbench/common/contextkeys' ;
35
35
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' ;
37
37
import { TerminalQuickAccessProvider } from 'vs/workbench/contrib/terminal/browser/terminalQuickAccess' ;
38
38
import { IRemoteTerminalAttachTarget , ITerminalConfigHelper , ITerminalProfileService , TerminalCommandId , TERMINAL_ACTION_CATEGORY } from 'vs/workbench/contrib/terminal/common/terminal' ;
39
39
import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey' ;
@@ -311,7 +311,17 @@ export function registerTerminalActions() {
311
311
} ) ;
312
312
}
313
313
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
+ }
315
325
}
316
326
} ) ;
317
327
registerAction2 ( class extends Action2 {
@@ -325,7 +335,17 @@ export function registerTerminalActions() {
325
335
} ) ;
326
336
}
327
337
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
+ }
329
349
}
330
350
} ) ;
331
351
registerAction2 ( class extends Action2 {
0 commit comments