autosnippet 1.2.2 → 1.2.3

package/bin/injection.js

@@ -17,18 +17,42 @@ const headerMark = '// ahead ';
 const importReg = /^\#import\s*<\w+\/\w+.h>$/;
 
 function createHeader(headerLine) {
-    const header = headerLine.split(headerMark)[1].trim();
-    const headerArray = header.split('/');
-    const moduleName = headerArray[0].substr(1);
-    const headerName = headerArray[1].substr(0, headerArray[1].length - 1);
-
+    // 格式：// ahead <Module/Header.h> [relative/path/to/Header.h]
+    // 或：// ahead &lt;Module/Header.h&gt; [relative/path/to/Header.h] (转义格式)
+    const content = headerLine.split(headerMark)[1].trim();
+    
+    // 匹配 <Module/Header.h> 或 &lt;Module/Header.h&gt; 以及可选的相对路径
+    const match = content.match(/^(?:&lt;|<)(\w+)\/(\w+\.h)(?:&gt;|>)(?:\s+(.+))?$/);
+    
+    if (!match) {
+        // 兼容旧格式：直接解析
+        const headerArray = content.split('/');
+        const moduleName = headerArray[0].substr(1);
+        const headerName = headerArray[1].substr(0, headerArray[1].length - 1);
+        
+        return {
+            name: content,
+            specName: headerArray[0] + '/' + headerArray[0].substr(1) + '.h>',
+            moduleName: moduleName,
+            headerName: headerName,
+            moduleStrName: '"' + moduleName + '.h"',
+            headerStrName: '"' + headerName + '"',
+            headRelativePathFromMark: null,
+        };
+    }
+    
+    const moduleName = match[1];
+    const headerName = match[2];
+    const headRelativePathFromMark = match[3] || null;  // 相对路径（如果有）
+    
     return {
-        name: header,
-        specName: headerArray[0] + '/' + headerArray[0].substr(1) + '.h>',
+        name: `<${moduleName}/${headerName}>`,
+        specName: `<${moduleName}/${headerName}>`,
         moduleName: moduleName,
         headerName: headerName,
-        moduleStrName: '"' + moduleName + '.h"',
-        headerStrName: '"' + headerName + '"',
+        moduleStrName: `"${moduleName}.h"`,
+        headerStrName: `"${headerName}"`,
+        headRelativePathFromMark: headRelativePathFromMark,  // 从标记中提取的相对路径
     };
 }
 

package/bin/watch.js

@@ -13,7 +13,8 @@ const alinkMark = 'alink';
 const wellMark = '#';
 const atMark = '@';
 
-const headerReg = /^\/\/ ahead <\w+\/\w+.h>(\s+.+)?$/;
+// 匹配原始格式和转义格式：// ahead <Module/Header.h> 或 // ahead &lt;Module/Header.h&gt;
+const headerReg = /^\/\/ ahead\s+(?:&lt;|<)(\w+)\/(\w+\.h)(?:&gt;|>)(\s+.+)?$/;
 const headerSwiftReg = /^\/\/ ahead \w+$/;
 const importReg = /^\#import\s*<\w+\/\w+.h>$/;
 const importSwiftReg = /^import\s*\w+$/;
@@ -148,14 +149,22 @@ function processFileChange(specFile, updateFile, relativePath) {
 				}
 
 				if (headerLine) {
-					const isMatch = currHeaderReg.test(headerLine);
-					console.log(`📋 检查 // ahead 标记: ${headerLine}, 匹配: ${isMatch}`);
+					// 先解码 HTML 实体（&lt; -> <, &gt; -> >, &amp; -> &）
+					let decodedHeaderLine = headerLine
+						.replace(/&lt;/g, '<')
+						.replace(/&gt;/g, '>')
+						.replace(/&amp;/g, '&');
+					
+					const isMatch = currHeaderReg.test(decodedHeaderLine);
+					console.log(`📋 检查 // ahead 标记: ${headerLine}`);
+					console.log(`📋 解码后: ${decodedHeaderLine}, 匹配: ${isMatch}`);
 					
 					if (isMatch) {
 						console.log(`✅ 触发头文件注入: ${updateFile}`);
 						clearTimeout(timeoutHead);
 						timeoutHead = setTimeout(() => {
-							checkAnotherFile(specFile, updateFile, headerLine, importArray, isSwift);
+							// 传递解码后的 headerLine
+							checkAnotherFile(specFile, updateFile, decodedHeaderLine, importArray, isSwift);
 						}, DEBOUNCE_DELAY);
 					} else {
 						console.log(`⚠️  // ahead 标记格式不匹配，期望格式: // ahead <Module/Header.h> [相对路径]`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "autosnippet",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "A iOS module management tool.",
     "main": "index.js",
     "scripts": {