fix(waiter): refactor wait functions to improve code quality

- Combine nested if statements for cleaner code
- Fix line length issues for improved readability
- Restore start_time variable for correct timing calculations
- Put return statements in correct position to fix TRY300 linting issues

Author: tony

src/libtmux/test/waiter.py

@@ -454,7 +454,18 @@ def check_content() -> bool:
         if match_type == ContentMatchType.CONTAINS:
             if not isinstance(content_pattern, str):
                 raise TypeError(ERR_CONTAINS_TYPE)
+            content_str = "\n".join(content)
+            if content_pattern in content_str:
+                result.matched_content = content_pattern
+                # Find which line contains the match
+                for i, line in enumerate(content):
+                    if content_pattern in line:
+                        result.match_line = i
+                        break
+                return True
+            return False
 
+        # Handle regex match type
         if match_type == ContentMatchType.REGEX:
             if isinstance(content_pattern, (str, re.Pattern)):
                 pattern = (
@@ -474,18 +485,7 @@ def check_content() -> bool:
                     return True
                 return False
             raise TypeError(ERR_REGEX_TYPE)
-
-        # Contains match (default)
-        content_str = "\n".join(content)
-        if isinstance(content_pattern, str) and content_pattern in content_str:
-            result.matched_content = content_pattern
-            # Find which line contains the match
-            for i, line in enumerate(content):
-                if content_pattern in line:
-                    result.match_line = i
-                    break
-            return True
-        return False
+        return None
 
     try:
         success, exception = retry_until_extended(
@@ -494,10 +494,14 @@ def check_content() -> bool:
             interval=interval,
             raises=raises,
         )
-        result.success = success
         if exception:
+            if raises:
+                raise
             result.error = str(exception)
-        return result
+            return result
+        else:
+            result.success = success
+            return result
     except WaitTimeout as e:
         if raises:
             raise
@@ -778,15 +782,12 @@ def has_at_least_5_lines(content):
         raise ValueError(msg)
 
     # If match_types is a single value, convert to a list of the same value
-    match_types_list: list[ContentMatchType]
-    if isinstance(match_types, ContentMatchType):
-        match_types_list = [match_types] * len(content_patterns)
-    else:
-        match_types_list = match_types
-
-    if len(match_types_list) != len(content_patterns):
+    if not isinstance(match_types, list):
+        match_types = [match_types] * len(content_patterns)
+    elif len(match_types) != len(content_patterns):
         msg = (
-            "If match_types is a list, it must have the same length as content_patterns"
+            f"match_types list ({len(match_types)}) "
+            f"doesn't match patterns ({len(content_patterns)})"
         )
         raise ValueError(msg)
 
@@ -802,7 +803,7 @@ def check_any_content() -> bool:
         result.content = content
 
         for i, (pattern, match_type) in enumerate(
-            zip(content_patterns, match_types_list),
+            zip(content_patterns, match_types),
         ):
             # Handle predicate match
             if match_type == ContentMatchType.PREDICATE:
@@ -877,11 +878,15 @@ def check_any_content() -> bool:
             interval=interval,
             raises=raises,
         )
-        result.success = success
         if exception:
+            if raises:
+                raise
             result.error = str(exception)
-        result.elapsed_time = time.time() - start_time
-        return result
+            return result
+        else:
+            result.success = success
+            result.elapsed_time = time.time() - start_time
+            return result
     except WaitTimeout as e:
         if raises:
             raise
@@ -972,22 +977,19 @@ def has_at_least_5_lines(content):
             ContentMatchType.PREDICATE
         )
     """
-    # If match_types is a single value, convert to a list of the same value
-    match_types_list: list[ContentMatchType]
-    if isinstance(match_types, ContentMatchType):
-        match_types_list = [match_types] * len(content_patterns)
-    else:
-        match_types_list = match_types
-
-    if len(match_types_list) != len(content_patterns):
+    # Convert single match_type to list of same type
+    if not isinstance(match_types, list):
+        match_types = [match_types] * len(content_patterns)
+    elif len(match_types) != len(content_patterns):
         msg = (
-            "If match_types is a list, it must have the same length as content_patterns"
+            f"match_types list ({len(match_types)}) "
+            f"doesn't match patterns ({len(content_patterns)})"
         )
         raise ValueError(msg)
 
     result = WaitResult(success=False)
-    start_time = time.time()
     matched_patterns: list[str] = []
+    start_time = time.time()
 
     def check_all_content() -> bool:
         content = pane.capture_pane(start=start, end=end)
@@ -998,7 +1000,7 @@ def check_all_content() -> bool:
         matched_patterns.clear()
 
         for i, (pattern, match_type) in enumerate(
-            zip(content_patterns, match_types_list),
+            zip(content_patterns, match_types),
         ):
             # Handle predicate match
             if match_type == ContentMatchType.PREDICATE:
@@ -1062,11 +1064,15 @@ def check_all_content() -> bool:
             interval=interval,
             raises=raises,
         )
-        result.success = success
         if exception:
+            if raises:
+                raise
             result.error = str(exception)
-        result.elapsed_time = time.time() - start_time
-        return result
+            return result
+        else:
+            result.success = success
+            result.elapsed_time = time.time() - start_time
+            return result
     except WaitTimeout as e:
         if raises:
             raise
@@ -1099,7 +1105,8 @@ def _contains_match(
         for i, line in enumerate(content):
             if pattern in line:
                 return True, pattern, i
-        # If we somehow didn't find it in any individual line but it was in the joined string
+        # If we somehow didn't find it in any individual line but it was in the
+        # joined string
         return True, pattern, None
     return False, None, None