microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-12 22:08:04 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

return empty promise, don't reveal undefined, fixes #6739

Browse Source
This commit is contained in:
Johannes Rieken
2016-05-25 09:16:37 +02:00
parent 5c3cb6cf5c
commit d122090933
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/editor/contrib/referenceSearch/browser/referencesController.ts
View File

@@ -119,7 +119,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
&& getConfigurationValue(this._configurationService.getConfiguration(), 'editor.stablePeek', false)) {
// when stable peek is configured we don't close
// the peek window on selecting the editor
// the peek window on selecting the editor
break;
}
case 'side':
@@ -163,13 +163,15 @@ export class ReferencesController implements editorCommon.IEditorContribution {
return this._widget.setModel(this._model).then(() => {
// set title
this._widget.setMetaTitle(options.getMetaTitle(model));
this._widget.setMetaTitle(options.getMetaTitle(this._model));
// set 'best' selection
let uri = this._editor.getModel().uri;
let pos = { lineNumber: range.startLineNumber, column: range.startColumn };
let selection = this._model.nearestReference(uri, pos);
return this._widget.setSelection(selection);
if (selection) {
return this._widget.setSelection(selection);
}
});
}, error => {

2
src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts
View File

@@ -621,7 +621,7 @@ export class ReferenceWidget extends PeekViewWidget {
if (this._model.empty) {
this.setTitle('');
this._messageContainer.innerHtml(nls.localize('noResults', "No results")).show();
return;
return TPromise.as(void 0);
}
this._messageContainer.hide();