clean up

Author: meganrogge

src/vs/workbench/contrib/chat/browser/chat.contribution.ts

@@ -180,12 +180,12 @@ class ChatAccessibleViewContribution extends Disposable {
 					},
 					next() {
 						verifiedWidget.focus(focusedItem);
-						verifiedWidget.focusNext(focusedItem.id);
+						verifiedWidget.focusWithId(focusedItem.id, 'next');
 						renderAccessibleView(true, accessibleViewService, widgetService, codeEditorService);
 					},
 					previous() {
 						verifiedWidget.focus(focusedItem);
-						verifiedWidget.focusPrevious(focusedItem.id);
+						verifiedWidget.focusWithId(focusedItem.id, 'previous');
 						renderAccessibleView(true, accessibleViewService, widgetService, codeEditorService);
 					},
 					options: { ariaLabel: nls.localize('chatAccessibleView', "Chat Accessible View"), language: 'typescript', type: AccessibleViewType.View }

src/vs/workbench/contrib/chat/browser/chat.ts

@@ -56,8 +56,7 @@ export interface IChatWidget {
 
 	reveal(item: ChatTreeItem): void;
 	focus(item: ChatTreeItem): void;
-	focusNext(id: string): void;
-	focusPrevious(id: string): void;
+	focusWithId(id: string, type: 'next' | 'previous'): void;
 	getFocus(): ChatTreeItem | undefined;
 	acceptInput(query?: string): void;
 	focusLastMessage(): void;

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -168,44 +168,25 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this.inputPart.focus();
 	}
 
-	focusNext(id: string): void {
+	focusWithId(id: string, type: 'next' | 'previous'): void {
 		const items = this.viewModel?.getItems();
 		if (!items) {
 			return;
 		}
-		const focusedElement = items?.find(i => i.id === id) as any as IChatResponseViewModel;
-		const responseItems = items?.filter(i => isResponseVM(i));
+		const focusedElement = items.find(i => i.id === id);
 		if (!focusedElement) {
 			return;
 		}
-		const currentlyFocusedIndex = responseItems?.indexOf(focusedElement);
-		if (currentlyFocusedIndex === undefined || !responseItems) {
-			return;
-		}
-		if (currentlyFocusedIndex === responseItems.length - 1) {
-			return;
-		}
-		this.focus(responseItems[currentlyFocusedIndex + 1], true);
-	}
-
-	focusPrevious(id: string): void {
-		const items = this.viewModel?.getItems();
-		if (!items) {
-			return;
-		}
-		const focusedElement = items.find(i => i.id === id) as any as IChatResponseViewModel;
 		const responseItems = items.filter(i => isResponseVM(i));
-		if (!focusedElement) {
-			return;
-		}
 		const currentlyFocusedIndex = responseItems?.indexOf(focusedElement);
-		if (!currentlyFocusedIndex || !responseItems) {
+		if (currentlyFocusedIndex === undefined || !responseItems) {
 			return;
 		}
-		if (currentlyFocusedIndex - 1 < 0) {
+		const indexToFocus = type === 'next' ? currentlyFocusedIndex + 1 : currentlyFocusedIndex - 1;
+		if (indexToFocus < 0 || indexToFocus === responseItems.length - 1) {
 			return;
 		}
-		this.focus(responseItems[currentlyFocusedIndex - 1], true);
+		this.focus(responseItems[indexToFocus]);
 	}
 
 	private onDidChangeItems() {
@@ -427,17 +408,15 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this.tree.reveal(item);
 	}
 
-	focus(item: ChatTreeItem, noDomFocus?: boolean): void {
+	focus(item: ChatTreeItem): void {
 		const items = this.tree.getNode(null).children;
 		const node = items.find(i => i.element?.id === item.id);
 		if (!node) {
 			return;
 		}
 
 		this.tree.setFocus([node.element]);
-		// if (!noDomFocus) {
 		this.tree.domFocus();
-		// }
 	}
 
 	async acceptInput(query?: string | IChatReplyFollowup): Promise<void> {