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

fix #46971

Browse Source
This commit is contained in:
Johannes Rieken
2018-04-03 11:43:02 +02:00
parent cc514efa17
commit 70ea06a46f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+8 -4
View File
@@ -658,7 +658,7 @@ export class ReferenceWidget extends PeekViewWidget {
var onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
if (element instanceof OneReference) {
if (kind === 'show') {
this._revealReference(element);
this._revealReference(element, false);
}
this._onDidSelectReference.fire({ element, kind, source: 'tree' });
}
@@ -710,7 +710,7 @@ export class ReferenceWidget extends PeekViewWidget {
}
public setSelection(selection: OneReference): TPromise<any> {
return this._revealReference(selection).then(() => {
return this._revealReference(selection, true).then(() => {
// show in tree
this._tree.setSelection([selection]);
@@ -780,7 +780,7 @@ export class ReferenceWidget extends PeekViewWidget {
return undefined;
}
private _revealReference(reference: OneReference): TPromise<void> {
private async _revealReference(reference: OneReference, revealParent: boolean): TPromise<void> {
// Update widget header
if (reference.uri.scheme !== Schemas.inMemory) {
@@ -791,7 +791,11 @@ export class ReferenceWidget extends PeekViewWidget {
const promise = this._textModelResolverService.createModelReference(reference.uri);
return TPromise.join([promise, this._tree.reveal(reference, 1)]).then(values => {
if (revealParent) {
await this._tree.reveal(reference.parent);
}
return TPromise.join([promise, this._tree.reveal(reference)]).then(values => {
const ref = values[0];
if (!this._model) {