gitlab-ai-review 3.6.3 → 3.8.0

package/index.js

@@ -209,10 +209,6 @@ export class GitLabAIReview {
         for (const review of fileReview.reviews) {
           if (review.hasIssue) {
             try {
-              // 找到对应的变更，判断是删除还是新增
-              const relatedChange = meaningfulChanges.find(c => c.lineNumber === review.lineNumber);
-              const isDeletion = relatedChange && relatedChange.type === 'deletion';
-              
               const commentResult = await this.gitlabClient.createLineComment(
                 this.config.project.projectId,
                 this.config.project.mergeRequestIid,
@@ -220,8 +216,7 @@ export class GitLabAIReview {
                 {
                   filePath: fileName,
                   oldPath: change.old_path,
-                  // 删除的行使用 oldLine，新增的行使用 newLine
-                  ...(isDeletion ? { oldLine: review.lineNumber } : { newLine: review.lineNumber }),
+                  newLine: review.lineNumber,
                 }
               );
 
@@ -266,6 +261,66 @@ export class GitLabAIReview {
     return results;
   }
 
+  /**
+   * 智能合并修改块的评论
+   * 如果相邻的删除和新增是同一个修改，合并为一个评论
+   * @param {Array} reviews - AI 返回的审查结果
+   * @param {Array} meaningfulChanges - 有意义的变更列表
+   * @returns {Array} 合并后的审查结果
+   */
+  mergeModificationReviews(reviews, meaningfulChanges) {
+    if (!reviews || reviews.length === 0) return reviews;
+    
+    const merged = [];
+    const processed = new Set();
+    
+    reviews.forEach((review, index) => {
+      if (processed.has(index)) return;
+      
+      const currentChange = meaningfulChanges.find(c => c.lineNumber === review.lineNumber);
+      if (!currentChange) {
+        merged.push(review);
+        return;
+      }
+      
+      // 如果是删除，查找是否有对应的新增（可能是修改）
+      if (currentChange.type === 'deletion') {
+        // 查找相近行号的新增
+        const nextReviewIndex = reviews.findIndex((r, i) => {
+          if (i <= index || processed.has(i)) return false;
+          const nextChange = meaningfulChanges.find(c => c.lineNumber === r.lineNumber);
+          // 相差不超过 5 行，且是新增类型
+          return nextChange && 
+                 nextChange.type === 'addition' && 
+                 Math.abs(nextChange.lineNumber - currentChange.lineNumber) <= 5;
+        });
+        
+        if (nextReviewIndex !== -1) {
+          const nextReview = reviews[nextReviewIndex];
+          const nextChange = meaningfulChanges.find(c => c.lineNumber === nextReview.lineNumber);
+          
+          // 合并为一个修改块的评论
+          merged.push({
+            hasIssue: review.hasIssue || nextReview.hasIssue,
+            oldLine: currentChange.lineNumber,  // 删除行
+            newLine: nextChange.lineNumber,     // 新增行
+            comment: review.hasIssue ? review.comment : nextReview.comment,  // 使用有问题的那个评论
+          });
+          
+          processed.add(index);
+          processed.add(nextReviewIndex);
+          return;
+        }
+      }
+      
+      // 如果不是修改块，保持原样
+      merged.push(review);
+      processed.add(index);
+    });
+    
+    return merged;
+  }
+
   /**
    * 审查单个文件的所有变更（一次 API 调用）
    * @param {Object} change - 代码变更对象
@@ -406,10 +461,6 @@ export class GitLabAIReview {
         for (const review of fileReview.reviews) {
           if (review.hasIssue) {
             try {
-              // 找到对应的变更，判断是删除还是新增
-              const relatedChange = meaningfulChanges.find(c => c.lineNumber === review.lineNumber);
-              const isDeletion = relatedChange && relatedChange.type === 'deletion';
-              
               const commentResult = await this.gitlabClient.createLineComment(
                 this.config.project.projectId,
                 this.config.project.mergeRequestIid,
@@ -417,8 +468,7 @@ export class GitLabAIReview {
                 {
                   filePath: fileName,
                   oldPath: change.old_path,
-                  // 删除的行使用 oldLine，新增的行使用 newLine
-                  ...(isDeletion ? { oldLine: review.lineNumber } : { newLine: review.lineNumber }),
+                  newLine: review.lineNumber,
                 }
               );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab-ai-review",
-  "version": "3.6.3",
+  "version": "3.8.0",
   "description": "GitLab AI Review SDK with Impact Analysis - 支持影响分析、删除符号检测、注释代码识别、文件内部冲突检查、智能文件过滤的智能代码审查工具",
   "main": "index.js",
   "type": "module",