scancscode 1.0.39 → 1.0.40

package/dist/src/CSharpStringExtractor.js

@@ -235,7 +235,7 @@ class CSharpStringExtractor {
                     snippet.originalCode = valueExpression;
                     snippet.originalContext = valueExpression;
                     this.variableIndex = 0;
-                    if (isCaseOrDefault) {
+                    if (isCaseOrDefault && !isTextAssignment) {
                         this.processSingleArgument(snippet, valueExpression, trClass, trFormatMethod, trMethod);
                     }
                     else {

package/dist/test/CSharpStringExtractor.test.js

@@ -2561,4 +2561,71 @@ namespace FaBao
             ]);
         }
     });
+    // 测试`m_btn_xxx.title = yyy;` 形式的赋值语句要和`xxx.text = yyy;`形式的赋值语句完全等同处理
+    test('should handle .text = assignments contains chinese', () => {
+        const code = `
+            switch (_roomData.RoomState)
+            {
+                case Data.Match.RoomState.IsDismiss:
+                    m_btn_join.title = "已解散";
+                    m_btn_join.enabled = false;
+                    grayed = true;
+                    break;
+                case Data.Match.RoomState.Rejected:
+                {
+                    m_btn_join.title = $"被拒绝{Kff}";
+                    m_btn_join.enabled = false;
+                    break;
+                }
+                case Data.Match.RoomState.OutOfDate:
+                    m_dd_join.text = "已到期";
+                    break;
+                default:
+                    m_btn_join.title = "申请";
+                    m_btn_joi23n.title = $"申请{Kjf}";
+                    break;
+            }
+`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('"已解散"');
+            expect(snippet.convertedCode).toBe('"已解散".TR()');
+            expect(snippet.literals).toEqual([
+                '已解散'
+            ]);
+        }
+        {
+            let snippet = snippets[1];
+            expect(snippet.originalCode).toBe('$"被拒绝{Kff}"');
+            expect(snippet.convertedCode).toBe('Tr.Format("被拒绝{0}", Kff)');
+            expect(snippet.literals).toEqual([
+                '被拒绝{0}'
+            ]);
+        }
+        {
+            let snippet = snippets[2];
+            expect(snippet.originalCode).toBe('"已到期"');
+            expect(snippet.convertedCode).toBe('"已到期".TR()');
+            expect(snippet.literals).toEqual([
+                '已到期'
+            ]);
+        }
+        {
+            let snippet = snippets[3];
+            expect(snippet.originalCode).toBe('"申请"');
+            expect(snippet.convertedCode).toBe('"申请".TR()');
+            expect(snippet.literals).toEqual([
+                '申请'
+            ]);
+        }
+        {
+            let snippet = snippets[4];
+            expect(snippet.originalCode).toBe('$"申请{Kjf}"');
+            expect(snippet.convertedCode).toBe('Tr.Format("申请{0}", Kjf)');
+            expect(snippet.literals).toEqual([
+                '申请{0}'
+            ]);
+        }
+    });
 });

package/dist/test/TestConvert.test.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const CmdExecutor_1 = require("../src/CmdExecutor");
 describe('TestCmdExecutor', () => {
     test("test convert", async () => {
-        // await CmdExecutor.testConvert();
+        await CmdExecutor_1.CmdExecutor.testConvert();
         expect(true).toBe(true);
     }, 50000);
 });

package/package.json

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

package/src/CSharpStringExtractor.ts

@@ -254,7 +254,7 @@ export class CSharpStringExtractor {
 
                     this.variableIndex = 0;
 
-                    if (isCaseOrDefault) {
+                    if (isCaseOrDefault && !isTextAssignment) {
                         this.processSingleArgument(snippet, valueExpression, trClass, trFormatMethod, trMethod);
                     } else {
                         this.processStatementAndExtractValue(snippet, statement, valueExpression, trClass, trFormatMethod, trMethod);

package/test/CSharpStringExtractor.test.ts

@@ -2802,4 +2802,72 @@ namespace FaBao
         }
     });
 
+    // 测试`m_btn_xxx.title = yyy;` 形式的赋值语句要和`xxx.text = yyy;`形式的赋值语句完全等同处理
+    test('should handle .text = assignments contains chinese', () => {
+        const code = `
+            switch (_roomData.RoomState)
+            {
+                case Data.Match.RoomState.IsDismiss:
+                    m_btn_join.title = "已解散";
+                    m_btn_join.enabled = false;
+                    grayed = true;
+                    break;
+                case Data.Match.RoomState.Rejected:
+                {
+                    m_btn_join.title = $"被拒绝{Kff}";
+                    m_btn_join.enabled = false;
+                    break;
+                }
+                case Data.Match.RoomState.OutOfDate:
+                    m_dd_join.text = "已到期";
+                    break;
+                default:
+                    m_btn_join.title = "申请";
+                    m_btn_joi23n.title = $"申请{Kjf}";
+                    break;
+            }
+`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('"已解散"');
+            expect(snippet.convertedCode).toBe('"已解散".TR()');
+            expect(snippet.literals).toEqual([
+                '已解散'
+            ]);
+        }
+        {
+            let snippet = snippets[1];
+            expect(snippet.originalCode).toBe('$"被拒绝{Kff}"');
+            expect(snippet.convertedCode).toBe('Tr.Format("被拒绝{0}", Kff)');
+            expect(snippet.literals).toEqual([
+                '被拒绝{0}'
+            ]);
+        }
+        {
+            let snippet = snippets[2];
+            expect(snippet.originalCode).toBe('"已到期"');
+            expect(snippet.convertedCode).toBe('"已到期".TR()');
+            expect(snippet.literals).toEqual([
+                '已到期'
+            ]);
+        }
+        {
+            let snippet = snippets[3];
+            expect(snippet.originalCode).toBe('"申请"');
+            expect(snippet.convertedCode).toBe('"申请".TR()');
+            expect(snippet.literals).toEqual([
+                '申请'
+            ]);
+        }
+        {
+            let snippet = snippets[4];
+            expect(snippet.originalCode).toBe('$"申请{Kjf}"');
+            expect(snippet.convertedCode).toBe('Tr.Format("申请{0}", Kjf)');
+            expect(snippet.literals).toEqual([
+                '申请{0}'
+            ]);
+        }
+    });
+
 });

package/test/TestConvert.test.ts

@@ -2,7 +2,7 @@ import { CmdExecutor } from "../src/CmdExecutor";
 
 describe('TestCmdExecutor', () => {
     test("test convert", async () => {
-        // await CmdExecutor.testConvert();
+        await CmdExecutor.testConvert();
         expect(true).toBe(true);
     }, 50000);
 });