Fix curly bracket should not get commented out by method comments betweenparenthesis and curly brackets

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();

test/lint-format.test.js

@@ -141,8 +141,8 @@ async function checkRule(key, check, checkType) {
     const result = linter.lintResult.files[0].updatedSource;
     const expectedResult = normalizeNewLines(check.after);
     const effectiveDiff = getDiff(expectedResult, result, source);
-    assert(linter.status === 0, `Linter status is 0 (${linter.status} returned)`);
-    assert(effectiveDiff.length === 0, "Code has been formatted correctly");
+    assert(linter.status === 0, `Expected linter status to be 0, but status was ${linter.status}`);
+    assert(effectiveDiff.length === 0, "Code was not formatted correctly");
     checkCodeNarcCallsCounter(check.codeNarcCallsCounter);
 }
 
@@ -289,6 +289,24 @@ pipeline {
                 }
                 ` */
             }
+        ],
+        [
+          "MoveOpeningCurlyBracketShouldNotCommentOutBracket",
+          {
+            totalFixed: 1,
+            codeNarcCallsCounter: 1,
+            before: `
+void foo() // comment
+{
+    doSomething()
+}
+`,
+            after: `
+void foo() { // comment
+    doSomething()
+}
+`,
+            }
         ]
     ]);
 }