scancscode 1.0.33 → 1.0.35

package/test/CSharpStringExtractor.test.ts

@@ -1396,35 +1396,20 @@ describe('CSharpStringExtractor', () => {
 
     });
 
-    // // 测试处理C#字符串表达式中包含各种特殊字符的情况
-    // test('should handle special characters in string expression 1', () => {
-    //     const code = `return "abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\";`;
-    //     const snippets = extractor.extractStrings(code);
-
-    //     let targetSnippet = snippets[0];
-    //     expect(targetSnippet.originalIndex).toBe(code.indexOf(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`));
-    //     expect(targetSnippet.originalCode).toBe(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`);
-    //     expect(targetSnippet.convertedCode).toBe(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`);
-    //     expect(targetSnippet.literals).toEqual([
-    //         'abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\'
-    //     ]);
-    //     expect(targetSnippet.isChanged).toBe(false);
-    // });
-
-    // // 测试处理C#字符串表达式中包含各种特殊字符的情况
-    // test('should handle special characters in string expression 2', () => {
-    //     const code = readFileSync("test/TestSpecialString.cs", "utf8");
-    //     const snippets = extractor.extractStrings(code);
-
-    //     let targetSnippet = snippets[0];
-    //     expect(targetSnippet.originalIndex).toBe(code.indexOf(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`));
-    //     expect(targetSnippet.originalCode).toBe(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`);
-    //     expect(targetSnippet.convertedCode).toBe(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`);
-    //     expect(targetSnippet.literals).toEqual([
-    //         'abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\'
-    //     ]);
-    //     expect(targetSnippet.isChanged).toBe(false);
-    // });
+    // 测试处理C#字符串表达式中包含各种特殊字符的情况
+    test('should handle special characters in string expression 1', () => {
+        const code = `return "abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\";`;
+        const snippets = extractor.extractStrings(code);
+
+        let targetSnippet = snippets[0];
+        expect(targetSnippet.originalIndex).toBe(code.indexOf(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`));
+        expect(targetSnippet.originalCode).toBe(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`);
+        expect(targetSnippet.convertedCode).toBe(`"abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\"`);
+        expect(targetSnippet.literals).toEqual([
+            'abcdefghijklmnopqrstuvwxyz\`-=[];\',./~!@#$%^&*()_+{}|:\\"<>?1234567890\\\\'
+        ]);
+        expect(targetSnippet.isChanged).toBe(false);
+    });
 
     // 测试处理在C#类成员初始赋值语句中, 字符串表达式中包含各种特殊字符的情况, 工具中需要统一处理C#字符串边界识别和捕获
     test('should handle member initial assignment', () => {
@@ -2331,55 +2316,179 @@ namespace FaBao.UI.MainUI
         expect(snippets.length).toBe(1);
     });
 
-//     // 需要正确识别C#代码中类成员初始化赋值时, 给成员赋值匿名函数时, 匿名函数中的字符串表达式也需要提取
-//     test('should handle class member initialization assignment with anonymous function', () => {
-//         const code = `
-//                 FUISys.Instance.ShowLayer<MainConfirmDialog>(UISceneType.Main, new MainConfirmDialog.MainConfirmDialogParam()
-//                 {
-//                     Title = "提示",
-//                     ConfirmCallback = async () =>
-//                     {
-//                         //灵纹一键下阵
-//                         if (await this.GetModel<CardModel>().DispatchAction(new Rune_Action_CleanRune(_sutraCardData.Card.Id)))
-//                         {
-//                             Toast.Info("卸载成功");
-//                         }
-//                     },
-//                     CancelText = "取消",
-//                 }).Forget();
-// `;
-//         const snippets = extractor.extractStrings(code);
-//         {
-//             let targetSnippet = snippets[0];
-//             expect(targetSnippet.originalIndex).toBe(code.indexOf(`提示`));
-//             expect(targetSnippet.originalCode).toBe(`提示`);
-//             expect(targetSnippet.convertedCode).toBe(`提示`);
-//             expect(targetSnippet.literals).toEqual([
-//                 '提示'
-//             ]);
-//             expect(targetSnippet.isChanged).toBe(false);
-//         }
-//         {
-//             let targetSnippet = snippets[0];
-//             // 需要正确识别C#代码中类成员初始化赋值时, 给成员赋值匿名函数时, 匿名函数中的字符串表达式也需要提取
-//             expect(targetSnippet.originalIndex).toBe(code.indexOf(`卸载成功`));
-//             expect(targetSnippet.originalCode).toBe(`卸载成功`);
-//             expect(targetSnippet.convertedCode).toBe(`卸载成功`);
-//             expect(targetSnippet.literals).toEqual([
-//                 '卸载成功'
-//             ]);
-//             expect(targetSnippet.isChanged).toBe(false);
-//         }
-//         {
-//             let targetSnippet = snippets[0];
-//             expect(targetSnippet.originalIndex).toBe(code.indexOf(`取消`));
-//             expect(targetSnippet.originalCode).toBe(`取消`);
-//             expect(targetSnippet.convertedCode).toBe(`取消`);
-//             expect(targetSnippet.literals).toEqual([
-//                 '取消'
-//             ]);
-//             expect(targetSnippet.isChanged).toBe(false);
-//         }
-//     });
+    // 需要正确识别C#代码中的匿名函数, 匿名函数中的字符串表达式也同样需要提取; 匿名函数通常以 `0到多个修饰词 (可选参数列表) => { ... }` 或者 `0到多个修饰词 (可选参数列表) => 一句表达式` 形式定义实现.
+    test('should handle class member initialization assignment with anonymous function 1', () => {
+        const code = `
+                FUISys.Instance.ShowLayer<MainConfirmDialog>(UISceneType.Main, new MainConfirmDialog.MainConfirmDialogParam()
+                {
+                    Title = "提示",
+                    ConfirmCallback = async () =>
+                    {
+                        //灵纹一键下阵
+                        if (await this.GetModel<CardModel>().DispatchAction(new Rune_Action_CleanRune(_sutraCardData.Card.Id)))
+                        {
+                            Toast.Info("卸载成功");
+                        }
+                    },
+                    CancelText = "取消",
+                }).Forget();
+`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let targetSnippet = snippets[0];
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`"提示"`));
+            expect(targetSnippet.originalCode).toBe(`"提示"`);
+            expect(targetSnippet.convertedCode).toBe(`"提示"`);
+            expect(targetSnippet.literals).toEqual([
+                '提示'
+            ]);
+            expect(targetSnippet.isChanged).toBe(false);
+        }
+        {
+            let targetSnippet = snippets[1];
+            // 需要正确识别C#代码中类成员初始化赋值时, 给成员赋值匿名函数时, 匿名函数中的字符串表达式也需要提取
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`"卸载成功"`));
+            expect(targetSnippet.originalCode).toBe(`"卸载成功"`);
+            expect(targetSnippet.convertedCode).toBe(`"卸载成功"`);
+            expect(targetSnippet.literals).toEqual([
+                '卸载成功'
+            ]);
+            expect(targetSnippet.isChanged).toBe(false);
+        }
+        {
+            let targetSnippet = snippets[2];
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`"取消"`));
+            expect(targetSnippet.originalCode).toBe(`"取消"`);
+            expect(targetSnippet.convertedCode).toBe(`"取消"`);
+            expect(targetSnippet.literals).toEqual([
+                '取消'
+            ]);
+            expect(targetSnippet.isChanged).toBe(false);
+        }
+    });
+
+    // 需要正确识别C#代码中的匿名函数, 匿名函数中的字符串表达式也同样需要提取; 匿名函数通常以 `0到多个修饰词 (可选参数列表) => { ... }` 或者 `0到多个修饰词 (可选参数列表) => 一句表达式` 形式定义实现.
+    test('should handle class member initialization assignment with anonymous function 2', () => {
+        const code = `
+                FUISys.Instance.ShowLayer<MainConfirmDialog>(UISceneType.Main, new MainConfirmDialog.MainConfirmDialogParam()
+                {
+                    ConfirmCallback = async () =>
+                    {
+                        Toast.Info("卸载成功");
+                    },
+                }).Forget();
+`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let targetSnippet = snippets[0];
+            // 需要正确识别C#代码中类成员初始化赋值时, 给成员赋值匿名函数时, 匿名函数中的字符串表达式也需要提取
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`"卸载成功"`));
+            expect(targetSnippet.originalCode).toBe(`"卸载成功"`);
+            expect(targetSnippet.convertedCode).toBe(`"卸载成功"`);
+            expect(targetSnippet.literals).toEqual([
+                '卸载成功'
+            ]);
+            expect(targetSnippet.isChanged).toBe(false);
+        }
+    });
+
+    // 需要正确识别C#代码中的匿名函数, 匿名函数中的字符串表达式也同样需要提取; 匿名函数通常以 `0到多个修饰词 (可选参数列表) => { ... }` 或者 `0到多个修饰词 (可选参数列表) => 一句表达式` 形式定义实现.
+    test('should handle class member initialization assignment with anonymous function 2', () => {
+        const code = `
+                FUISys.Instance.ShowLayer<MainConfirmDialog>(UISceneType.Main, new MainConfirmDialog.MainConfirmDialogParam()
+                {
+                    ConfirmCallback = (int qwfewe) =>
+                    {
+                        Toast.Info($"卸载成功: {qwfewe}");
+                    },
+                }).Forget();
+`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let targetSnippet = snippets[0];
+            // 需要正确识别C#代码中类成员初始化赋值时, 给成员赋值匿名函数时, 匿名函数中的字符串表达式也需要提取
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`$"卸载成功: {qwfewe}"`));
+            expect(targetSnippet.originalCode).toBe(`$"卸载成功: {qwfewe}"`);
+            expect(targetSnippet.convertedCode).toBe(`Tr.Format("卸载成功: {0}", qwfewe)`);
+            expect(targetSnippet.literals).toEqual([
+                '卸载成功: {0}'
+            ]);
+            expect(targetSnippet.isChanged).toBe(true);
+        }
+    });
+
+    // 需要正确识别C#代码中的匿名函数, 匿名函数中的字符串表达式也同样需要提取; 匿名函数通常以 `0到多个修饰词 (可选参数列表) => { ... }` 或者 `0到多个修饰词 (可选参数列表) => 一句表达式` 形式定义实现.
+    test('should handle class member initialization assignment with anonymous function 3', () => {
+        const code = `
+                FUISys.Instance.ShowLayer<MainConfirmDialog>(UISceneType.Main, new MainConfirmDialog.MainConfirmDialogParam()
+                {
+                    ConfirmCallback = async () => Toast.Info("卸载成功"),
+                }).Forget();
+`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let targetSnippet = snippets[0];
+            // 需要正确识别C#代码中类成员初始化赋值时, 给成员赋值匿名函数时, 匿名函数中的字符串表达式也需要提取
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`"卸载成功"`));
+            expect(targetSnippet.originalCode).toBe(`"卸载成功"`);
+            expect(targetSnippet.convertedCode).toBe(`"卸载成功"`);
+            expect(targetSnippet.literals).toEqual([
+                '卸载成功'
+            ]);
+            expect(targetSnippet.isChanged).toBe(false);
+        }
+    });
+
+    // 需要正确识别C#代码中的匿名函数, 匿名函数中的字符串表达式也同样需要提取; 匿名函数通常以 `0到多个修饰词 (可选参数列表) => { ... }` 或者 `0到多个修饰词 (可选参数列表) => 一句表达式` 形式定义实现.
+    test('should handle class member initialization assignment with anonymous function 4', () => {
+        const code = `
+                FUISys.Instance.ShowLayer<MainConfirmDialog>(UISceneType.Main, new MainConfirmDialog.MainConfirmDialogParam()
+                {
+                    ConfirmCallback = () => Toast.Info("卸载成功"),
+                }).Forget();
+`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let targetSnippet = snippets[0];
+            // 需要正确识别C#代码中类成员初始化赋值时, 给成员赋值匿名函数时, 匿名函数中的字符串表达式也需要提取
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`"卸载成功"`));
+            expect(targetSnippet.originalCode).toBe(`"卸载成功"`);
+            expect(targetSnippet.convertedCode).toBe(`"卸载成功"`);
+            expect(targetSnippet.literals).toEqual([
+                '卸载成功'
+            ]);
+            expect(targetSnippet.isChanged).toBe(false);
+        }
+    });
+
+    // 测试处理 `xxx.text = yyy` 形式赋值语句, 以 `.text =` 给 `text` 成员赋值的表达式中, `yyy` 部分必定是字符串表达式; 如果`yyy`中不存在字符串, 则`yyy` 中以 `+` 连接的表达式需要加上 `.TR()`; 如果 `yyy` 是作为值表达式整体(必定返回字符串类型值), 也需要追加 `.TR()`。
+    test('should handle .text = format 1', () => {
+        const code = `m_text_iwff.text = info ;`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let targetSnippet = snippets[0];
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`info`));
+            expect(targetSnippet.originalCode).toBe(`info`);
+            expect(targetSnippet.convertedCode).toBe(`info.TR()`);
+            expect(targetSnippet.literals).toEqual([
+            ]);
+            expect(targetSnippet.isChanged).toBe(true);
+        }
+    });
+
+    // 测试处理 `xxx.text = yyy` 形式赋值语句, 以 `.text =` 给 `text` 成员赋值的表达式中, `yyy` 部分必定是字符串表达式; 如果`yyy`中不存在字符串, 则`yyy` 中以 `+` 连接的表达式需要加上 `.TR()`; 如果 `yyy` 是作为值表达式整体(必定返回字符串类型值), 也需要追加 `.TR()`。
+    test('should handle .text = format 1', () => {
+        const code = `m_text_info.text = info1.member1 + info2.member2;`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let targetSnippet = snippets[0];
+            expect(targetSnippet.originalIndex).toBe(code.indexOf(`info1.member1 + info2.member2`));
+            expect(targetSnippet.originalCode).toBe(`info1.member1 + info2.member2`);
+            expect(targetSnippet.convertedCode).toBe(`info1.member1.TR() + info2.member2.TR()`);
+            expect(targetSnippet.literals).toEqual([
+            ]);
+            expect(targetSnippet.isChanged).toBe(true);
+        }
+    });
 
 });

