Merge pull request #368 from slothy-optimizer/robust-multi-line

More robust multi-line comment handling

Author: mkannwischer

slothy/helper.py

@@ -48,9 +48,14 @@ class SourceLine:
     def _extract_comments_from_text(self):
         if "//" not in self._raw:
             return
-        s = list(self._raw.split("//"))
+        # Don't split block comments (they contain markers and may have // in content)
+        if _NEWLINE_MARKER in self._raw:
+            s = self._raw.split("//", 1)
+        else:
+            s = self._raw.split("//")
         self._raw = s[0]
-        self._comments += map(str.lstrip, s[1:])
+        # Preserve whitespace for block comments (with markers), lstrip others
+        self._comments += [c if _NEWLINE_MARKER in c else c.lstrip() for c in s[1:]]
         self._trim_comments()
 
     def _extract_indentation_from_text(self):
@@ -96,7 +101,10 @@ def tag_callback(g):
         return s
 
     def _strip_comments(self):
-        self._comments = list(map(str.lstrip, self._comments))
+        # Preserve whitespace for block comments (with markers), lstrip others
+        self._comments = [
+            c if _NEWLINE_MARKER in c else c.lstrip() for c in self._comments
+        ]
 
     def _trim_comments(self):
         self._strip_comments()
@@ -246,8 +254,7 @@ def format_comment(s):
                 if _NEWLINE_MARKER in s:
                     # Restore as multi-line /* */ comment
                     lines = s.split(_NEWLINE_MARKER)
-                    lines = [line.strip() for line in lines]
-                    return "/* " + "\n   ".join(lines) + " */"
+                    return "/*" + "\n".join(lines) + "*/"
                 elif s.startswith(_BLOCK_COMMENT_MARKER):
                     # Restore as single-line /* */ comment
                     return f"/* {s[len(_BLOCK_COMMENT_MARKER):]} */"
@@ -375,9 +382,8 @@ def replace_comment(match):
                 content = match.group(1)
                 if "\n" in content:
                     # Multi-line /* */ comment - mark newlines
-                    content = content.replace("\n", f" {_NEWLINE_MARKER} ")
-                    content = " ".join(content.split())
-                    return f"// {content}" if content else ""
+                    content = content.replace("\n", _NEWLINE_MARKER)
+                    return f"//{content}" if content.strip() else ""
                 else:
                     # Single-line /* */ comment - mark with prefix
                     content = content.strip()