Don't rely on options from setInput (microsoft#205745)

roblourens · web-flow · commit 5e9e54773a69 · 2024-02-20T12:13:42.000-08:00
Fix microsoft/vscode-copilot-release#914
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
@@ -81,7 +81,7 @@ export class ChatEditor extends EditorPane {
 		super.clearInput();
 	}
 
-	override async setInput(input: ChatEditorInput, options: IChatEditorOptions, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+	override async setInput(input: ChatEditorInput, options: IChatEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		super.setInput(input, options, context, token);
 
 		const editorModel = await input.resolve();
@@ -93,7 +93,7 @@ export class ChatEditor extends EditorPane {
 			throw new Error('ChatEditor lifecycle issue: no editor widget');
 		}
 
-		this.updateModel(editorModel.model, options.viewState);
+		this.updateModel(editorModel.model, options?.viewState ?? input.options.viewState);
 	}
 
 	private updateModel(model: IChatModel, viewState?: IChatViewState): void {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ export class ChatEditor extends EditorPane {`
`81`	`81`	`super.clearInput();`
`82`	`82`	`}`
`83`	`83`
`84`		`- override async setInput(input: ChatEditorInput, options: IChatEditorOptions, context: IEditorOpenContext, token: CancellationToken): Promise<void> {`
	`84`	`+ override async setInput(input: ChatEditorInput, options: IChatEditorOptions \| undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {`
`85`	`85`	`super.setInput(input, options, context, token);`
`86`	`86`
`87`	`87`	`const editorModel = await input.resolve();`
`@@ -93,7 +93,7 @@ export class ChatEditor extends EditorPane {`
`93`	`93`	`throw new Error('ChatEditor lifecycle issue: no editor widget');`
`94`	`94`	`}`
`95`	`95`
`96`		`- this.updateModel(editorModel.model, options.viewState);`
	`96`	`+ this.updateModel(editorModel.model, options?.viewState ?? input.options.viewState);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`private updateModel(model: IChatModel, viewState?: IChatViewState): void {`