Merge pull request microsoft#208467 from microsoft/tyriar/208413

Tyriar · web-flow · commit 3bd8776d5214 · 2024-03-22T14:21:10.000-07:00
Fix copy action being stolen by terminal chat
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
@@ -115,11 +115,7 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 		}
 		this._register(this._chatCodeBlockContextProviderService.registerProvider({
 			getCodeBlockContext: (editor) => {
-				const chatWidget = this.chatWidget;
-				if (!chatWidget) {
-					return;
-				}
-				if (!editor) {
+				if (!editor || !this._chatWidget?.hasValue || !this.hasFocus()) {
 					return;
 				}
 				return {

Original file line number	Diff line number	Diff line change
`@@ -115,11 +115,7 @@ export class TerminalChatController extends Disposable implements ITerminalContr`
`115`	`115`	`}`
`116`	`116`	`this._register(this._chatCodeBlockContextProviderService.registerProvider({`
`117`	`117`	`getCodeBlockContext: (editor) => {`
`118`		`- const chatWidget = this.chatWidget;`
`119`		`- if (!chatWidget) {`
`120`		`- return;`
`121`		`- }`
`122`		`- if (!editor) {`
	`118`	`+ if (!editor \|\| !this._chatWidget?.hasValue \|\| !this.hasFocus()) {`
`123`	`119`	`return;`
`124`	`120`	`}`
`125`	`121`	`return {`