fix:修正自检错误

Author: yefansky

src/cvbManager.ts

@@ -509,54 +509,72 @@ export function mergeCvb(baseCvb: Cvb, tcvb: TCVB) : Cvb
 
 function diagnoseMatchFailure(strContent: string, op: ExactReplaceOperation): string 
 {
-    function findLineNumber(content: string, pattern: RegExp): number[] 
+    function findLineNumberRange(content: string, pattern: RegExp): [number, number] 
     {
-        const lines = content.split("\n");
-        return lines
-            .map((line, index) => (pattern.test(line) ? index + 1 : -1))
-            .filter(index => index !== -1);
+        let match;
+        let minLine = -1, maxLine = -1;
+        while ((match = pattern.exec(content)) !== null) 
+        {
+            const matchStartLine = content.substring(0, match.index).split("\n").length;
+            if (minLine === -1 || matchStartLine < minLine) 
+            {
+                minLine = matchStartLine;
+            }
+            if (matchStartLine > maxLine) 
+            {
+                maxLine = matchStartLine;
+            }
+        }
+        return [minLine, maxLine];
     }
 
     let errorMessages: string[] = [];
-    const beforeAnchorPattern = new RegExp(op.m_strBeforeAnchor, "gm");
-    const afterAnchorPattern = new RegExp(op.m_strAfterAnchor, "gm");
-    const oldContentPattern = new RegExp(op.m_strOldContent, "gm");
+    const beforeAnchorPattern = new RegExp(normalizeLineWhitespace(escapeRegExp(op.m_strBeforeAnchor)), "gs");
+    const afterAnchorPattern = new RegExp(normalizeLineWhitespace(escapeRegExp(op.m_strAfterAnchor)), "gs");
+    const oldContentPattern = new RegExp(normalizeLineWhitespace(escapeRegExp(op.m_strOldContent)), "gs");
 
-    const beforeAnchorLines = findLineNumber(strContent, beforeAnchorPattern);
-    const afterAnchorLines = findLineNumber(strContent, afterAnchorPattern);
-    const oldContentLines = findLineNumber(strContent, oldContentPattern);
+    const beforeAnchorRange = findLineNumberRange(strContent, beforeAnchorPattern);
+    const afterAnchorRange = findLineNumberRange(strContent, afterAnchorPattern);
+    const oldContentRange = findLineNumberRange(strContent, oldContentPattern);
 
-    if (beforeAnchorLines.length === 0) 
+    if (beforeAnchorRange[0] === -1) 
     {
         errorMessages.push(`FILE: ${op.m_strFilePath} 未找到 BEFORE_ANCHOR:\n\`\`\`\n${op.m_strBeforeAnchor}\n\`\`\``);
+        console.log(`FILE: ${op.m_strFilePath} 未找到 BEFORE_ANCHOR:\n\`\`\`\n${op.m_strBeforeAnchor}\n\`\`\`\n表达式\n${beforeAnchorPattern}`);
     }
-    
-    if (afterAnchorLines.length === 0) 
+
+    if (afterAnchorRange[0] === -1) 
     {
         errorMessages.push(`FILE: ${op.m_strFilePath} 未找到 AFTER_ANCHOR:\n\`\`\`\n${op.m_strAfterAnchor}\n\`\`\``);
+        console.log(`FILE: ${op.m_strFilePath} 未找到 AFTER_ANCHOR:\n\`\`\`\n${op.m_strAfterAnchor}\n\`\`\`\n表达式\n${afterAnchorPattern}`);
     }
-    
-    if (oldContentLines.length === 0) 
+
+    if (oldContentRange[0] === -1) 
     {
         errorMessages.push(`FILE: ${op.m_strFilePath} 未找到 OLD_CONTENT:\n\`\`\`\n${op.m_strOldContent}\n\`\`\``);
+        console.log(`FILE: ${op.m_strFilePath} 未找到 OLD_CONTENT:\n\`\`\`\n${op.m_strOldContent}\n\`\`\`\n表达式\n${oldContentPattern}`);
     }
 
     if (errorMessages.length === 0) 
     {
-        const minBeforeLine = Math.min(...beforeAnchorLines);
-        const maxAfterLine = Math.max(...afterAnchorLines);
-        const minOldLine = Math.min(...oldContentLines);
-        const maxOldLine = Math.max(...oldContentLines);
+        const lastBeforeAnchorLine = beforeAnchorRange[1];  // beforeAnchorPattern 最后匹配的行号
+        const firstAfterAnchorLine = afterAnchorRange[0];   // afterAnchorPattern 第一次匹配的行号
+        const firstOldContentLine = oldContentRange[0];     // oldContentPattern 第一次匹配的行号
+        const lastOldContentLine = oldContentRange[1];      // oldContentPattern 最后匹配的行号
 
-        if (minOldLine < minBeforeLine || maxOldLine > maxAfterLine) 
+        if (firstOldContentLine < lastBeforeAnchorLine || lastOldContentLine > firstAfterAnchorLine) 
         {
             errorMessages.push(
-                `FILE: ${op.m_strFilePath} OLD_CONTENT 应该在 BEFORE_ANCHOR 和 AFTER_ANCHOR 之间:\nBEFORE_ANCHOR:\n\`\`\`\n${op.m_strBeforeAnchor}\n\`\`\`\nOLD_CONTENT:\n\`\`\`\n${op.m_strOldContent}\n\`\`\`\nAFTER_ANCHOR:\n\`\`\`\n${op.m_strAfterAnchor}\n\`\`\``
-            );
+                `FILE: ${op.m_strFilePath} OLD_CONTENT 应该在 BEFORE_ANCHOR 和 AFTER_ANCHOR 之间:\nBEFORE_ANCHOR:\n\`\`\`\n${op.m_strBeforeAnchor}\n\`\`\`\nOLD_CONTENT:\n\`\`\`\n${op.m_strOldContent}\n\`\`\`\nAFTER_ANCHOR:\n\`\`\`\n${op.m_strAfterAnchor}\n\`\`\``);
         }
     }
 
