maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

quick open: clean up mess with how it closes and propagates

Browse source
This commit is contained in:
Benjamin Pasero 2016-08-12 15:11:13 +02:00
parent 7900866a83
commit 312de6b74b
2 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
View file

@ -34,7 +34,7 @@ export interface IQuickOpenCallbacks {
onCancel: () => void;
onType: (value: string) => void;
onShow?: () => void;
onHide?: (focusLost?: boolean) => void;
onHide?: (reason: HideReason) => void;
onFocusLost?: () => boolean /* veto close */;
}
@ -720,14 +720,14 @@ export class QuickOpenWidget implements IModelProvider {
}
// Callbacks
if (reason === HideReason.CANCELED) {
this.callbacks.onCancel();
} else {
if (reason === HideReason.ELEMENT_SELECTED) {
this.callbacks.onOk();
} else {
this.callbacks.onCancel();
}
if (this.callbacks.onHide) {
this.callbacks.onHide(reason === HideReason.FOCUS_LOST);
this.callbacks.onHide(reason);
}
}

30
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
View file

@ -230,8 +230,8 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
onCancel: () => { /* ignore, handle later */ },
onType: (value: string) => { /* ignore, handle later */ },
onShow: () => this.emitQuickOpenVisibilityChange(true),
onHide: (focusLost?: boolean) => {
if (!focusLost) {
onHide: (reason) => {
if (reason !== HideReason.FOCUS_LOST) {
this.restoreFocus(); // focus back to editor unless user clicked somewhere else
}
this.emitQuickOpenVisibilityChange(false); // event
@ -375,8 +375,8 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
onShow: () => {
this.emitQuickOpenVisibilityChange(true); // event
},
onHide: (focusLost?: boolean) => {
if (!focusLost) {
onHide: (reason) => {
if (reason !== HideReason.FOCUS_LOST) {
this.restoreFocus(); // focus back to editor unless user clicked somewhere else
}
this.emitQuickOpenVisibilityChange(false); // event
@ -453,14 +453,16 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
this.quickOpenWidget = new QuickOpenWidget(
withElementById(Identifiers.WORKBENCH_CONTAINER).getHTMLElement(),
{
onOk: () => this.onClose(false),
onCancel: () => this.onCancel(),
onOk: () => { /* ignore */ },
onCancel: () => { /* ignore */ },
onType: (value: string) => this.onType(value || ''),
onShow: () => {
this.inQuickOpenMode.set(true);
this.emitQuickOpenVisibilityChange(true);
},
onHide: (focusLost?: boolean) => {
onHide: (reason) => {
this.onClose(reason);
this.inQuickOpenMode.reset();
// Complete promises that are waiting
@ -468,7 +470,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
this.promisesToCompleteOnHide.pop()(true);
}
if (!focusLost) {
if (reason !== HideReason.FOCUS_LOST) {
this.restoreFocus(); // focus back to editor unless user clicked somewhere else
}
this.emitQuickOpenVisibilityChange(false);
@ -532,15 +534,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
return new QuickOpenModel(entries, this.actionProvider);
}
private onCancel(notifyHandlers = true): void {
// Indicate to handlers
if (notifyHandlers) {
this.onClose(true);
}
}
private onClose(canceled: boolean): void {
private onClose(reason: HideReason): void {
// Clear state
this.previousActiveHandlerDescriptor = null;
@ -549,7 +543,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
for (let prefix in this.mapResolvedHandlersToPrefix) {
if (this.mapResolvedHandlersToPrefix.hasOwnProperty(prefix)) {
let handler = this.mapResolvedHandlersToPrefix[prefix];
handler.onClose(canceled);
handler.onClose(reason === HideReason.CANCELED);
}
}
}