fix:修正一系列格式解析问题

Author: yefansky

prompt/testdata2.txt

@@ -1,72 +1,107 @@
-```TCVB
+```markdown
 ## BEGIN_TCVB
-
-## FILE:k:\lab\CodeReDesign-dummy\src\siderBar.ts
-## OPERATION:INSERT
-## BEFORE_ANCHOR
+## FILE:k:\lab\CodeReDesign-dummy\src\extension.ts
+## OPERATION:GLOBAL-REPLACE
+## OLD_CONTENT
 ```typescript
-export function registerCvbContextMenu(context: vscode.ExtensionContext) {
+let apiResponse = await queryCodeReDesign(cvbContent, userPrompt, outputChannel, getCurrentOperationController().signal);
+let processSuccess = true;
+do{
+    try {
+        if (apiResponse) {
+            const tcvb = new TCVB(apiResponse);
+            const oldCvb = new Cvb(cvbContent);
+            const cvb = mergeCvb(oldCvb, tcvb);
 
-  // 注册右键菜单命令
-  const applyCvbCommand = vscode.commands.registerCommand('codeReDesign.applyThisCvb', (cvb: CvbFile) => {
-```
-## AFTER_ANCHOR
-```typescript
-  const workspaceFolders = vscode.workspace.workspaceFolders;
-  if (workspaceFolders) {
-    const targetFolder = path.join(workspaceFolders[0].uri.fsPath, '.CodeReDesignWorkSpace'); // 替换为你的子文件夹名称
+            processSuccess = true;
 
-    // 创建文件系统监听器
+            cvb.setMetaData("用户需求", userPrompt);
+            const newCvbFilePath = path.join(tmpDir, fileName);
+            fs.writeFileSync(newCvbFilePath, cvb.toString(), 'utf-8');
+            vscode.window.showInformationMessage(`API response saved as CVB file: ${newCvbFilePath}`);
+        }
+    } catch (err : any){
+        apiResponse = await callDeepSeekFixApi(err.message, outputChannel, true, getCurrentOperationController().signal);
+        processSuccess = false;
+    }
+} while (!processSuccess);
 ```
-## INSERT_CONTENT
+## NEW_CONTENT
 ```typescript
-    // 监听 .tcvb 和 .md 文件变化
-    const markdownWatcher = vscode.workspace.createFileSystemWatcher(
-      new vscode.RelativePattern(targetFolder, '**/*.md')
-    );
+let apiResponse = await queryCodeReDesign(cvbContent, userPrompt, outputChannel, getCurrentOperationController().signal);
+let processSuccess = true;
+do{
+    try {
+        if (apiResponse) {
+            const tcvb = new TCVB(apiResponse);
+            const oldCvb = new Cvb(cvbContent);
+            const tcvbFilePath = path.join(tmpDir, `${fileName}.tcvb`);
+            fs.writeFileSync(tcvbFilePath, tcvb.toString(), 'utf-8');
 
-    const tcvbWatcher = vscode.workspace.createFileSystemWatcher(
-      new vscode.RelativePattern(targetFolder, '**/*.tcvb')
-    );
+            const cvb = mergeCvb(oldCvb, tcvb);
 
-    // 当文件变化时刷新视图
-    markdownWatcher.onDidCreate(() => cvbViewProvider.refresh());
-    markdownWatcher.onDidDelete(() => cvbViewProvider.refresh());
-    markdownWatcher.onDidChange(() => cvvViewProvider.refresh());
+            processSuccess = true;
 
-    tcvbWatcher.onDidCreate(() => cvbViewProvider.refresh());
-    tcvbWatcher.onDidDelete(() => cvbViewProvider.refresh());
-    tcvbWatcher.onDidChange(() => cvbViewProvider.refresh());
+            cvb.setMetaData("用户需求", userPrompt);
+            const newCvbFilePath = path.join(tmpDir, fileName);
+            fs.writeFileSync(newCvbFilePath, cvb.toString(), 'utf-8');
+            vscode.window.showInformationMessage(`API response saved as CVB file: ${newCvbFilePath}`);
+        }
+    } catch (err : any){
+        apiResponse = await callDeepSeekFixApi(err.message, outputChannel, true, getCurrentOperationController().signal);
+        processSuccess = false;
+    }
+} while (!processSuccess);
+```
+## OPERATION:GLOBAL-REPLACE
+## OLD_CONTENT
+```typescript
+const analysisResult = await analyzeCode(cvbContent, userRequest, outputChannel, getCurrentOperationController().signal);
+if (analysisResult) {
+    vscode.window.showInformationMessage('Analysis completed. Check the output channel for details.');
+}
 
-    // 将监听器添加到订阅中，确保扩展销毁时清理资源
-    context.subscriptions.push(markdownWatcher, tcvbWatcher);
-  }
+vscode.window.showInformationMessage('解析完毕');
 ```
