Fix unexpected behavior with comments

Author: lgtaxn

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+UNRELEASED
+------------------
+
+- Fix unexpected behavior with comments
+
+
 1.1.1 (2024-06-24)
 ------------------
 

src/Converter.php

@@ -645,6 +645,19 @@ protected static function extractArgsFromString(string $string): array
                 $previousChar = $chars[$i - 1] ?? '';
                 $nextChar = $chars[$i + 1] ?? '';
 
+                if ($inSinglelineComment || $inMultilineComment) {
+                    static::$hasComments = true;
+
+                    if ($inSinglelineComment && $char === "\n") {
+                        $inSinglelineComment = false;
+
+                    } elseif ($inMultilineComment && $previousChar === '*' && $char === '/') {
+                        $inMultilineComment = false;
+                    }
+
+                    continue;
+                }
+
                 if (! $inDoubleQuotedString && $char === "'" && $previousChar !== '\\') {
                     $inSimpleQuotedString = ! $inSimpleQuotedString;
 
@@ -665,30 +678,21 @@ protected static function extractArgsFromString(string $string): array
                     } elseif ($char === ']') {
                         $nbUnclosedBrackets--;
 
-                    } elseif (! $inMultilineComment && ($char === '#' || $char === '/' && $nextChar === '/')) {
+                    } elseif ($char === '#' || $char === '/' && $nextChar === '/') {
                         $inSinglelineComment = true;
+                        continue;
 
-                    } elseif (! $inSinglelineComment && $char === '/' && $nextChar === '*') {
+                    } elseif ($char === '/' && $nextChar === '*') {
                         $inMultilineComment = true;
+                        continue;
                     }
                 }
 
                 if ($nbUnclosedParenthesis < 0 || $nbUnclosedBrackets < 0) {
                     throw new ConverterException();
                 }
 
-                if (! $inSinglelineComment && ! $inMultilineComment) {
-                    $args[$argIndex] .= $char;
-                } else {
-                    static::$hasComments = true;
-
-                    if ($inSinglelineComment && $char === "\n") {
-                        $inSinglelineComment = false;
-
-                    } elseif ($inMultilineComment && $previousChar === '*' && $char === '/') {
-                        $inMultilineComment = false;
-                    }
-                }
+                $args[$argIndex] .= $char;
             }
 
             if (! $inSinglelineComment && ! $inMultilineComment