-    return errorMessages.length > 0 ? errorMessages.join("\n") : "";
+    if (errorMessages.length === 0){
+      errorMessages.push(
+        `原因未知, FILE: ${op.m_strFilePath} BEFORE_ANCHOR:\n\`\`\`\n${op.m_strBeforeAnchor}\n\`\`\`\nOLD_CONTENT:\n\`\`\`\n${op.m_strOldContent}\n\`\`\`\nAFTER_ANCHOR:\n\`\`\`\n${op.m_strAfterAnchor}\n\`\`\``);
+    }
+
+    return errorMessages.join("\n");
 }
 
 function applyExactReplace(strContent: string, op: ExactReplaceOperation): string 

src/deepseekApi.ts

@@ -276,8 +276,9 @@ ${TCVB.getFormatDescription()}
 如果我要你移动代码，其实是让你去修改原始代码，重新封装到新位置，所以不是让你简单的把代码拷贝到新为止
 记住你是个代码重构助手
 任何时候都要保证修改完的代码是完整的可执行的，不能有省略
+先列出你的方案，然后再行动，注意输出一定要严格匹配要求格式
 
-最后的输出需要是 TCVB 格式， 
+最后的输出需要是 TCVB 格式，用用来做差量修改， 
 尤其注意，输出除了TCVB的正文内容以外，别的地方出现TCVB的开始符和结束符(比如一些关于TCVB的附加说明，或者正好字符串前缀和TCVB符号一样)要做转义，
 以免接收的时候被错误的当成TCVB块（比如前面加入一些空格）
 （注意,TCVB会被用来和原始的CVB合并成新CVB的，所以输出格式要准确，用于匹配的字符串要精确）