scancscode 1.0.13 → 1.0.14

package/dist/CSCodeScanner.js

@@ -10,7 +10,7 @@ class CSCodeScanner {
     // 正则表达式匹配 匹配每个字符串
     static stringPattern = /\$?"([^"]*)"/mg;
     // 正则表达式匹配 匹配获取成员值的表达式
-    static getMemberValuePattern = /\s*(?:\+\s*)?([\w\.\u4e00-\u9fff\[\]]+)(\.TR\(\))?/mg;
+    static getMemberValuePattern = /^(\s*)([\w\.\u4e00-\u9fff\[\]]+)(\.TR\(\))?(\s*)$/m;
     static memberSplit = /^[\s\+;]/;
     // 正则表达式匹配插值表达式 {...}
     static interpolationPattern = /\{([^}]+?)(\:[a-zA-Z\d-\.\#(?:\\\\:)\u4e00-\u9fff]+)?\}/mg;
@@ -185,22 +185,16 @@ class CSCodeScanner {
                 }
             }
             else {
-                const memberMatchs = [...bodyLine.matchAll(CSCodeScanner.getMemberValuePattern)];
-                if (memberMatchs.length == 1) {
-                    let match1 = memberMatchs[0];
-                    let c2 = bodyLine.substring(match1.index + match1[0].length);
-                    if (c2 != '' && c2.match(CSCodeScanner.memberSplit) == null) {
-                        memberMatchs.length = 0;
-                    }
-                }
-                if (memberMatchs.length > 0) {
-                    let memberLines = [];
-                    for (let i = 0; i < memberMatchs.length; i++) {
-                        let memberMatch = memberMatchs[i];
-                        let memberLine = memberMatch[1];
-                        memberLines.push(`${memberLine}.TR()`);
+                let memberLines = bodyLine.split("+");
+                if (memberLines.length > 0) {
+                    for (let i = 0; i < memberLines.length; i++) {
+                        let memberLine = memberLines[i];
+                        let match = memberLine.match(this.getMemberValuePattern);
+                        if (match != null) {
+                            memberLines[i] = match[1] + match[2] + ".TR()" + match[4];
+                        }
                     }
-                    convertedAssignLine = assignHead + memberLines.join(" + ") + ";";
+                    convertedAssignLine = assignHead + memberLines.join("+") + ";";
                 }
                 else {
                     convertedAssignLine = assignLine;

package/dist/LiteralCollector.js

@@ -46,8 +46,8 @@ class LiteralCollector {
             return;
         }
         let files = glob_1.glob.sync("**/*.cs", { cwd: folder });
-        let testFullPath = "@";
-        // let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/RefineUI_FurnaceUpgradeDialog/Comp/ItemFurnaceRateComp.cs";
+        // let testFullPath = "@";
+        let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/TopRank/Comp/SubTopRankSelfComp.cs";
         for (const filePath of files) {
             let fullPath = folder + filePath;
             if (testFullPath != "@") {

package/dist/index.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const CmdExecutor_1 = require("./CmdExecutor");
-CmdExecutor_1.CmdExecutor.runConvertWithCmdOptions();
+CmdExecutor_1.CmdExecutor.testConvert();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scancscode",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "",
   "main": "./dist/index.js",
   "bin": {

package/src/CSCodeScanner.ts

@@ -11,7 +11,7 @@ export class CSCodeScanner {
     // 正则表达式匹配 匹配每个字符串
     private static readonly stringPattern = /\$?"([^"]*)"/mg;
     // 正则表达式匹配 匹配获取成员值的表达式
-    private static readonly getMemberValuePattern = /\s*(?:\+\s*)?([\w\.\u4e00-\u9fff\[\]]+)(\.TR\(\))?/mg;
+    private static readonly getMemberValuePattern = /^(\s*)([\w\.\u4e00-\u9fff\[\]]+)(\.TR\(\))?(\s*)$/m;
     private static readonly memberSplit = /^[\s\+;]/;
     // 正则表达式匹配插值表达式 {...}
     private static readonly interpolationPattern = /\{([^}]+?)(\:[a-zA-Z\d-\.\#(?:\\\\:)\u4e00-\u9fff]+)?\}/mg;
@@ -193,22 +193,16 @@ export class CSCodeScanner {
                     convertedAssignLine = stringLines.join("");
                 }
             } else {
-                const memberMatchs = [...bodyLine.matchAll(CSCodeScanner.getMemberValuePattern)];
-                if (memberMatchs.length == 1) {
-                    let match1 = memberMatchs[0]
-                    let c2 = bodyLine.substring(match1.index + match1[0].length)
-                    if (c2 != '' && c2.match(CSCodeScanner.memberSplit) == null) {
-                        memberMatchs.length = 0;
-                    }
-                }
-                if (memberMatchs.length > 0) {
-                    let memberLines: string[] = []
-                    for (let i = 0; i < memberMatchs.length; i++) {
-                        let memberMatch = memberMatchs[i];
-                        let memberLine = memberMatch[1];
-                        memberLines.push(`${memberLine}.TR()`);
+                let memberLines = bodyLine.split("+");
+                if (memberLines.length > 0) {
+                    for (let i = 0; i < memberLines.length; i++) {
+                        let memberLine = memberLines[i];
+                        let match = memberLine.match(this.getMemberValuePattern);
+                        if (match != null) {
+                            memberLines[i] = match[1] + match[2] + ".TR()" + match[4];
+                        }
                     }
-                    convertedAssignLine = assignHead + memberLines.join(" + ") + ";";
+                    convertedAssignLine = assignHead + memberLines.join("+") + ";";
                 } else {
                     convertedAssignLine = assignLine;
                 }

package/src/LiteralCollector.ts

@@ -14,8 +14,8 @@ export class LiteralCollector {
         }
 
         let files = glob.sync("**/*.cs", { cwd: folder });
-        let testFullPath = "@";
-        // let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/RefineUI_FurnaceUpgradeDialog/Comp/ItemFurnaceRateComp.cs";
+        // let testFullPath = "@";
+        let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/TopRank/Comp/SubTopRankSelfComp.cs";
         for (const filePath of files) {
             let fullPath = folder + filePath;
             if (testFullPath != "@") {

package/src/index.ts

@@ -1,3 +1,3 @@
 import { CmdExecutor } from "./CmdExecutor";
 
-CmdExecutor.runConvertWithCmdOptions()
+CmdExecutor.testConvert()