scancscode 1.0.20 → 1.0.22

package/bin/scanliterals.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("../dist/index.js")
+require("../dist/RunConvert.js")

package/dist/CSCodeScanner.js

@@ -233,7 +233,7 @@ class CSCodeScanner {
         let stringEndIndex = stringStartIndex + stringLine.length;
         let prefix = bodyLine.substring(stringStartIndex - 2, stringStartIndex);
         let suffix = bodyLine.substring(stringEndIndex, stringEndIndex + trmethodcall.length);
-        if ((stringStartIndex == 0 || prefix == "+ ") && suffix != trmethodcall) {
+        if ((stringStartIndex == 0 || prefix == "+ " || prefix == ": ") && suffix != trmethodcall) {
             formattedStringLine = formattedStringLine + trmethodcall;
         }
         return formattedStringLine;

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/Functional/Rune/Model/RuneExt.cs";
+        let testFullPath = "@";
+        // let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/SutraUI_Detail/MainSutraDetailDialog.cs";
         for (const filePath of files) {
             let fullPath = folder + filePath;
             if (testFullPath != "@") {

package/dist/RunConvert.js

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

package/dist/index.js

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

package/package.json

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

package/src/CSCodeScanner.ts

@@ -243,7 +243,7 @@ export class CSCodeScanner {
         let stringEndIndex = stringStartIndex + stringLine.length;
         let prefix = bodyLine.substring(stringStartIndex - 2, stringStartIndex);
         let suffix = bodyLine.substring(stringEndIndex, stringEndIndex + trmethodcall.length);
-        if ((stringStartIndex == 0 || prefix == "+ ") && suffix != trmethodcall) {
+        if ((stringStartIndex == 0 || prefix == "+ " || prefix == ": ") && suffix != trmethodcall) {
             formattedStringLine = formattedStringLine + trmethodcall;
         }
         return formattedStringLine;

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/Functional/Rune/Model/RuneExt.cs";
+        let testFullPath = "@";
+        // let testFullPath = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/FGUI/SutraUI_Detail/MainSutraDetailDialog.cs";
         for (const filePath of files) {
             let fullPath = folder + filePath;
             if (testFullPath != "@") {

package/src/RunConvert.ts

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

package/src/index.ts

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