test:模糊匹配测试全过

Author: yefansky

src/cvbManager.ts

@@ -206,19 +206,26 @@ class ExactReplaceOperation extends TcvbOperation {
   }
 }
 
+// 函数：规范化 GlobalReplaceOperation 实例的成员
+export function normalizeData(operation: GlobalReplaceOperation): GlobalReplaceOperation {
+    operation.m_strOldContent = normalizeInput(operation.m_strOldContent);
+    operation.m_strNewContent = normalizeInput(operation.m_strNewContent);
+    return operation;
+}
+
 // 2. 全局替换操作（GLOBAL-REPLACE）
 class GlobalReplaceOperation extends TcvbOperation {
   public m_strOldContent: string;
   public m_strNewContent: string;
 
   constructor(
-    m_strFilePath: string,
-    m_strOldContent: string,
-    m_strNewContent: string
+    strFilePath: string,
+    strOldContent: string,
+    strNewContent: string
   ) {
-    super(m_strFilePath, "global-replace");
-    this.m_strOldContent = m_strOldContent;
-    this.m_strNewContent = m_strNewContent;
+    super(strFilePath, "global-replace");
+    this.m_strOldContent = normalizeInput(strOldContent);
+    this.m_strNewContent = normalizeInput(strNewContent);
   }
 }
 
@@ -830,11 +837,13 @@ export function applyGlobalReplace(
     });
   }
 
+  try {
     return FuzzyMatch.applyFuzzyGlobalReplace(strContent, op.m_strOldContent, op.m_strNewContent);
-    
+  }catch (error : any) {
     const errorMsg = `GLOBAL-REPLACE 失败：FILE:"${op.m_strFilePath}" 中未找到OLD_CONTENT: "${op.m_strOldContent}" 可能是和原文有细微差异，或者文件路径和别的文件搞错了`;
     console.log(errorMsg + `\n表达式: ${regPattern}`);
     throw new Error(errorMsg);
+  }
 }
 
 // 根据前锚点、内容、后锚点构建正则表达式（dotall 模式）

src/test/fuzzyMatch.test.ts

@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 import * as vscode from 'vscode';
-import { applyGlobalReplace, normalizeInput } from '../cvbManager';
+import { applyGlobalReplace, normalizeInput, normalizeData } from '../cvbManager';
 import * as fuzzyMatch from '../fuzzyMatch';
 
 // 定义 GlobalReplaceOperation 接口
@@ -29,13 +29,6 @@ class GlobalReplaceOperation extends TcvbOperation {
     }
 }
 
-// 函数：规范化 GlobalReplaceOperation 实例的成员
-function normalizeData(operation: GlobalReplaceOperation): GlobalReplaceOperation {
-    operation.m_strOldContent = normalizeInput(operation.m_strOldContent);
-    operation.m_strNewContent = normalizeInput(operation.m_strNewContent);
-    return operation;
-}
-
 suite('Extension Test Suite', () => {
     vscode.window.showInformationMessage('Start all tests.');
 
@@ -236,7 +229,7 @@ function anotherCompute(a, b) {
             m_strType: "global-replace",
             m_strFilePath: 'test.js',
             m_strOldContent: `
-return a + b;
+return aaa + bbb;
             `,
             m_strNewContent: `
 return a - b;
@@ -513,12 +506,12 @@ function logWarning(warning) {
         const result = fuzzyMatch.applyReplacements(originalContent, matches, newContent);
 
         assert.strictEqual(result.trim(), expectedContent, 'Replacement should match expected output');
-        assert.ok(!result.includes('g);'), 'Result should not contain extra characters like "g);"');
+        assert.ok(!result.includes('warn);'), 'Result should not contain incorrectly replaced warn);');
     });
 
     test('applyFuzzyGlobalReplace should perform the full replacement correctly', () => {
         const result = fuzzyMatch.applyFuzzyGlobalReplace(originalContent, oldContent, newContent);
         assert.strictEqual(result.trim(), expectedContent, 'Full fuzzy replace should produce the expected output');
-        assert.ok(!result.includes('g);'), 'Result should not contain extra characters like "g);"');
+        assert.ok(!result.includes('warn);'), 'Result should not contain incorrectly replaced warn);');
     });
 });