working set changed files improvements (microsoft#262183)

Author: justschen

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

@@ -47,6 +47,25 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		return this._textModelChangeService.diffInfo.map(diff => diff.changes.length);
 	}
 
+	get linesAdded() {
+		return this._textModelChangeService.diffInfo.map(diff => {
+			let added = 0;
+			for (const c of diff.changes) {
+				added += Math.max(0, c.modified.endLineNumberExclusive - c.modified.startLineNumber);
+			}
+			return added;
+		});
+	}
+	get linesRemoved() {
+		return this._textModelChangeService.diffInfo.map(diff => {
+			let removed = 0;
+			for (const c of diff.changes) {
+				removed += Math.max(0, c.original.endLineNumberExclusive - c.original.startLineNumber);
+			}
+			return removed;
+		});
+	}
+
 	readonly originalURI: URI;
 	private readonly _textModelChangeService: ChatEditingTextModelChangeService;
 

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

@@ -325,6 +325,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	readonly inputUri: URI;
 
+	private _workingSetLinesAddedSpan?: HTMLElement;
+	private _workingSetLinesRemovedSpan?: HTMLElement;
+
 	private readonly _chatEditsActionsDisposables: DisposableStore;
 	private readonly _chatEditsDisposables: DisposableStore;
 	private _chatEditsContainer?: HTMLElement;
@@ -1611,18 +1614,58 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			secondary: true,
 			ariaLabel: localize('chatEditingSession.toggleWorkingSet', 'Toggle changed files.'),
 		}));
-		button.label = entries.length === 1 ? localize('chatEditingSession.oneFile.1', '1 file changed') : localize('chatEditingSession.manyFiles.1', '{0} files changed', entries.length);
+
+		let added = 0;
+		let removed = 0;
+		if (chatEditingSession) {
+			for (const entry of chatEditingSession.entries.get()) {
+				if (entry.linesAdded && entry.linesRemoved) {
+					added += entry.linesAdded.get();
+					removed += entry.linesRemoved.get();
+				}
+			}
+		}
+
+		const baseLabel = entries.length === 1 ? localize('chatEditingSession.oneFile.1', '1 file changed') : localize('chatEditingSession.manyFiles.1', '{0} files changed', entries.length);
+		button.label = baseLabel;
+
+		if (!this._workingSetLinesAddedSpan) {
+			this._workingSetLinesAddedSpan = dom.$('.working-set-lines-added');
+		}
+		if (!this._workingSetLinesRemovedSpan) {
+			this._workingSetLinesRemovedSpan = dom.$('.working-set-lines-removed');
+		}
+
+		const countsContainer = dom.$('.working-set-line-counts');
+		button.element.appendChild(countsContainer);
+		countsContainer.appendChild(this._workingSetLinesAddedSpan);
+		countsContainer.appendChild(this._workingSetLinesRemovedSpan);
+
+		this._workingSetLinesAddedSpan.textContent = `+${added}`;
+		this._workingSetLinesRemovedSpan.textContent = `-${removed}`;
+		button.element.setAttribute('aria-label', localize('chatEditingSession.ariaLabelWithCounts', '{0}, {1} lines added, {2} lines removed', baseLabel, added, removed));
 
 		const applyCollapseState = () => {
 			button.icon = this._workingSetCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
 			workingSetContainer.classList.toggle('collapsed', this._workingSetCollapsed);
 			this._onDidChangeHeight.fire();
 		};
 
-		this._chatEditsActionsDisposables.add(button.onDidClick(() => {
+		const toggleWorkingSet = () => {
 			this._workingSetCollapsed = !this._workingSetCollapsed;
 			applyCollapseState();
+		};
 
+		this._chatEditsActionsDisposables.add(button.onDidClick(() => { toggleWorkingSet(); }));
+		this._chatEditsActionsDisposables.add(addDisposableListener(overviewRegion, 'click', e => {
+			if (e.defaultPrevented) {
+				return;
+			}
+			const target = e.target as HTMLElement;
+			if (target.closest('.monaco-button')) {
+				return;
+			}
+			toggleWorkingSet();
 		}));
 
 		applyCollapseState();

src/vs/workbench/contrib/chat/browser/media/chat.css

@@ -741,6 +741,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	justify-content: space-between;
 	gap: 6px;
 	padding-right: 4px;
+	cursor: pointer;
 }
 
 .interactive-session .chat-editing-session .chat-editing-session-container .chat-editing-session-overview > .working-set-title {
@@ -756,6 +757,22 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	color: var(--vscode-notificationsWarningIcon-foreground);
 }
 
+/* Inline added/removed line count styling */
+.interactive-session .chat-editing-session .chat-editing-session-container .chat-editing-session-overview .working-set-line-counts {
+	display: inline-flex;
+	gap: 4px;
+	margin-left: 6px;
+	font-weight: 500;
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-container .chat-editing-session-overview .working-set-line-counts .working-set-lines-added {
+	color: var(--vscode-chat-linesAddedForeground);
+}
+
+.interactive-session .chat-editing-session .chat-editing-session-container .chat-editing-session-overview .working-set-line-counts .working-set-lines-removed {
+	color: var(--vscode-chat-linesRemovedForeground);
+}
+
 .interactive-session .chat-editing-session .working-set-title {
 
 	.monaco-button {
@@ -766,10 +783,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 		color: var(--vscode-foreground)
 	}
 
-	.monaco-button:hover {
-		background-color: var(--vscode-toolbar-hoverBackground);
-	}
-
 	.monaco-button:focus-visible {
 		outline-offset: -1px !important;
 	}

src/vs/workbench/contrib/chat/common/chatEditingService.ts

@@ -257,6 +257,16 @@ export interface IModifiedFileEntry {
 	 */
 	readonly changesCount: IObservable<number>;
 
+	/**
+	 * Number of lines added in this entry.
+	 */
+	readonly linesAdded?: IObservable<number>;
+
+	/**
+	 * Number of lines removed in this entry
+	 */
+	readonly linesRemoved?: IObservable<number>;
+
 	getEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
 }