Merge remote-tracking branch 'origin/omni-java' into sync-main-batch-4

# Conflicts:
#	codeflash/languages/java/instrumentation.py

Author: KRRT7

codeflash/languages/java/context.py

@@ -1088,7 +1088,7 @@ def _extract_public_method_signatures(source: str, class_name: str, analyzer: Ja
                 sig_parts_bytes.append(mod_slice)
                 continue
 
-            if ctype == "block" or ctype == "constructor_body":
+            if ctype in {"block", "constructor_body"}:
                 break
 
             sig_parts_bytes.append(source_bytes[child.start_byte : child.end_byte])

codeflash/languages/java/instrumentation.py

@@ -730,7 +730,7 @@ def split_var_declaration(stmt_node, source_bytes_ref: bytes) -> tuple[str, str]
         # The variable is assigned inside a for/try block which Java considers
         # conditionally executed, so an uninitialized declaration would cause
         # "variable might not have been initialized" errors.
-        _PRIMITIVE_DEFAULTS = {
+        primitive_defaults = {
             "byte": "0",
             "short": "0",
             "int": "0",
@@ -740,7 +740,7 @@ def split_var_declaration(stmt_node, source_bytes_ref: bytes) -> tuple[str, str]
             "char": "'\\0'",
             "boolean": "false",
         }
-        default_val = _PRIMITIVE_DEFAULTS.get(type_text, "null")
+        default_val = primitive_defaults.get(type_text, "null")
         hoisted = f"{type_text} {name_text} = {default_val};"
         assignment = f"{name_text} = {value_text};"
         return hoisted, assignment
@@ -924,9 +924,7 @@ def build_instrumented_body(body_text: str, next_wrapper_id: int, base_indent: s
 
     replacements: list[tuple[int, int, bytes]] = []
     wrapper_id = 0
-    method_ordinal = 0
-    for method_node, body_node in test_methods:
-        method_ordinal += 1
+    for method_ordinal, (method_node, body_node) in enumerate(test_methods, start=1):
         body_start = body_node.start_byte + 1  # skip '{'
         body_end = body_node.end_byte - 1  # skip '}'
         body_text = source_bytes[body_start:body_end].decode("utf8")

codeflash/verification/parse_line_profile_test_output.py

@@ -6,16 +6,14 @@
 import json
 import linecache
 import os
-from typing import TYPE_CHECKING, Optional
+from pathlib import Path
+from typing import Optional
 
 import dill as pickle
 
 from codeflash.code_utils.tabulate import tabulate
 from codeflash.languages import is_python
 
-if TYPE_CHECKING:
-    from pathlib import Path
-
 
 def show_func(
     filename: str, start_lineno: int, func_name: str, timings: list[tuple[int, int, float]], unit: float
@@ -98,13 +96,13 @@ def show_text_non_python(stats: dict, line_contents: dict[tuple[str, int], str])
         table_rows = []
         for lineno, nhits, time in timings:
             percent = "" if total_time == 0 else "%5.1f" % (100 * time / total_time)
-            time_disp = "%5.1f" % time
+            time_disp = f"{time:5.1f}"
             if len(time_disp) > default_column_sizes["time"]:
-                time_disp = "%5.1g" % time
+                time_disp = f"{time:5.1g}"
             perhit = (float(time) / nhits) if nhits > 0 else 0.0
-            perhit_disp = "%5.1f" % perhit
+            perhit_disp = f"{perhit:5.1f}"
             if len(perhit_disp) > default_column_sizes["perhit"]:
-                perhit_disp = "%5.1g" % perhit
+                perhit_disp = f"{perhit:5.1g}"
             nhits_disp = "%d" % nhits  # noqa: UP031
             if len(nhits_disp) > default_column_sizes["hits"]:
                 nhits_disp = f"{nhits:g}"
@@ -161,7 +159,7 @@ def parse_line_profile_results(line_profiler_output_file: Optional[Path]) -> dic
         if not sorted_line_stats:
             continue
         start_lineno = sorted_line_stats[0][0]
-        grouped_timings[(file_path, start_lineno, os.path.basename(file_path))] = sorted_line_stats
+        grouped_timings[(file_path, start_lineno, Path(file_path).name)] = sorted_line_stats
 
     stats_dict["timings"] = grouped_timings
     stats_dict["unit"] = 1e-9