Skip to content

Commit b67ec60

Browse files
author
Benjamin Pasero
committed
quick access - ensure to pin editors opened in background
1 parent 02bc4e2 commit b67ec60

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
816816

817817
return TriggerAction.CLOSE_PICKER;
818818
},
819-
accept: (keyMods, event) => this.openAnything(activeGlobalResource, { keyMods, range: editorSymbolPick.range?.selection, preserveFocus: event.inBackground })
819+
accept: (keyMods, event) => this.openAnything(activeGlobalResource, { keyMods, range: editorSymbolPick.range?.selection, preserveFocus: event.inBackground, forcePinned: event.inBackground })
820820
};
821821
});
822822
}
@@ -901,14 +901,14 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
901901

902902
return TriggerAction.NO_ACTION;
903903
},
904-
accept: (keyMods, event) => this.openAnything(resourceOrEditor, { keyMods, range: this.pickState.lastRange, preserveFocus: event.inBackground })
904+
accept: (keyMods, event) => this.openAnything(resourceOrEditor, { keyMods, range: this.pickState.lastRange, preserveFocus: event.inBackground, forcePinned: event.inBackground })
905905
};
906906
}
907907

908-
private async openAnything(resourceOrEditor: URI | IEditorInput | IResourceEditorInput, options: { keyMods?: IKeyMods, preserveFocus?: boolean, range?: IRange, forceOpenSideBySide?: boolean }): Promise<void> {
908+
private async openAnything(resourceOrEditor: URI | IEditorInput | IResourceEditorInput, options: { keyMods?: IKeyMods, preserveFocus?: boolean, range?: IRange, forceOpenSideBySide?: boolean, forcePinned?: boolean }): Promise<void> {
909909
const editorOptions: ITextEditorOptions = {
910910
preserveFocus: options.preserveFocus,
911-
pinned: options.keyMods?.alt || this.configuration.openEditorPinned,
911+
pinned: options.keyMods?.alt || options.forcePinned || this.configuration.openEditorPinned,
912912
selection: options.range ? Range.collapseToStart(options.range) : undefined
913913
};
914914

‎src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
195195

196196
return TriggerAction.CLOSE_PICKER;
197197
},
198-
accept: async (keyMods, event) => this.openSymbol(provider, symbol, token, { keyMods, preserveFocus: event.inBackground }),
198+
accept: async (keyMods, event) => this.openSymbol(provider, symbol, token, { keyMods, preserveFocus: event.inBackground, forcePinned: event.inBackground }),
199199
});
200200
}
201201
}
@@ -208,7 +208,7 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
208208
return symbolPicks;
209209
}
210210

211-
private async openSymbol(provider: IWorkspaceSymbolProvider, symbol: IWorkspaceSymbol, token: CancellationToken, options: { keyMods: IKeyMods, forceOpenSideBySide?: boolean, preserveFocus?: boolean }): Promise<void> {
211+
private async openSymbol(provider: IWorkspaceSymbolProvider, symbol: IWorkspaceSymbol, token: CancellationToken, options: { keyMods: IKeyMods, forceOpenSideBySide?: boolean, preserveFocus?: boolean, forcePinned?: boolean }): Promise<void> {
212212

213213
// Resolve actual symbol to open for providers that can resolve
214214
let symbolToOpen = symbol;
@@ -231,7 +231,7 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
231231
resource: symbolToOpen.location.uri,
232232
options: {
233233
preserveFocus: options?.preserveFocus,
234-
pinned: options.keyMods.alt || this.configuration.openEditorPinned,
234+
pinned: options.keyMods.alt || options.forcePinned || this.configuration.openEditorPinned,
235235
selection: symbolToOpen.location.range ? Range.collapseToStart(symbolToOpen.location.range) : undefined
236236
}
237237
}, options.keyMods.ctrlCmd || options?.forceOpenSideBySide ? SIDE_GROUP : ACTIVE_GROUP);

0 commit comments

Comments
 (0)