Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-19 14:49:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90109 from GustavoASC/master

Browse Source 
Fixed bug where one could open 'peek' inside 'peek' on definition link
This commit is contained in:
Johannes Rieken
2020-02-06 12:17:11 +01:00
committed by GitHub
parent 2c7809ec59 564cb5b82b
commit 8a4873dbba
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition.ts
+14 -3
View File
@@ -28,6 +28,9 @@ import { Position } from 'vs/editor/common/core/position';
import { withNullAsUndefined } from 'vs/base/common/types';
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { EditorOption } from 'vs/editor/common/config/editorOptions';
import { PeekContext } from 'vs/editor/contrib/peekView/peekView';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
export class GotoDefinitionAtPositionEditorContribution implements IEditorContribution {
@@ -335,9 +338,17 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
private gotoDefinition(position: Position, openToSide: boolean): Promise<any> {
this.editor.setPosition(position);
const openInPeek = this.editor.getOption(EditorOption.definitionLinkOpensInPeek);
const action = new DefinitionAction({ openToSide, openInPeek: openInPeek, muteMessage: true }, { alias: '', label: '', id: '', precondition: undefined });
return this.editor.invokeWithinContext(accessor => action.run(accessor, this.editor));
const definitionLinkOpensInPeek = this.editor.getOption(EditorOption.definitionLinkOpensInPeek);
return this.editor.invokeWithinContext((accessor) => {
const canPeek = definitionLinkOpensInPeek && !this.isInPeekEditor(accessor);
const action = new DefinitionAction({ openToSide, openInPeek: canPeek, muteMessage: true }, { alias: '', label: '', id: '', precondition: undefined });
return action.run(accessor, this.editor);
});
}
private isInPeekEditor(accessor: ServicesAccessor): boolean | undefined {
const contextKeyService = accessor.get(IContextKeyService);
return PeekContext.inPeekEditor.getValue(contextKeyService);
}
public dispose(): void {