Merge pull request microsoft#183979 from microsoft/roblou/prospective-catshark

roblourens · web-flow · commit fa33ede17074 · 2023-05-31T09:55:59.000-07:00
Two chat fixes
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
@@ -321,7 +321,8 @@ export function registerChatCodeBlockActions() {
 					mac: {
 						primary: KeyMod.WinCtrl | KeyCode.Enter,
 					},
-					weight: KeybindingWeight.EditorContrib
+					weight: KeybindingWeight.EditorContrib,
+					when: CONTEXT_IN_CHAT_SESSION
 				}
 			});
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -239,6 +239,7 @@
 }
 
 .interactive-item-container .interactive-result-editor-wrapper:hover .monaco-toolbar,
+.interactive-item-container .interactive-result-editor-wrapper .monaco-toolbar:focus-within,
 .interactive-item-container .interactive-result-editor-wrapper.focused .monaco-toolbar {
 	display: initial;
 	border-radius: 2px;

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,8 @@ export function registerChatCodeBlockActions() {`
`321`	`321`	`mac: {`
`322`	`322`	`primary: KeyMod.WinCtrl \| KeyCode.Enter,`
`323`	`323`	`},`
`324`		`- weight: KeybindingWeight.EditorContrib`
	`324`	`+ weight: KeybindingWeight.EditorContrib,`
	`325`	`+ when: CONTEXT_IN_CHAT_SESSION`
`325`	`326`	`}`
`326`	`327`	`});`
`327`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,7 @@`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`.interactive-item-container .interactive-result-editor-wrapper:hover .monaco-toolbar,`
	`242`	`+.interactive-item-container .interactive-result-editor-wrapper .monaco-toolbar:focus-within,`
`242`	`243`	`.interactive-item-container .interactive-result-editor-wrapper.focused .monaco-toolbar {`
`243`	`244`	`display: initial;`
`244`	`245`	`border-radius: 2px;`