Skip to content

Commit b58e07b

Browse files
isidornisidorn
committed
openViewlet should return a Thenable
1 parent 3b5247e commit b58e07b

6 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎src/vs/workbench/browser/viewlet.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export class ShowViewletAction extends Action {
136136
this.enabled = !!this.viewletService && !!this.editorGroupService;
137137
}
138138

139-
run(): Promise<any> {
139+
run(): Thenable<any> {
140140

141141
// Pass focus to viewlet if not open or focused
142142
if (this.otherViewletShowing() || !this.sidebarHasFocus()) {

‎src/vs/workbench/electron-browser/actions.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,15 +741,15 @@ export abstract class BaseNavigationAction extends Action {
741741
return Promise.resolve(false);
742742
}
743743

744-
protected navigateOnEditorFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Promise<boolean | IViewlet | IPanel> {
744+
protected navigateOnEditorFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Thenable<boolean | IViewlet | IPanel> {
745745
return Promise.resolve(true);
746746
}
747747

748-
protected navigateOnPanelFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Promise<boolean | IPanel> {
748+
protected navigateOnPanelFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Thenable<boolean | IPanel> {
749749
return Promise.resolve(true);
750750
}
751751

752-
protected navigateOnSidebarFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Promise<boolean | IViewlet> {
752+
protected navigateOnSidebarFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Thenable<boolean | IViewlet> {
753753
return Promise.resolve(true);
754754
}
755755

@@ -763,7 +763,7 @@ export abstract class BaseNavigationAction extends Action {
763763
return this.panelService.openPanel(activePanelId, true);
764764
}
765765

766-
protected navigateToSidebar(): Promise<IViewlet | boolean> {
766+
protected navigateToSidebar(): Thenable<IViewlet | boolean> {
767767
if (!this.partService.isVisible(Parts.SIDEBAR_PART)) {
768768
return Promise.resolve(false);
769769
}
@@ -824,7 +824,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
824824
});
825825
}
826826

827-
protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): Promise<boolean | IViewlet> {
827+
protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): Thenable<boolean | IViewlet> {
828828
if (isPanelPositionDown && isSidebarPositionLeft) {
829829
return this.navigateToSidebar();
830830
}
@@ -880,7 +880,7 @@ export class NavigateRightAction extends BaseNavigationAction {
880880
});
881881
}
882882

883-
protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Promise<boolean | IViewlet> {
883+
protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Thenable<boolean | IViewlet> {
884884
if (!isSidebarPositionLeft) {
885885
return this.navigateToSidebar();
886886
}

‎src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ export class ShowEnabledExtensionsAction extends Action {
11291129
super(id, label, null, true);
11301130
}
11311131

1132-
run(): Promise<void> {
1132+
run(): Thenable<void> {
11331133
return this.viewletService.openViewlet(VIEWLET_ID, true)
11341134
.then(viewlet => viewlet as IExtensionsViewlet)
11351135
.then(viewlet => {
@@ -1152,7 +1152,7 @@ export class ShowInstalledExtensionsAction extends Action {
11521152
super(id, label, null, true);
11531153
}
11541154

1155-
run(): Promise<void> {
1155+
run(): Thenable<void> {
11561156
return this.viewletService.openViewlet(VIEWLET_ID, true)
11571157
.then(viewlet => viewlet as IExtensionsViewlet)
11581158
.then(viewlet => {
@@ -1175,7 +1175,7 @@ export class ShowDisabledExtensionsAction extends Action {
11751175
super(id, label, 'null', true);
11761176
}
11771177

1178-
run(): Promise<void> {
1178+
run(): Thenable<void> {
11791179
return this.viewletService.openViewlet(VIEWLET_ID, true)
11801180
.then(viewlet => viewlet as IExtensionsViewlet)
11811181
.then(viewlet => {
@@ -1207,7 +1207,7 @@ export class ClearExtensionsInputAction extends Action {
12071207
this.enabled = !!value;
12081208
}
12091209

1210-
run(): Promise<void> {
1210+
run(): Thenable<void> {
12111211
return this.viewletService.openViewlet(VIEWLET_ID, true)
12121212
.then(viewlet => viewlet as IExtensionsViewlet)
12131213
.then(viewlet => {
@@ -1234,7 +1234,7 @@ export class ShowBuiltInExtensionsAction extends Action {
12341234
super(id, label, null, true);
12351235
}
12361236

1237-
run(): Promise<void> {
1237+
run(): Thenable<void> {
12381238
return this.viewletService.openViewlet(VIEWLET_ID, true)
12391239
.then(viewlet => viewlet as IExtensionsViewlet)
12401240
.then(viewlet => {
@@ -1257,7 +1257,7 @@ export class ShowOutdatedExtensionsAction extends Action {
12571257
super(id, label, null, true);
12581258
}
12591259

1260-
run(): Promise<void> {
1260+
run(): Thenable<void> {
12611261
return this.viewletService.openViewlet(VIEWLET_ID, true)
12621262
.then(viewlet => viewlet as IExtensionsViewlet)
12631263
.then(viewlet => {
@@ -1280,7 +1280,7 @@ export class ShowPopularExtensionsAction extends Action {
12801280
super(id, label, null, true);
12811281
}
12821282

1283-
run(): Promise<void> {
1283+
run(): Thenable<void> {
12841284
return this.viewletService.openViewlet(VIEWLET_ID, true)
12851285
.then(viewlet => viewlet as IExtensionsViewlet)
12861286
.then(viewlet => {
@@ -1303,7 +1303,7 @@ export class ShowRecommendedExtensionsAction extends Action {
13031303
super(id, label, null, true);
13041304
}
13051305

1306-
run(): Promise<void> {
1306+
run(): Thenable<void> {
13071307
return this.viewletService.openViewlet(VIEWLET_ID, true)
13081308
.then(viewlet => viewlet as IExtensionsViewlet)
13091309
.then(viewlet => {
@@ -1336,7 +1336,7 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
13361336
this.recommendations = recommendations;
13371337
}
13381338

1339-
run(): Promise<any> {
1339+
run(): Thenable<any> {
13401340
return this.viewletService.openViewlet(VIEWLET_ID, true)
13411341
.then(viewlet => viewlet as IExtensionsViewlet)
13421342
.then(viewlet => {
@@ -1379,7 +1379,7 @@ export class InstallRecommendedExtensionAction extends Action {
13791379
this.extensionId = extensionId;
13801380
}
13811381

1382-
run(): Promise<any> {
1382+
run(): Thenable<any> {
13831383
return this.viewletService.openViewlet(VIEWLET_ID, true)
13841384
.then(viewlet => viewlet as IExtensionsViewlet)
13851385
.then(viewlet => {
@@ -1475,7 +1475,7 @@ export class ShowRecommendedKeymapExtensionsAction extends Action {
14751475
super(id, label, null, true);
14761476
}
14771477

1478-
run(): Promise<void> {
1478+
run(): Thenable<void> {
14791479
return this.viewletService.openViewlet(VIEWLET_ID, true)
14801480
.then(viewlet => viewlet as IExtensionsViewlet)
14811481
.then(viewlet => {
@@ -1498,7 +1498,7 @@ export class ShowLanguageExtensionsAction extends Action {
14981498
super(id, label, null, true);
14991499
}
15001500

1501-
run(): Promise<void> {
1501+
run(): Thenable<void> {
15021502
return this.viewletService.openViewlet(VIEWLET_ID, true)
15031503
.then(viewlet => viewlet as IExtensionsViewlet)
15041504
.then(viewlet => {
@@ -1521,7 +1521,7 @@ export class ShowAzureExtensionsAction extends Action {
15211521
super(id, label, null, true);
15221522
}
15231523

1524-
run(): Promise<void> {
1524+
run(): Thenable<void> {
15251525
return this.viewletService.openViewlet(VIEWLET_ID, true)
15261526
.then(viewlet => viewlet as IExtensionsViewlet)
15271527
.then(viewlet => {
@@ -1560,7 +1560,7 @@ export class ChangeSortAction extends Action {
15601560
this.enabled = value && this.query.isValid() && !this.query.equals(query);
15611561
}
15621562

1563-
run(): Promise<void> {
1563+
run(): Thenable<void> {
15641564
return this.viewletService.openViewlet(VIEWLET_ID, true)
15651565
.then(viewlet => viewlet as IExtensionsViewlet)
15661566
.then(viewlet => {
@@ -1598,7 +1598,7 @@ export class ChangeGroupAction extends Action {
15981598
this.query = new Query(query.value, query.sortBy, this.groupBy || query.groupBy);
15991599
}
16001600

1601-
run(): Promise<void> {
1601+
run(): Thenable<void> {
16021602
return this.viewletService.openViewlet(VIEWLET_ID, true)
16031603
.then(viewlet => viewlet as IExtensionsViewlet)
16041604
.then(viewlet => {

‎src/vs/workbench/parts/files/electron-browser/views/explorerView.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
329329
if (visible) {
330330

331331
// If a refresh was requested and we are now visible, run it
332-
let refreshPromise: Thenable<void> = Promise.resolve<void>(null);
332+
let refreshPromise: Thenable<void> = TPromise.as(null);
333333
if (this.shouldRefresh) {
334334
refreshPromise = this.doRefresh();
335335
this.shouldRefresh = false; // Reset flag

‎src/vs/workbench/services/viewlet/browser/viewlet.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export interface IViewletService {
2222
/**
2323
* Opens a viewlet with the given identifier and pass keyboard focus to it if specified.
2424
*/
25-
openViewlet(id: string, focus?: boolean): Promise<IViewlet>;
25+
openViewlet(id: string, focus?: boolean): Thenable<IViewlet>;
2626

2727
/**
2828
* Returns the current active viewlet or null if none.

‎src/vs/workbench/services/viewlet/browser/viewletService.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ export class ViewletService extends Disposable implements IViewletService {
6868
}
6969
}
7070

71-
openViewlet(id: string, focus?: boolean): Promise<IViewlet> {
71+
openViewlet(id: string, focus?: boolean): Thenable<IViewlet> {
7272
if (this.getViewlet(id)) {
73-
return Promise.resolve(this.sidebarPart.openViewlet(id, focus));
73+
return this.sidebarPart.openViewlet(id, focus);
7474
}
75-
return Promise.resolve(this.extensionService.whenInstalledExtensionsRegistered()
75+
return this.extensionService.whenInstalledExtensionsRegistered()
7676
.then(() => {
7777
if (this.getViewlet(id)) {
7878
return this.sidebarPart.openViewlet(id, focus);
7979
}
8080
return null;
81-
}));
81+
});
8282
}
8383

8484
getActiveViewlet(): IViewlet {

0 commit comments

Comments
 (0)