Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 34 additions & 30 deletions src/vs/sessions/contrib/changes/browser/changesView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import { IWorkbenchLayoutService } from '../../../../workbench/services/layout/b
import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
import { CodeReviewStateKind, getCodeReviewFilesFromSessionChanges, getCodeReviewVersion, ICodeReviewService, PRReviewStateKind } from '../../codeReview/browser/codeReviewService.js';
import { IAgentFeedbackService } from '../../agentFeedback/browser/agentFeedbackService.js';
import { IGitRepository, IGitService } from '../../../../workbench/contrib/git/common/gitService.js';
import { GitDiffChange, IGitRepository, IGitService } from '../../../../workbench/contrib/git/common/gitService.js';
import { IGitHubService } from '../../github/browser/githubService.js';
import { CIStatusWidget } from './ciStatusWidget.js';
import { arrayEqualsC } from '../../../../base/common/equals.js';
Expand Down Expand Up @@ -222,6 +222,36 @@ function buildTreeChildren(items: IChangesFileItem[]): IObjectTreeElement<Change
return convert(root);
}

function toChangesFileItem(changes: GitDiffChange[], modifiedRef: string | undefined, originalRef: string | undefined): IChangesFileItem[] {
return changes.map(change => {
const isDeletion = change.modifiedUri === undefined;
const isAddition = change.originalUri === undefined;
const uri = change.modifiedUri ?? change.uri;
const fileUri = isDeletion
? uri
: modifiedRef
? uri.with({ scheme: 'git', query: JSON.stringify({ path: uri.fsPath, ref: modifiedRef }) })
: uri;
const originalUri = isAddition
? change.originalUri
: originalRef
? fileUri.with({ scheme: 'git', query: JSON.stringify({ path: fileUri.fsPath, ref: originalRef }) })
: change.originalUri;
return {
type: 'file',
uri: fileUri,
originalUri,
state: ModifiedFileEntryState.Accepted,
isDeletion,
changeType: isDeletion ? 'deleted' : isAddition ? 'added' : 'modified',
linesAdded: change.insertions,
linesRemoved: change.deletions,
reviewCommentCount: 0,
agentFeedbackCount: 0,
} satisfies IChangesFileItem;
});
}

// --- View Model

class ChangesViewModel extends Disposable {
Expand Down Expand Up @@ -743,41 +773,15 @@ export class ChangesViewPane extends ViewPane {

const diffChanges = lastTurnDiffChanges ?? [];

const ref = lastCheckpointRef
const modifiedRef = lastCheckpointRef
? lastCheckpointRef
: headCommit;

const parentRef = lastCheckpointRef
const originalRef = lastCheckpointRef
? `${lastCheckpointRef}^`
: headCommit ? `${headCommit}^` : undefined;

sourceEntries = diffChanges.map(change => {
const isDeletion = change.modifiedUri === undefined;
const isAddition = change.originalUri === undefined;
const uri = change.modifiedUri ?? change.uri;
const fileUri = isDeletion
? uri
: ref
? uri.with({ scheme: 'git', query: JSON.stringify({ path: uri.fsPath, ref }) })
: uri;
const originalUri = isAddition
? change.originalUri
: parentRef
? fileUri.with({ scheme: 'git', query: JSON.stringify({ path: fileUri.fsPath, ref: parentRef }) })
: change.originalUri;
return {
type: 'file',
uri: fileUri,
originalUri,
state: ModifiedFileEntryState.Accepted,
isDeletion,
changeType: isDeletion ? 'deleted' : isAddition ? 'added' : 'modified',
linesAdded: change.insertions,
linesRemoved: change.deletions,
reviewCommentCount: 0,
agentFeedbackCount: 0,
} satisfies IChangesFileItem;
});
sourceEntries = toChangesFileItem(diffChanges, modifiedRef, originalRef);
} else {
sourceEntries = [...sessionFiles];
}
Expand Down
Loading