@@ -11,12 +11,13 @@ import { Registry } from 'vs/platform/registry/common/platform';
1111import { ICustomEditorInfo , IEditorService , IOpenEditorOverrideHandler , IOpenEditorOverrideEntry } from 'vs/workbench/services/editor/common/editorService' ;
1212import { IEditorInput , IEditorPane , IEditorInputFactoryRegistry , Extensions as EditorExtensions , EditorResourceAccessor } from 'vs/workbench/common/editor' ;
1313import { ITextEditorOptions , IEditorOptions } from 'vs/platform/editor/common/editor' ;
14- import { IEditorGroup , OpenEditorContext } from 'vs/workbench/services/editor/common/editorGroupsService' ;
14+ import { IEditorGroup , IEditorGroupsService , OpenEditorContext , preferredSideBySideGroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService' ;
1515import { IConfigurationService } from 'vs/platform/configuration/common/configuration' ;
16- import { IQuickInputService , IQuickPickItem } from 'vs/platform/quickinput/common/quickInput' ;
16+ import { IKeyMods , IQuickInputService , IQuickPickItem } from 'vs/platform/quickinput/common/quickInput' ;
1717import { URI } from 'vs/base/common/uri' ;
1818import { extname , basename , isEqual } from 'vs/base/common/resources' ;
1919import { Codicon } from 'vs/base/common/codicons' ;
20+ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' ;
2021
2122/**
2223 * Id of the default editor for open with.
@@ -30,14 +31,17 @@ export const DEFAULT_EDITOR_ID = 'default';
3031 * @param id Id of the editor to use. If not provided, the user is prompted for which editor to use.
3132 */
3233export async function openEditorWith (
34+ accessor : ServicesAccessor ,
3335 input : IEditorInput ,
3436 id : string | undefined ,
3537 options : IEditorOptions | ITextEditorOptions | undefined ,
3638 group : IEditorGroup ,
37- editorService : IEditorService ,
38- configurationService : IConfigurationService ,
39- quickInputService : IQuickInputService ,
4039) : Promise < IEditorPane | undefined > {
40+ const editorService = accessor . get ( IEditorService ) ;
41+ const editorGroupsService = accessor . get ( IEditorGroupsService ) ;
42+ const configurationService = accessor . get ( IConfigurationService ) ;
43+ const quickInputService = accessor . get ( IQuickInputService ) ;
44+
4145 const resource = input . resource ;
4246 if ( ! resource ) {
4347 return ;
@@ -77,24 +81,38 @@ export async function openEditorWith(
7781 } ] : undefined
7882 } ;
7983 } ) ;
84+ type QuickPickItem = IQuickPickItem & {
85+ readonly handler : IOpenEditorOverrideHandler ;
86+ } ;
8087
81- const picker = quickInputService . createQuickPick < ( IQuickPickItem & { handler : IOpenEditorOverrideHandler } ) > ( ) ;
88+ const picker = quickInputService . createQuickPick < QuickPickItem > ( ) ;
8289 picker . items = items ;
8390 if ( items . length ) {
8491 picker . selectedItems = [ items [ 0 ] ] ;
8592 }
8693 picker . placeholder = nls . localize ( 'promptOpenWith.placeHolder' , "Select editor for '{0}'" , basename ( originalResource ) ) ;
8794
88- const pickedItem = await new Promise < ( IQuickPickItem & { handler : IOpenEditorOverrideHandler } ) | undefined > ( resolve => {
95+ type PickedResult = {
96+ readonly item : QuickPickItem ;
97+ readonly keyMods ?: IKeyMods ;
98+ } ;
99+
100+ const picked = await new Promise < PickedResult | undefined > ( resolve => {
89101 picker . onDidAccept ( ( ) => {
90- resolve ( picker . selectedItems . length === 1 ? picker . selectedItems [ 0 ] : undefined ) ;
91- picker . dispose ( ) ;
102+ if ( picker . selectedItems . length === 1 ) {
103+ resolve ( {
104+ item : picker . selectedItems [ 0 ] ,
105+ keyMods : picker . keyMods
106+ } ) ;
107+ } else {
108+ resolve ( undefined ) ;
109+ }
92110 } ) ;
93111
94112 picker . onDidTriggerItemButton ( e => {
95113 const pick = e . item ;
96114 const id = pick . id ;
97- resolve ( pick ) ; // open the view
115+ resolve ( { item : pick } ) ; // open the view
98116 picker . dispose ( ) ;
99117
100118 // And persist the setting
@@ -121,7 +139,17 @@ export async function openEditorWith(
121139 picker . show ( ) ;
122140 } ) ;
123141
124- return pickedItem ?. handler . open ( input , { ...options , override : pickedItem . id } , group , OpenEditorContext . NEW_EDITOR ) ?. override ;
142+ if ( ! picked ) {
143+ return undefined ;
144+ }
145+
146+ const targetGroup = getTargetGroup ( group , picked . keyMods , configurationService , editorGroupsService ) ;
147+
148+ const openOptions : IEditorOptions = {
149+ ...options ,
150+ override : picked . item . id ,
151+ } ;
152+ return picked . item . handler . open ( input , openOptions , targetGroup , OpenEditorContext . NEW_EDITOR ) ?. override ;
125153}
126154
127155const builtinProviderDisplayName = nls . localize ( 'builtinProviderDisplayName' , "Built-in" ) ;
@@ -132,6 +160,23 @@ export const defaultEditorOverrideEntry = Object.freeze({
132160 detail : builtinProviderDisplayName
133161} ) ;
134162
163+ /**
164+ * Get the group to open the editor in by looking at the pressed keys from the picker.
165+ */
166+ function getTargetGroup (
167+ startingGroup : IEditorGroup ,
168+ keyMods : IKeyMods | undefined ,
169+ configurationService : IConfigurationService ,
170+ editorGroupsService : IEditorGroupsService ,
171+ ) {
172+ if ( keyMods ?. alt || keyMods ?. ctrlCmd ) {
173+ const direction = preferredSideBySideGroupDirection ( configurationService ) ;
174+ const targetGroup = editorGroupsService . findGroup ( { direction } , startingGroup . id ) ;
175+ return targetGroup ?? editorGroupsService . addGroup ( startingGroup , direction ) ;
176+ }
177+ return startingGroup ;
178+ }
179+
135180/**
136181 * Get a list of all available editors, including the default text editor.
137182 */
0 commit comments