fix out of index code error and test

Author: BraisVQ

src/org/ods/component/Pipeline.groovy

@@ -618,63 +618,27 @@ class Pipeline implements Serializable {
         }
     }
 
-    private String removeCommentedCode(String content) {
-        def lines = content.split('\n')
-        def result = new StringBuilder()
-        boolean inBlockComment = false
-
-        for (String line : lines) {
-            String processedLine = line
-
-            // Handle block comments (/* */)
-            if (inBlockComment) {
-                def blockCommentEnd = processedLine.indexOf('*/')
-                if (blockCommentEnd != -1) {
-                    // End of block comment found
-                    if (blockCommentEnd + 2 <= processedLine.length()) {
-                        processedLine = processedLine[(blockCommentEnd + 2)..-1]
-                    } else {
-                        processedLine = ""
-                    }
-                    inBlockComment = false
-                } else {
-                    // Still inside block comment, skip entire line
-                    continue
-                }
-            }
-
-            // Check for start of block comment
-            def blockCommentStart = processedLine.indexOf('/*')
-            if (blockCommentStart != -1) {
-                def blockCommentEnd = processedLine.indexOf('*/', blockCommentStart + 2)
-                if (blockCommentEnd != -1) {
-                    // Complete block comment on same line
-                    String before = blockCommentStart > 0
-                        ? processedLine[0..(blockCommentStart - 1)]
-                        : ""
-                    String after = ""
-                    if (blockCommentEnd + 2 < processedLine.length()) {
-                        after = processedLine[(blockCommentEnd + 2)..-1]
-                    }
-                    processedLine = before + after
-                } else {
-                    // Block comment starts but doesn't end on this line
-                    processedLine = blockCommentStart > 0 ? processedLine[0..(blockCommentStart - 1)] : ""
-                    inBlockComment = true
-                }
+    /**
+     * Removes all commented code from the given string.
+     * Handles // single-line, /* block , and multi-line comments.
+     */
+    def removeCommentedCode(String content) {
+        if (!content) {
+            return content
+        }
+        // Remove block comments (including multi-line)
+        content = content.replaceAll(/(?s)\/\*.*?\*\//, "")
+        // Remove single-line comments (// ...), but keep code before //
+        content = content.readLines().collect { line ->
+            def idx = line.indexOf('//')
+            if (idx >= 0) {
+                return line.substring(0, idx)
             }
-
-            // Handle single-line comments (//)
-            def singleCommentIndex = processedLine.indexOf('//')
-            if (singleCommentIndex != -1) {
-                processedLine = singleCommentIndex > 0 ? processedLine[0..(singleCommentIndex - 1)] : ""
-            }
-
-            // Add processed line to result
-            result.append(processedLine).append('\n')
-        }
-
-        return result.toString()
+            return line
+        }.join('\n')
+        // Remove lines that are now empty or whitespace only
+        content = content.readLines().findAll { it.trim() }.join('\n')
+        return content
     }
 
     private String getJenkinsfileScriptPath() {

test/groovy/org/ods/component/PipelineSpec.groovy

@@ -144,7 +144,7 @@ class PipelineSpec extends PipelineSpockTestBase {
             /* Multi-line
                comment */
             code3
-            // Inline comment code4
+            code4 // Inline comment
         """
 
         when:
@@ -154,10 +154,11 @@ class PipelineSpec extends PipelineSpockTestBase {
         !result.contains('Single line comment')
         !result.contains('Block comment')
         !result.contains('Multi-line')
-        !result.contains('code4')  // code4 is part of inline comment and should be removed
+        !result.contains('// Inline comment')  // Inline comment should be removed
         result.contains('code1')
         result.contains('code2')
         result.contains('code3')
+        result.contains('code4') // code4 should remain, only the comment after // should be removed
     }
 
     def "execute handles multi-repo build setup correctly"() {