npm - scancscode - Versions diffs - 1.0.11 → 1.0.12 - Mend

scancscode 1.0.11 → 1.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/CSCodeScanner.js CHANGED Viewed

@@ -158,7 +158,7 @@ class CSCodeScanner {
                                     // if ((stringStartIndex == 0 || prefix == "+ ") && suffix != ".TR()") {
                                     //     formattedStringLine = formattedStringLine + ".TR()"
                                     // }
-                                    formattedStringLine = this.replaceStringsTR(stringMatch, stringLine, bodyLine);
+                                    formattedStringLine = this.replaceStringsTR(stringMatch, stringLine, bodyLine, trmethodname);
                                     literals.push(stringContent);
                                 }
                                 convertedString = formattedStringLine;
@@ -166,7 +166,7 @@ class CSCodeScanner {
                         }
                         else {
                             literals.push(stringContent);
-                            convertedString = this.replaceStringsTR(stringMatch, stringLine, bodyLine);
+                            convertedString = this.replaceStringsTR(stringMatch, stringLine, bodyLine, trmethodname);
                         }
                         // 串联字符串列表
                         let prefix = bodyLine.substring(lastIndex, stringLineIndex);
@@ -195,17 +195,18 @@ class CSCodeScanner {
         }
         return snippets;
     }
-    static replaceStringsTR(stringMatch, stringLine, bodyLine) {
+    static replaceStringsTR(stringMatch, stringLine, bodyLine, trmethodname) {
         if (this.isNativeString(stringLine)) {
             return stringLine;
         }
+        let trmethodcall = `.${trmethodname}()`;
         let formattedStringLine = stringLine;
         let stringStartIndex = stringMatch.index;
         let stringEndIndex = stringStartIndex + stringLine.length;
         let prefix = bodyLine.substring(stringStartIndex - 2, stringStartIndex);
-        let suffix = bodyLine.substring(stringEndIndex, stringEndIndex + ".TR()".length);
-        if ((stringStartIndex == 0 || prefix == "+ ") && suffix != ".TR()") {
-            formattedStringLine = formattedStringLine + ".TR()";
+        let suffix = bodyLine.substring(stringEndIndex, stringEndIndex + trmethodcall.length);
+        if ((stringStartIndex == 0 || prefix == "+ ") && suffix != trmethodcall) {
+            formattedStringLine = formattedStringLine + trmethodcall;
         }
         return formattedStringLine;
     }

package/package.json CHANGED Viewed

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

package/src/CSCodeScanner.ts CHANGED Viewed

@@ -167,14 +167,14 @@ export class CSCodeScanner {
                                     // if ((stringStartIndex == 0 || prefix == "+ ") && suffix != ".TR()") {
                                     //     formattedStringLine = formattedStringLine + ".TR()"
                                     // }
-                                    formattedStringLine = this.replaceStringsTR(stringMatch, stringLine, bodyLine);
+                                    formattedStringLine = this.replaceStringsTR(stringMatch, stringLine, bodyLine, trmethodname);
                                     literals.push(stringContent);
                                 }
                                 convertedString = formattedStringLine;
                             }
                         } else {
                             literals.push(stringContent);
-                            convertedString = this.replaceStringsTR(stringMatch, stringLine, bodyLine);
+                            convertedString = this.replaceStringsTR(stringMatch, stringLine, bodyLine, trmethodname);
                         }
                         // 串联字符串列表
@@ -207,18 +207,19 @@ export class CSCodeScanner {
         return snippets;
     }
-    public static replaceStringsTR(stringMatch: RegExpExecArray, stringLine: string, bodyLine: string) {
+    public static replaceStringsTR(stringMatch: RegExpExecArray, stringLine: string, bodyLine: string, trmethodname: string): string {
         if (this.isNativeString(stringLine)) {
             return stringLine;
         }
+        let trmethodcall = `.${trmethodname}()`;
         let formattedStringLine = stringLine;
         let stringStartIndex = stringMatch.index;
         let stringEndIndex = stringStartIndex + stringLine.length;
         let prefix = bodyLine.substring(stringStartIndex - 2, stringStartIndex);
-        let suffix = bodyLine.substring(stringEndIndex, stringEndIndex + ".TR()".length);
-        if ((stringStartIndex == 0 || prefix == "+ ") && suffix != ".TR()") {
-            formattedStringLine = formattedStringLine + ".TR()";
+        let suffix = bodyLine.substring(stringEndIndex, stringEndIndex + trmethodcall.length);
+        if ((stringStartIndex == 0 || prefix == "+ ") && suffix != trmethodcall) {
+            formattedStringLine = formattedStringLine + trmethodcall;
         }
         return formattedStringLine;
     }