提交 744d9eb8 编写于 作者: S Sandeep Somavarapu

Fix compilation errors

上级 d1571770
......@@ -106,8 +106,8 @@ export abstract class BaseEditor extends Panel implements IEditor {
}
create(parent: HTMLElement): void; // create is sync for editors
create(parent: HTMLElement): TPromise<void>;
create(parent: HTMLElement): TPromise<void> {
create(parent: HTMLElement): Promise<void>;
create(parent: HTMLElement): Promise<void> {
const res = super.create(parent);
// Create Editor
......@@ -122,8 +122,8 @@ export abstract class BaseEditor extends Panel implements IEditor {
protected abstract createEditor(parent: HTMLElement): void;
setVisible(visible: boolean, group?: IEditorGroup): void; // setVisible is sync for editors
setVisible(visible: boolean, group?: IEditorGroup): TPromise<void>;
setVisible(visible: boolean, group?: IEditorGroup): TPromise<void> {
setVisible(visible: boolean, group?: IEditorGroup): Promise<void>;
setVisible(visible: boolean, group?: IEditorGroup): Promise<void> {
const promise = super.setVisible(visible);
// Propagate to Editor
......
......@@ -7,7 +7,6 @@ import 'vs/css!./media/panel';
import * as dom from 'vs/base/browser/dom';
import { IAction } from 'vs/base/common/actions';
import { debounceEvent } from 'vs/base/common/event';
import { TPromise } from 'vs/base/common/winjs.base';
import { CollapseAllAction, DefaultAccessibilityProvider, DefaultController, DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults';
import { isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
import { CommentThreadChangedEvent } from 'vs/editor/common/modes';
......@@ -48,7 +47,7 @@ export class CommentsPanel extends Panel {
super(COMMENTS_PANEL_ID, telemetryService, themeService);
}
public create(parent: HTMLElement): TPromise<void> {
public create(parent: HTMLElement): Promise<void> {
super.create(parent);
dom.addClass(parent, 'comments-panel');
......@@ -94,11 +93,10 @@ export class CommentsPanel extends Panel {
styleElement.innerHTML = content.join('\n');
}
private render(): TPromise<void> {
private async render(): Promise<void> {
dom.toggleClass(this.treeContainer, 'hidden', !this.commentsModel.hasCommentThreads());
return this.tree.setInput(this.commentsModel).then(() => {
this.renderMessage();
});
await this.tree.setInput(this.commentsModel);
this.renderMessage();
}
public getActions(): IAction[] {
......@@ -242,7 +240,7 @@ export class CommentsPanel extends Panel {
return true;
}
public setVisible(visible: boolean): TPromise<void> {
public setVisible(visible: boolean): Promise<void> {
const wasVisible = this.isVisible();
return super.setVisible(visible)
.then(() => {
......
......@@ -75,7 +75,7 @@ export class MarkersPanel extends Panel {
this.setCurrentActiveEditor();
}
public create(parent: HTMLElement): TPromise<void> {
public create(parent: HTMLElement): Promise<void> {
super.create(parent);
this.rangeHighlightDecorations = this._register(this.instantiationService.createInstance(RangeHighlightDecorations));
......@@ -133,7 +133,7 @@ export class MarkersPanel extends Panel {
}
}
public setVisible(visible: boolean): TPromise<void> {
public setVisible(visible: boolean): Promise<void> {
const wasVisible = this.isVisible();
return super.setVisible(visible)
.then(() => {
......@@ -300,10 +300,10 @@ export class MarkersPanel extends Panel {
}
}
private render(): TPromise<void> {
private async render(): Promise<void> {
dom.toggleClass(this.treeContainer, 'hidden', !this.markersWorkbenchService.markersModel.hasFilteredResources());
return this.tree.setInput(this.markersWorkbenchService.markersModel)
.then(() => this.renderMessage());
await this.tree.setInput(this.markersWorkbenchService.markersModel);
this.renderMessage();
}
private renderMessage(): void {
......
......@@ -171,7 +171,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
}
}
public create(parent: HTMLElement): TPromise<void> {
public create(parent: HTMLElement): Promise<void> {
super.create(parent);
this.viewModel = this._register(this.searchWorkbenchService.searchModel);
......@@ -276,7 +276,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
this._register(this.onDidFocus(() => this.viewletFocused.set(true)));
this._register(this.onDidBlur(() => this.viewletFocused.set(false)));
return TPromise.as(null);
return Promise.resolve(null);
}
public get searchAndReplaceWidget(): SearchWidget {
......@@ -661,8 +661,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
}
}
public setVisible(visible: boolean): TPromise<void> {
let promise: TPromise<void>;
public setVisible(visible: boolean): Promise<void> {
let promise: Promise<void>;
this.viewletVisible.set(visible);
if (visible) {
if (this.changedWhileHidden) {
......
......@@ -106,7 +106,7 @@ export class TerminalPanel extends Panel {
this._terminalService.terminalTabs.forEach(t => t.layout(dimension.width, dimension.height));
}
public setVisible(visible: boolean): PromiseLike<void> {
public setVisible(visible: boolean): Promise<void> {
if (visible) {
if (this._terminalService.terminalInstances.length > 0) {
this._updateFont();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册