npm-groovy-lint 15.2.1 → 15.2.2

package/lib/rules/UnnecessaryGString.js

@@ -32,7 +32,7 @@ const rule = {
             const str = getVariable(variables, "STRING", { mandatory: true });
             // Single line replacement: replace " by '
             if (range.start.line === range.end.line) {
-                allLines[lineNumber] = allLines[lineNumber].replace(`"${str}"`, `'${str}'`);
+                allLines[lineNumber] = allLines[lineNumber].replace(`"""${str}"""`, `'''${str}'''`).replace(`"${str}"`, `'${str}'`);
             }
             // Multiline replacement: replace """ by '''
             else {
@@ -95,6 +95,14 @@ I am a string"""
             sourceAfter: `
 def b = '''
 I am a string'''
+`,
+        },
+        {
+            sourceBefore: `
+def b = """I am a string"""
+`,
+            sourceAfter: `
+def b = '''I am a string'''
 `,
         },
     ],

package/lib/utils.js

@@ -358,8 +358,21 @@ function moveOpeningBracket(allLines, variables) {
     if (allLines[realPos - 1].trim().replace(/ /g, "").includes("){")) {
         throw new Error("Fix not applied: probably a CodeNarc false positive");
     }
+    
+    // Check if the line contains a comment and insert bracket before it
+    const targetLine = allLines[realPos - 2];
+    const commentIndex = targetLine.indexOf("//");
+    let addedBracketLine;
+    
+    if (commentIndex !== -1) {
+        // Insert bracket before the comment
+        const beforeComment = targetLine.substring(0, commentIndex).trimEnd();
+        const comment = targetLine.substring(commentIndex);
+        addedBracketLine = beforeComment + " { " + comment;
+    } else {
     // Add bracket after if
-    const addedBracketLine = allLines[realPos - 2].trimEnd() + " {";
+        addedBracketLine = targetLine.trimEnd() + " {";
+    }
     allLines[realPos - 2] = addedBracketLine;
     // Remove bracket which was on the wrong line
     const removedBracketLine = allLines[realPos - 1].substring(allLines[realPos - 1].indexOf("{") + 1).trimEnd();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-groovy-lint",
-  "version": "15.2.1",
+  "version": "15.2.2",
   "description": "Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle files",
   "exports": "./lib/groovy-lint.js",
   "type": "module",
@@ -65,7 +65,7 @@
     "node-sarif-builder": "^3.0.0",
     "optionator": "^0.9.0",
     "strip-json-comments": "^5.0.0",
-    "uuid": "^10.0.0"
+    "uuid": "^13.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.2",