Skip to content

fix(inline-diff): fix error in calculating lines of code change #4074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bytemain merged 1 commit into from
Oct 10, 2024
Merged

fix(inline-diff): fix error in calculating lines of code change #4074

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 37 additions & 17 deletions packages/ai-native/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export class LivePreviewDiffDecorationModel extends Disposable {
// Parts that require snapshots
private addedRangeDec: EnhanceDecorationsCollection;
private partialEditWidgetList: AcceptPartialEditWidget[] = [];
private removedZoneWidgets: Array<RemovedZoneWidget> = [];
private removedZoneWidgets: RemovedZoneWidget[] = [];
private zone: LineRange;

constructor(private readonly monacoEditor: ICodeEditor) {
Expand Down Expand Up @@ -515,17 +515,29 @@ export class LivePreviewDiffDecorationModel extends Disposable {
return newElement;
}

/**
* 获取当前编辑器的代码采纳状态
* 1. 已经采纳的代码信息
* 2. 还未处理的代码信息
*/
getTotalCodeInfo(): ITotalCodeInfo {
const resolvedList = this.partialEditWidgetList.filter((w) => w.isAccepted);
const unresolvedList = this.partialEditWidgetList.filter((w) => w.isPending);

const resolvedStatus = caculate(resolvedList);
const unresolvedStatus = caculate(unresolvedList);
static computeCodeInfo(
partialEditWidgetList: AcceptPartialEditWidget[],
addedDecList: IEnhanceModelDeltaDecoration[],
removedWidgetList: RemovedZoneWidget[],
): ITotalCodeInfo {
// 代码除了新增和删除行，还需要统计变更行
// 1. 新增 N 行 => N
// 2. 删除 N 行 => N
// 3. 新增 M 行，删除 N 行 => max(M, N)
// 综上所述，变更行数 = sum(list.map(item => max(新增行数, 删除行数)))
const resolvedStatus = caculate(partialEditWidgetList);
const unresolvedStatus = { added: 0, deleted: 0, changed: 0 };
partialEditWidgetList.forEach((v, idx) => {
if (v.status === 'pending') {
const addedDec = addedDecList[idx];
const removedWidget = removedWidgetList[idx];
const addedLinesCount = addedDec?.length || 0;
const deletedLinesCount = removedWidget?.height || 0;
unresolvedStatus.added += addedLinesCount;
unresolvedStatus.deleted += deletedLinesCount;
unresolvedStatus.changed += Math.max(addedLinesCount, deletedLinesCount);
}
});

return {
totalAddedLinesCount: resolvedStatus.added,
Expand All @@ -536,11 +548,6 @@ export class LivePreviewDiffDecorationModel extends Disposable {
unresolvedChangedLinesCount: unresolvedStatus.changed,
};

// 代码除了新增和删除行，还需要统计变更行
// 1. 新增 N 行 => N
// 2. 删除 N 行 => N
// 3. 新增 M 行，删除 N 行 => max(M, N)
// 综上所述，变更行数 = sum(list.map(item => max(新增行数, 删除行数)))
function caculate(list: AcceptPartialEditWidget[]) {
const result = { added: 0, deleted: 0, changed: 0 };
list.forEach((widget) => {
Expand All @@ -554,6 +561,19 @@ export class LivePreviewDiffDecorationModel extends Disposable {
}
}

/**
* 获取当前编辑器的代码采纳状态
* 1. 已经采纳的代码信息
* 2. 还未处理的代码信息
*/
getTotalCodeInfo(): ITotalCodeInfo {
const partialEditWidgetList = this.partialEditWidgetList;
const addedDecList = this.addedRangeDec.getDecorations();
const removedWidgetList = this.removedZoneWidgets;

return LivePreviewDiffDecorationModel.computeCodeInfo(partialEditWidgetList, addedDecList, removedWidgetList);
}

/**
* 记录 partial edit widget 与 added range 的映射关系(主要用于位置计算)
*/
Expand Down