package/test/TestSpecialString.cs

@@ -1,24 +1,24 @@
-public class AA{
-    public string Member2 = "\\";
-    public string Member3 = "\n";
-    public string Member4 = $"\t";
-    public string Test1(){
-        var wef = new ClassB(){
-            Member1 = "1. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\",
-        };
-        var wefe = "2. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
-        var wefeF = $"3. {wef}{{}}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
-        Debug.Log("4. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\");
-        return "5. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
-    }
-    public string Member1 = "6. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
-    public static string StaticMember1 = "7. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
-    public static string Test2(){
-        var wefff = 34;
-        var vwve = new ClassB(){
-            Member1 = $"8. {wefff}{{}}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\",
-        };
-        Debug.Log($"9. {wefff}{{}}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\");
-        return $"10. {wefff}{{}}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
-    }
-}
+public class AA{
+    public string Member2 = "\\";
+    public string Member3 = "\n";
+    public string Member4 = $"\t";
+    public string Test1(){
+        var wef = new ClassB(){
+            Member1 = "1. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\",
+        };
+        var wefe = "2. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
+        var wefeF = $"3. {wef}{{}}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
+        Debug.Log("4. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\");
+        return "5. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
+    }
+    public string Member1 = "6. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
+    public static string StaticMember1 = "7. {}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
+    public static string Test2(){
+        var wefff = 34;
+        var vwve = new ClassB(){
+            Member1 = $"8. {wefff}{{}}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\",
+        };
+        Debug.Log($"9. {wefff}{{}}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\");
+        return $"10. {wefff}{{}}abcdefghijklmnopqrstuvwxyz`-=[];',./~!@#$%^&*()_+|:\"<>?1234567890\\";
+    }
+}