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

"Go to Definition" with multiple definitions and "Peek Definition" change preview editor statuses differently (fix #152914) (#168275)

Browse source
This commit is contained in:
Benjamin Pasero 2022-12-07 09:04:32 +01:00 committed by GitHub
parent c0f6c67a09
commit dd86970478
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
View file

@ -126,7 +126,7 @@ export abstract class ReferencesController implements IEditorContribution {
break;
case 'goto':
if (peekMode) {
this._gotoReference(element);
this._gotoReference(element, true);
} else {
this.openReference(element, false, true);
}
@ -207,7 +207,7 @@ export abstract class ReferencesController implements IEditorContribution {
const editorFocus = this._editor.hasTextFocus();
const previewEditorFocus = this._widget.isPreviewEditorFocused();
await this._widget.setSelection(target);
await this._gotoReference(target);
await this._gotoReference(target, false);
if (editorFocus) {
this._editor.focus();
} else if (this._widget && previewEditorFocus) {
@ -237,7 +237,7 @@ export abstract class ReferencesController implements IEditorContribution {
this._requestIdPool += 1; // Cancel pending requests
}
private _gotoReference(ref: Location): Promise<any> {
private _gotoReference(ref: Location, pinned: boolean): Promise<any> {
this._widget?.hide();
this._ignoreModelChangeEvent = true;
@ -245,7 +245,7 @@ export abstract class ReferencesController implements IEditorContribution {
return this._editorService.openCodeEditor({
resource: ref.uri,
options: { selection: range, selectionSource: TextEditorSelectionSource.JUMP }
options: { selection: range, selectionSource: TextEditorSelectionSource.JUMP, pinned }
}, this._editor).then(openedEditor => {
this._ignoreModelChangeEvent = false;