listService: forget about disposed lists

isidorn · isidorn · commit c51d244f4765 · 2018-03-08T17:24:52.000+01:00
diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts
@@ -97,6 +97,10 @@ export class PagedList<T> implements IDisposable {
 		return this.list;
 	}
 
+	get onDidDispose(): Event<void> {
+		return this.list.onDidDispose;
+	}
+
 	get onFocusChange(): Event<IListEvent<T>> {
 		return mapEvent(this.list.onFocusChange, ({ elements, indexes }) => ({ elements: elements.map(e => this._model.get(e)), indexes }));
 	}
@@ -193,4 +197,4 @@ export class PagedList<T> implements IDisposable {
 	dispose(): void {
 		this.list.dispose();
 	}
-}
+}
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
@@ -1059,7 +1059,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 	}
 
 	isDOMFocused(): boolean {
-		return this.view && this.view.domNode === document.activeElement;
+		return this.view.domNode === document.activeElement;
 	}
 
 	getHTMLElement(): HTMLElement {
diff --git a/src/vs/base/parts/tree/browser/treeImpl.ts b/src/vs/base/parts/tree/browser/treeImpl.ts
@@ -131,7 +131,7 @@ export class Tree implements _.ITree {
 	}
 
 	public isDOMFocused(): boolean {
-		return this.view && this.view.isFocused();
+		return this.view.isFocused();
 	}
 
 	public domBlur(): void {
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
@@ -73,7 +73,13 @@ export class ListService implements IListService {
 
 		const result = combinedDisposable([
 			widget.onDidFocus(() => this._lastFocusedWidget = widget),
-			toDisposable(() => this.lists.splice(this.lists.indexOf(registeredList), 1))
+			toDisposable(() => this.lists.splice(this.lists.indexOf(registeredList), 1)),
+			widget.onDidDispose(() => {
+				this.lists = this.lists.filter(l => l !== registeredList);
+				if (this._lastFocusedWidget === widget) {
+					this._lastFocusedWidget = undefined;
+				}
+			})
 		]);
 
 		return result;

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,10 @@ export class PagedList<T> implements IDisposable {`
`97`	`97`	`return this.list;`
`98`	`98`	`}`
`99`	`99`
	`100`	`+ get onDidDispose(): Event<void> {`
	`101`	`+ return this.list.onDidDispose;`
	`102`	`+ }`
	`103`	`+`
`100`	`104`	`get onFocusChange(): Event<IListEvent<T>> {`
`101`	`105`	`return mapEvent(this.list.onFocusChange, ({ elements, indexes }) => ({ elements: elements.map(e => this._model.get(e)), indexes }));`
`102`	`106`	`}`
`@@ -193,4 +197,4 @@ export class PagedList<T> implements IDisposable {`
`193`	`197`	`dispose(): void {`
`194`	`198`	`this.list.dispose();`
`195`	`199`	`}`
`196`		`-}`
	`200`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1059,7 +1059,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {`
`1059`	`1059`	`}`
`1060`	`1060`
`1061`	`1061`	`isDOMFocused(): boolean {`
`1062`		`- return this.view && this.view.domNode === document.activeElement;`
	`1062`	`+ return this.view.domNode === document.activeElement;`
`1063`	`1063`	`}`
`1064`	`1064`
`1065`	`1065`	`getHTMLElement(): HTMLElement {`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ export class Tree implements _.ITree {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`public isDOMFocused(): boolean {`
`134`		`- return this.view && this.view.isFocused();`
	`134`	`+ return this.view.isFocused();`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`public domBlur(): void {`