+## NEW_CONTENT
+```typescript
+const analysisResult = await analyzeCode(cvbContent, userRequest, outputChannel, getCurrentOperationController().signal);
+if (analysisResult) {
+    const analysisFilePath = path.join(tmpDir, `${fileName}.md`);
+    fs.writeFileSync(analysisFilePath, analysisResult, 'utf-8');
+    vscode.window.showInformationMessage(`Analysis result saved as file: ${analysisFilePath}`);
+}
 
-## FILE:k:\lab\CodeReDesign-dummy\src\deepseekApi.ts
-## OPERATION:INSERT
-## BEFORE_ANCHOR
+vscode.window.showInformationMessage('解析完毕');
+```
+
+## FILE:k:\lab\CodeReDesign-dummy\src\siderBar.ts
+## OPERATION:EXACT-REPLACE
+## OLD_CONTENT
 ```typescript
-  if (apiResponse) {
-    apiResponse = apiResponse.replace(/\r\n?/g, "\n");
-    const tcvb = new TCVB(apiResponse);
+if (file.endsWith('.cvb')) {
+    const filePath = path.join(targetFolder, file);
+    cvbFiles.push(new CvbFile(file, vscode.Uri.file(filePath)));
+}
 ```
-## AFTER_ANCHOR
+## NEW_CONTENT
+```typescript
+if (file.endsWith('.cvb') || file.endsWith('.tcvb') || file.endsWith('.md')) {
+    const filePath = path.join(targetFolder, file);
+    cvbFiles.push(new CvbFile(file, vscode.Uri.file(filePath)));
+}
+```
+## BEFORE_ANCHOR
 ```typescript
-    cvb.setMetaData("用户需求", userPrompt);
-    const newCvbFilePath = path.join(tmpDir, fileName);
-    fs.writeFileSync(newCvbFilePath, cvb.toString(), 'utf-8');
+const files = fs.readdirSync(targetFolder);
+files.forEach(file => {
 ```
-## INSERT_CONTENT
+## AFTER_ANCHOR
 ```typescript
-    // 保存 TCVB 文件
-    const tcvbFilename = path.join(tmpDir, `${path.basename(fileName, '.cvb')}.tcvb`);
-    fs.writeFileSync(tcvbFilename, apiResponse, 'utf-8');
-
-    // 保存分析结果
-    const analysisFilename = path.join(tmpDir, `${path.basename(fileName, '.cvb')}_analysis.md`);
-    fs.writeFileSync(analysisFilename, '分析结果\n\n' + analysisResult, 'utf-8');
+// 新增排序逻辑
+cvbFiles.sort((a, b) => 
+    a.label.localeCompare(b.label, undefined, { sensitivity: 'base' })
+);
 ```
