gitlab-ai-review 3.1.0 → 3.2.0

package/index.js

@@ -289,7 +289,26 @@ export class GitLabAIReview {
         jsonStr = jsonStr.slice(3, -3).trim();
       }
 
+      // 清理非 JSON 标准的值
+      jsonStr = jsonStr
+        .replace(/:\s*undefined/g, ': null')      // undefined → null
+        .replace(/:\s*NaN/g, ': null')            // NaN → null
+        .replace(/:\s*Infinity/g, ': null');      // Infinity → null
+
       const result = JSON.parse(jsonStr);
+      
+      // 验证并过滤无效的 reviews
+      if (result.reviews && Array.isArray(result.reviews)) {
+        result.reviews = result.reviews.filter(review => {
+          // 过滤掉 lineNumber 无效的项
+          if (typeof review.lineNumber !== 'number' || isNaN(review.lineNumber)) {
+            console.warn(`  ⚠️  跳过无效的审查结果：lineNumber = ${review.lineNumber}`);
+            return false;
+          }
+          return true;
+        });
+      }
+      
       return result;
     } catch (error) {
       console.error('解析 AI 返回的 JSON 失败:', error.message);
@@ -446,7 +465,26 @@ export class GitLabAIReview {
         jsonStr = jsonStr.slice(3, -3).trim();
       }
 
+      // 清理非 JSON 标准的值
+      jsonStr = jsonStr
+        .replace(/:\s*undefined/g, ': null')      // undefined → null
+        .replace(/:\s*NaN/g, ': null')            // NaN → null
+        .replace(/:\s*Infinity/g, ': null');      // Infinity → null
+
       const result = JSON.parse(jsonStr);
+      
+      // 验证并过滤无效的 reviews
+      if (result.reviews && Array.isArray(result.reviews)) {
+        result.reviews = result.reviews.filter(review => {
+          // 过滤掉 lineNumber 无效的项
+          if (typeof review.lineNumber !== 'number' || isNaN(review.lineNumber)) {
+            console.warn(`  ⚠️  跳过无效的审查结果：lineNumber = ${review.lineNumber}`);
+            return false;
+          }
+          return true;
+        });
+      }
+      
       return result;
     } catch (error) {
       console.error('解析 AI 返回的 JSON 失败:', error.message);

package/lib/impact-analyzer.js

@@ -59,13 +59,14 @@ export function extractImportsExports(content, fileName) {
  * 从 diff 中提取变更的函数/类/组件名称
  * @param {string} diff - diff 内容
  * @param {string} fileName - 文件名
- * @returns {Object} 变更的符号列表 { added: [], deleted: [], modified: [] }
+ * @returns {Object} 变更的符号列表 { added: [], deleted: [], modified: [], commented: [] }
  */
 export function extractChangedSymbols(diff, fileName) {
-  if (!diff) return { added: [], deleted: [], modified: [] };
+  if (!diff) return { added: [], deleted: [], modified: [], commented: [] };
   
   const addedSymbols = [];
   const deletedSymbols = [];
+  const commentedSymbols = [];  // 新增：被注释掉的符号
   const lines = diff.split('\n');
   
   // 匹配函数、类、常量定义
@@ -84,55 +85,113 @@ export function extractChangedSymbols(diff, fileName) {
     if (isAddition || isDeletion) {
       const cleanLine = line.substring(1); // 移除 +/- 前缀
       
-      // 检查定义
-      definitionPatterns.forEach(pattern => {
-        const match = cleanLine.match(pattern);
-        if (match) {
-          const symbol = {
-            name: match[1],
-            type: 'definition',
-            line: index + 1,
-          };
+      // 检查是否是"注释掉代码"的情况
+      if (isAddition && isDeletion) {
+        // 这种情况不会发生在单行中
+      } else if (isAddition) {
+        // 检查新增的行是否是注释掉的代码
+        const trimmedLine = cleanLine.trim();
+        
+        // 判断是否是注释行
+        const isComment = trimmedLine.startsWith('//') || 
+                         trimmedLine.startsWith('/*') || 
+                         trimmedLine.startsWith('*');
+        
+        if (isComment) {
+          // 提取注释后的代码
+          const codeAfterComment = trimmedLine.replace(/^\/\/\s*/, '')
+                                              .replace(/^\/\*\s*/, '')
+                                              .replace(/^[\*\s]*/, '');
           
-          if (isAddition) {
-            addedSymbols.push(symbol);
-          } else {
-            deletedSymbols.push(symbol);
-          }
-        }
-      });
-      
-      // 匹配函数调用
-      if (isAddition) {
-        const callPattern = /(\w+)\s*\(/g;
-        let callMatch;
-        while ((callMatch = callPattern.exec(cleanLine)) !== null) {
-          addedSymbols.push({
-            name: callMatch[1],
-            type: 'usage',
-            line: index + 1,
+          // 检查注释后的内容是否包含定义
+          definitionPatterns.forEach(pattern => {
+            const match = codeAfterComment.match(pattern);
+            if (match) {
+              commentedSymbols.push({
+                name: match[1],
+                type: 'commented',
+                line: index + 1,
+                originalCode: codeAfterComment,
+              });
+            }
+          });
+        } else {
+          // 正常的新增代码
+          definitionPatterns.forEach(pattern => {
+            const match = cleanLine.match(pattern);
+            if (match) {
+              addedSymbols.push({
+                name: match[1],
+                type: 'definition',
+                line: index + 1,
+              });
+            }
           });
+          
+          // 匹配函数调用
+          const callPattern = /(\w+)\s*\(/g;
+          let callMatch;
+          while ((callMatch = callPattern.exec(cleanLine)) !== null) {
+            addedSymbols.push({
+              name: callMatch[1],
+              type: 'usage',
+              line: index + 1,
+            });
+          }
         }
+      } else if (isDeletion) {
+        // 删除的代码
+        definitionPatterns.forEach(pattern => {
+          const match = cleanLine.match(pattern);
+          if (match) {
+            deletedSymbols.push({
+              name: match[1],
+              type: 'definition',
+              line: index + 1,
+            });
+          }
+        });
       }
     }
   });
   
-  // 找出被修改的符号（既被删除又被添加）
+  // 检测"注释掉"的模式：删除了代码，然后添加了注释版本
+  // 对于每个被注释的符号，检查是否有对应的删除
+  const commentedAsDeleted = [];
+  commentedSymbols.forEach(commented => {
+    const wasDeleted = deletedSymbols.find(del => del.name === commented.name);
+    if (wasDeleted) {
+      // 这个符号被注释掉了（相当于删除）
+      commentedAsDeleted.push({
+        name: commented.name,
+        type: 'commented-out',
+        line: commented.line,
+        wasDeleted: true,
+      });
+    }
+  });
+  
+  // 将"被注释掉"的符号也算作删除
+  const allDeleted = [...deletedSymbols, ...commentedAsDeleted];
+  
+  // 找出被修改的符号（既被删除又被添加，但不是注释掉）
   const modifiedSymbols = [];
   const deletedNames = new Set(deletedSymbols.map(s => s.name));
   const addedNames = new Set(addedSymbols.map(s => s.name));
+  const commentedNames = new Set(commentedAsDeleted.map(s => s.name));
   
   deletedNames.forEach(name => {
-    if (addedNames.has(name)) {
+    if (addedNames.has(name) && !commentedNames.has(name)) {
       modifiedSymbols.push({ name, type: 'modified' });
     }
   });
   
   return {
     added: addedSymbols,
-    deleted: deletedSymbols,
+    deleted: allDeleted,  // 包含注释掉的符号
     modified: modifiedSymbols,
-    all: [...addedSymbols, ...deletedSymbols], // 所有变更的符号
+    commented: commentedAsDeleted,  // 单独记录被注释掉的符号
+    all: [...addedSymbols, ...allDeleted], // 所有变更的符号
   };
 }
 

package/lib/prompt-tools.js

@@ -132,15 +132,18 @@ export function buildFileReviewWithImpactPrompt(fileName, meaningfulChanges, imp
     
     // 变更的符号统计
     if (impactAnalysis.changedSymbols) {
-      const { added, deleted, modified } = impactAnalysis.changedSymbols;
+      const { added, deleted, modified, commented } = impactAnalysis.changedSymbols;
       
-      if (added.length > 0 || deleted.length > 0 || modified.length > 0) {
+      if (added.length > 0 || deleted.length > 0 || modified.length > 0 || (commented && commented.length > 0)) {
         prompt += `**符号变更统计**:\n`;
         if (added.length > 0) {
           prompt += `- 新增: ${added.length} 个\n`;
         }
         if (deleted.length > 0) {
-          prompt += `- 删除: ${deleted.length} 个 ⚠️\n`;
+          prompt += `- 删除/注释掉: ${deleted.length} 个 ⚠️\n`;
+        }
+        if (commented && commented.length > 0) {
+          prompt += `  (其中 ${commented.length} 个是被注释掉的代码)\n`;
         }
         if (modified.length > 0) {
           prompt += `- 修改: ${modified.length} 个 ⚠️\n`;
@@ -150,11 +153,12 @@ export function buildFileReviewWithImpactPrompt(fileName, meaningfulChanges, imp
       
       // 被删除的符号详情
       if (deleted.length > 0) {
-        const deletedDefs = deleted.filter(s => s.type === 'definition');
+        const deletedDefs = deleted.filter(s => s.type === 'definition' || s.type === 'commented-out');
         if (deletedDefs.length > 0) {
-          prompt += `**⚠️ 被删除的函数/类/组件** (${deletedDefs.length} 个):\n`;
+          prompt += `**⚠️ 被删除/注释掉的函数/类/组件** (${deletedDefs.length} 个):\n`;
           deletedDefs.slice(0, 10).forEach(symbol => {
-            prompt += `- \`${symbol.name}\`\n`;
+            const status = symbol.type === 'commented-out' ? ' (注释掉)' : '';
+            prompt += `- \`${symbol.name}\`${status}\n`;
           });
           prompt += `\n`;
         }
@@ -283,6 +287,23 @@ export function buildFileReviewWithImpactPrompt(fileName, meaningfulChanges, imp
 }
 \`\`\`
 
+**🚨 关键规则：**
+- lineNumber 必须是上面"代码变更"中列出的行号（如第 15 行、第 20 行等）
+- **不要使用其他文件的行号**，即使发现其他文件受影响
+- 如果发现其他文件受影响，在当前变更行的 comment 中说明影响范围
+- lineNumber 必须是数字，不能是 null、undefined 或其他值
+- 如果某个变更没有问题，可以不在 reviews 中包含它
+
+**示例：**
+如果删除了第 15 行的函数，且发现其他文件在使用：
+\`\`\`json
+{
+  "lineNumber": 15,
+  "hasIssue": true,
+  "comment": "删除函数 fetchData 会导致以下文件调用失败：components/UserList.vue (第 45 行)、pages/Dashboard.vue (第 78 行)。建议保留该函数或提供替代方案。"
+}
+\`\`\`
+
 11. 如果所有代码都没有问题，返回空的 reviews 数组：\`{"reviews": []}\`
 12. 只返回 JSON，不要包含其他文字说明
 13. comment 字段必须使用中文，要简洁明了，重点指出影响范围`;

package/package.json

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