Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions codeflash/code_utils/code_replacer.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import re
from collections import defaultdict
from functools import lru_cache
from typing import TYPE_CHECKING, Optional, TypeVar
from typing import TYPE_CHECKING, List, Optional, TypeVar

import libcst as cst

Expand Down Expand Up @@ -342,33 +342,35 @@ def function_to_optimize_original_worktree_fqn(
class AssertCleanup:
def transform_asserts(self, code: str) -> str:
lines = code.splitlines()
result_lines = []
result_lines: List[str] = []

append_result = result_lines.append
transform_line = self._transform_assert_line

for line in lines:
transformed = self._transform_assert_line(line)
transformed = transform_line(line)
if transformed is not None:
result_lines.append(transformed)
append_result(transformed)
else:
result_lines.append(line)
append_result(line)

return "\n".join(result_lines)

def _transform_assert_line(self, line: str) -> Optional[str]:
indent = line[: len(line) - len(line.lstrip())]

assert_match = re.match(r"\s*assert\s+(.*?)(?:\s*==\s*.*)?$", line)
assert_match = self.assert_pattern.match(line)
if assert_match:
expression = assert_match.group(1).strip()
if expression.startswith("not "):
return f"{indent}{expression}"

expression = re.sub(r"[,;]\s*$", "", expression)
expression = expression.rstrip(",;")
return f"{indent}{expression}"

unittest_match = re.match(r"(\s*)self\.assert([A-Za-z]+)\((.*)\)$", line)
unittest_match = self.unittest_pattern.match(line)
if unittest_match:
indent, assert_method, args = unittest_match.groups()

indent, _, args = unittest_match.groups()
if args:
arg_parts = self._split_top_level_args(args)
if arg_parts and arg_parts[0]:
Expand Down Expand Up @@ -399,6 +401,11 @@ def _split_top_level_args(self, args_str: str) -> list[str]:

return result

def __init__(self):
# Compile the regular expressions once
self.assert_pattern = re.compile(r"\s*assert\s+(.*?)(?:\s*==\s*.*)?$")
self.unittest_pattern = re.compile(r"(\s*)self\.assert([A-Za-z]+)\((.*)\)$")


def clean_concolic_tests(test_suite_code: str) -> str:
try:
Expand Down