checkpoints + edits fix: selecting in code block and checkpoint color (#257567)

justschen · web-flow · commit c10aee1fec97 · 2025-07-24T03:25:06.000+02:00
checkpoints + edits fix: selecting in code block and checkpoint highlight
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
@@ -57,6 +57,7 @@
 		"--vscode-chat-requestBorder",
 		"--vscode-chat-requestBubbleBackground",
 		"--vscode-chat-requestBubbleHoverBackground",
+		"--vscode-chat-checkpointSeparator",
 		"--vscode-chat-requestCodeBorder",
 		"--vscode-chat-slashCommandBackground",
 		"--vscode-chat-slashCommandForeground",
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -1289,21 +1289,36 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			if (this.configService.getValue<string>('chat.editRequests') === 'inline' && !this.disableEdits) {
 				markdownPart.domNode.classList.add('clickable');
 				markdownPart.addDisposable(dom.addDisposableListener(markdownPart.domNode, dom.EventType.CLICK, (e: MouseEvent) => {
-					if (this.viewModel?.editing?.id !== element.id) {
-						const selection = dom.getWindow(templateData.rowContainer).getSelection();
-						if (selection && !selection.isCollapsed && selection.toString().length > 0) {
-							return;
-						}
+					if (this.viewModel?.editing?.id === element.id) {
+						return;
+					}
+
+					// Don't handle clicks on links
+					const clickedElement = e.target as HTMLElement;
+					if (clickedElement.tagName === 'A') {
+						return;
+					}
 
-						const clickedElement = e.target as HTMLElement;
-						if (clickedElement.tagName === 'A') {
+					// Don't handle if there's a text selection in the window
+					const selection = dom.getWindow(templateData.rowContainer).getSelection();
+					if (selection && !selection.isCollapsed && selection.toString().length > 0) {
+						return;
+					}
+
+					// Don't handle if there's a selection in code block
+					const monacoEditor = dom.findParentWithClass(clickedElement, 'monaco-editor');
+					if (monacoEditor) {
+						const editorPart = Array.from(this.editorsInUse()).find(editor =>
+							editor.element.contains(monacoEditor));
+
+						if (editorPart?.editor.getSelection()?.isEmpty() === false) {
 							return;
 						}
-
-						e.preventDefault();
-						e.stopPropagation();
-						this._onDidClickRequest.fire(templateData);
 					}
+
+					e.preventDefault();
+					e.stopPropagation();
+					this._onDidClickRequest.fire(templateData);
 				}));
 				this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), markdownPart.domNode, localize('requestMarkdownPartTitle', "Click to Edit"), { trapFocus: true }));
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -2095,7 +2095,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 		position: relative;
 
 		.checkpoint-divider {
-			border-top: 1px dashed var(--vscode-editorWidget-border);
+			border-top: 1px dashed var(--vscode-chat-checkpointSeparator);
 			margin: 15px 0;
 			width: 100%;
 			height: 0;
@@ -2111,7 +2111,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 		.codicon-container .codicon {
 			font-size: 14px;
-			color: var(--vscode-editorWidget-border);
+			color: var(--vscode-chat-checkpointSeparator);
 		}
 
 		.monaco-toolbar {
diff --git a/src/vs/workbench/contrib/chat/common/chatColors.ts b/src/vs/workbench/contrib/chat/common/chatColors.ts
@@ -60,6 +60,10 @@ export const chatRequestBubbleBackground = registerColor('chat.requestBubbleBack
 
 export const chatRequestBubbleHoverBackground = registerColor('chat.requestBubbleHoverBackground', { dark: editorSelectionBackground, light: editorSelectionBackground, hcDark: null, hcLight: null }, localize('chat.requestBubbleHoverBackground', 'Background color of the chat request bubble on hover.'), true);
 
+export const chatCheckpointSeparator = registerColor('chat.checkpointSeparator',
+	{ dark: '#585858', light: '#a9a9a9', hcDark: '#a9a9a9', hcLight: '#a5a5a5' },
+	localize('chatCheckpointSeparator', "Chat checkpoint separator color."));
+
 export const chatLinesAddedForeground = registerColor(
 	'chat.linesAddedForeground',
 	{ dark: '#54B054', light: '#107C10', hcDark: '#54B054', hcLight: '#107C10' },
