development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bring terminal editor's mousedown handling closer in line with tabbed view

Browse source
This commit is contained in:
Daniel Imms 2024-04-02 06:56:08 -07:00
parent 4fe8f60274
commit 6f989eb488
No known key found for this signature in database
GPG key ID: E5CF412B63651C69
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
View file

@ -123,7 +123,8 @@ export class TerminalEditor extends EditorPane {
return;
}
this._register(dom.addDisposableListener(this._editorInstanceElement, 'mousedown', async (event: MouseEvent) => {
if (this._terminalEditorService.instances.length === 0) {
const terminal = this._terminalEditorService.activeInstance;
if (this._terminalEditorService.instances.length === 0 || !terminal) {
return;
}
@ -131,11 +132,9 @@ export class TerminalEditor extends EditorPane {
if (isLinux) {
// Drop selection and focus terminal on Linux to enable middle button paste when click
// occurs on the selection itself.
const terminal = this._terminalEditorService.activeInstance;
terminal?.focus();
terminal.focus();
} else if (this._terminalConfigurationService.config.middleClickBehavior === 'paste') {
const terminal = this._terminalEditorService.activeInstance;
terminal?.paste();
terminal.paste();
}
} else if (event.which === 3) {
const rightClickBehavior = this._terminalConfigurationService.config.rightClickBehavior;
@ -146,11 +145,6 @@ export class TerminalEditor extends EditorPane {
return;
}
else if (rightClickBehavior === 'copyPaste' || rightClickBehavior === 'paste') {
const terminal = this._terminalEditorService.activeInstance;
if (!terminal) {
return;
}
// copyPaste: Shift+right click should open context menu
if (rightClickBehavior === 'copyPaste' && event.shiftKey) {
openContextMenu(this.window, event, this._editorInput?.terminalInstance, this._instanceMenu, this._contextMenuService);