提交 ac8cdbb2 编写于 作者: M Matt Bierner

Strict null check views

上级 455a6970
...@@ -547,6 +547,7 @@ ...@@ -547,6 +547,7 @@
"./vs/workbench/browser/parts/quickopen/quickopen.ts", "./vs/workbench/browser/parts/quickopen/quickopen.ts",
"./vs/workbench/browser/parts/statusbar/statusbar.ts", "./vs/workbench/browser/parts/statusbar/statusbar.ts",
"./vs/workbench/browser/parts/statusbar/statusbarPart.ts", "./vs/workbench/browser/parts/statusbar/statusbarPart.ts",
"./vs/workbench/browser/parts/views/views.ts",
"./vs/workbench/browser/viewlet.ts", "./vs/workbench/browser/viewlet.ts",
"./vs/workbench/common/actions.ts", "./vs/workbench/common/actions.ts",
"./vs/workbench/common/activity.ts", "./vs/workbench/common/activity.ts",
......
...@@ -357,7 +357,7 @@ export class ContributableViewsModel extends Disposable { ...@@ -357,7 +357,7 @@ export class ContributableViewsModel extends Disposable {
} else { } else {
this.viewStates.set(viewDescriptor.id, { this.viewStates.set(viewDescriptor.id, {
visible: !viewDescriptor.hideByDefault, visible: !viewDescriptor.hideByDefault,
collapsed: viewDescriptor.collapsed collapsed: !!viewDescriptor.collapsed
}); });
} }
} }
...@@ -369,7 +369,7 @@ export class ContributableViewsModel extends Disposable { ...@@ -369,7 +369,7 @@ export class ContributableViewsModel extends Disposable {
).reverse(); ).reverse();
const toRemove: { index: number, viewDescriptor: IViewDescriptor }[] = []; const toRemove: { index: number, viewDescriptor: IViewDescriptor }[] = [];
const toAdd: { index: number, viewDescriptor: IViewDescriptor, size: number, collapsed: boolean }[] = []; const toAdd: { index: number, viewDescriptor: IViewDescriptor, size?: number, collapsed: boolean }[] = [];
for (const splice of splices) { for (const splice of splices) {
const startViewDescriptor = this.viewDescriptors[splice.start]; const startViewDescriptor = this.viewDescriptors[splice.start];
...@@ -436,7 +436,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel { ...@@ -436,7 +436,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
} }
private saveViewsStates(): void { private saveViewsStates(): void {
const storedViewsStates: { [id: string]: { collapsed: boolean, size: number, order: number } } = {}; const storedViewsStates: { [id: string]: { collapsed: boolean, size?: number, order?: number } } = {};
let hasState = false; let hasState = false;
for (const viewDescriptor of this.viewDescriptors) { for (const viewDescriptor of this.viewDescriptors) {
...@@ -459,7 +459,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel { ...@@ -459,7 +459,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
for (const viewDescriptor of viewDescriptors) { for (const viewDescriptor of viewDescriptors) {
if (viewDescriptor.canToggleVisibility) { if (viewDescriptor.canToggleVisibility) {
const viewState = this.viewStates.get(viewDescriptor.id); const viewState = this.viewStates.get(viewDescriptor.id);
storedViewsVisibilityStates.set(viewDescriptor.id, { id: viewDescriptor.id, isHidden: viewState ? !viewState.visible : undefined }); storedViewsVisibilityStates.set(viewDescriptor.id, { id: viewDescriptor.id, isHidden: viewState ? !viewState.visible : false });
} }
} }
this.storageService.store(this.hiddenViewsStorageId, JSON.stringify(values(storedViewsVisibilityStates)), StorageScope.GLOBAL); this.storageService.store(this.hiddenViewsStorageId, JSON.stringify(values(storedViewsVisibilityStates)), StorageScope.GLOBAL);
......
...@@ -229,7 +229,7 @@ export const IViewsService = createDecorator<IViewsService>('viewsService'); ...@@ -229,7 +229,7 @@ export const IViewsService = createDecorator<IViewsService>('viewsService');
export interface IViewsService { export interface IViewsService {
_serviceBrand: any; _serviceBrand: any;
openView(id: string, focus?: boolean): Promise<IView>; openView(id: string, focus?: boolean): Promise<IView | null>;
getViewDescriptors(container: ViewContainer): IViewDescriptorCollection; getViewDescriptors(container: ViewContainer): IViewDescriptorCollection;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册