-
 ## END_TCVB
 ```

src/cvbManager.ts

@@ -48,19 +48,19 @@ export class Cvb
 
   public getUserRequest() : string
   {
-    return this.m_recMetadata['@用户需求'] || '';
+    return this.m_recMetadata['用户需求'] || '';
   }
 
   public getTimestamp() : string
   {
-    return this.m_recMetadata['@时间戳'] || '';
+    return this.m_recMetadata['时间戳'] || '';
   }
 
   public toString(): string {
     // 将元数据转换成字符串
     let metaStr = '## META\n';
     for (const key in this.m_recMetadata) {
-      metaStr += `${key}: ${this.m_recMetadata[key]}\n`;
+      metaStr += `@${key}: ${this.m_recMetadata[key]}\n`;
     }
     metaStr += '## END_META\n';
 
@@ -72,25 +72,22 @@ export class Cvb
     }
 
     // 重新组装整个 CVB 内容
-    const cvbContent = `## BEGIN_CVB
-  ${metaStr}
-  ${filesStr}
-  ## END_CVB`;
+    const cvbContent = `## BEGIN_CVB\n${metaStr}\n${filesStr}\n## END_CVB`;
     return cvbContent;
   }
 
   private parse(strCvbContent: string) : { cvbContent: string, metadata: Record<string, string>, files: Record<string, string> }
   {
     // 查找 CVB 开始与结束标记
-    const regCvbStart: RegExp = /^## BEGIN_CVB(\s|$)/m;
+    const regCvbStart: RegExp = /^## BEGIN_CVB$/m;
     const arrStartMatch = regCvbStart.exec(strCvbContent);
     if (!arrStartMatch)
     {
       throw new Error('Invalid CVB format: missing BEGIN_CVB marker.');
     }
-    const iCvbStartIndex = arrStartMatch.index;
+    const iCvbStartIndex = arrStartMatch.index + arrStartMatch[0].length;
 
-    const regCvbEnd: RegExp = /^## END_CVB(\s|$)/m;
+    const regCvbEnd: RegExp = /^## END_CVB$/m;
     const arrEndMatch = regCvbEnd.exec(strCvbContent);
     if (!arrEndMatch)
     {
@@ -99,7 +96,7 @@ export class Cvb
     const iCvbEndIndex = arrEndMatch.index;
 
     // 提取 CVB 部分内容
-    const strCvbContentPart = strCvbContent.slice(iCvbStartIndex, iCvbEndIndex + arrEndMatch[0].length);
+    const strCvbContentPart = strCvbContent.slice(iCvbStartIndex, iCvbEndIndex);
 
     // 解析 META 部分
     const regMeta: RegExp = /^## META\n([\s\S]*?)^## END_META(\s|$)/m;
@@ -108,25 +105,23 @@ export class Cvb
     {
       throw new Error('Invalid CVB format: missing META section.');
     }
-    const recMetadata: Record<string, string> = { };
-    const arrMetaLines = arrMetaMatch[1].trim().split('\n');
-    for (const strLine of arrMetaLines)
+
+    const recMetadata: Record<string, string> = {};
+    const strMetaData = arrMetaMatch[1].trim();
+    
+    const regex = /^@([^:\n]+):([\s\S]*?)(?=^@|(?![\s\S]))/gm;
+    let match;
+    
+    while ((match = regex.exec(strMetaData)) !== null) 
     {
-      const arrParts = strLine.split(':');
-      if (arrParts.length >= 2)
-      {
-        const strKey = arrParts.shift()?.trim();
-        const strValue = arrParts.join(':').trim();
-        if (strKey)
-        {
-          recMetadata[strKey] = strValue;
-        }
-      }
+      const strKey = match[1].trim();
+      const strValue = match[2].trim();
+      recMetadata[strKey] = strValue;
     }
 
     // 解析文件部分
     const recFiles: Record<string, string> = { };
-    const regFile: RegExp = /^## FILE:([^<\r\n]+)\n([\s\S]*?)(?=^## FILE:|^## END_CVB)/gm;
+    const regFile: RegExp = /^## FILE:([^<\r\n]+)\n([\s\S]*?)(?=^## FILE:([^<\r\n]+)|(?![\s\S]))/gm;
     let arrFileMatch: RegExpExecArray | null;
     while ((arrFileMatch = regFile.exec(strCvbContentPart)) !== null)
     {
@@ -566,7 +561,7 @@ function rebuildCvb(baseCvb: Cvb, mapFiles: Map<string, string>) : Cvb
   const recMetadata = baseCvb.getMetadata();
   for (const [strKey, strValue] of Object.entries(recMetadata))
   {
-    strNewContent += `${strKey}: ${strValue}\n`;
+    strNewContent += `@${strKey}: ${strValue}\n`;
   }
   strNewContent += `## END_META\n\n`;
 

src/extension.ts

@@ -72,6 +72,7 @@ export async function doUploadCommand(cvbFilePath: string, userPrompt: string, o
                 vscode.window.showInformationMessage(`API response saved as CVB file: ${newCvbFilePath}`);
             }
         } catch (err : any){
+            vscode.window.showInformationMessage(`API response have error, try fix ...`);
             apiResponse = await callDeepSeekFixApi(err.message, outputChannel, true, getCurrentOperationController().signal);
             processSuccess = false;
         }

src/siderBar.ts

@@ -160,7 +160,7 @@ function applyThisCvb(filePath: string) {
  * @param filePath .cvb 文件的路径
  */
 async function uploadThisCvb(filePath: string) {
-/*
+
   // 测试 begin
   {
     const workspaceFolders = vscode.workspace.workspaceFolders;
@@ -177,9 +177,10 @@ async function uploadThisCvb(filePath: string) {
     cvbContent = cvbContent.replace(/\r\n?/g, "\n");
     const oldCvb = new Cvb(cvbContent);
     const cvb = mergeCvb(oldCvb, tcvb);
+    console.log(cvb.toString());
   }
   // 测试 end
-*/
+
   const userPrompt = await vscode.window.showInputBox({
     prompt: 'Enter your prompt for the refactoring',
     placeHolder: 'e.g., Refactor the code to improve readability',