From 6d4a02fd4febe98ee41df2ae31aefbe822db76bc Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Wed, 29 Apr 2026 03:33:55 -0700 Subject: [PATCH] codex: address PR review feedback (#20179) --- .github/scripts/verify_tui_core_boundary.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/scripts/verify_tui_core_boundary.py b/.github/scripts/verify_tui_core_boundary.py index 0abd88d994..1c0b214fa0 100644 --- a/.github/scripts/verify_tui_core_boundary.py +++ b/.github/scripts/verify_tui_core_boundary.py @@ -50,8 +50,10 @@ GROUPED_USE_PATTERN = re.compile( rf"(?:::{TOKEN_SEPARATOR})?({PATH_PREFIX}{IDENTIFIER})" rf"{TOKEN_SEPARATOR}::{TOKEN_SEPARATOR}\{{([^;]*)\}}\s*;" ) -GROUPED_SELF_ALIAS_PATTERN = re.compile( - rf"\bself{REQUIRED_TOKEN_SEPARATOR}as{REQUIRED_TOKEN_SEPARATOR}({IDENTIFIER})\b" +GROUPED_ITEM_ALIAS_PATTERN = re.compile( + rf"\b({PATH_PREFIX}{IDENTIFIER})" + rf"{REQUIRED_TOKEN_SEPARATOR}as{REQUIRED_TOKEN_SEPARATOR}" + rf"({IDENTIFIER})\b" ) @@ -354,10 +356,13 @@ def crate_alias_pairs(text: str) -> list[tuple[str, str]]: ) ) for match in GROUPED_USE_PATTERN.finditer(text): - source = normalize_identifier(path_tail(match.group(1))) + group_source = normalize_identifier(path_tail(match.group(1))) body = match.group(2) - for alias_match in GROUPED_SELF_ALIAS_PATTERN.finditer(body): - pairs.append((source, normalize_identifier(alias_match.group(1)))) + for alias_match in GROUPED_ITEM_ALIAS_PATTERN.finditer(body): + source = normalize_identifier(path_tail(alias_match.group(1))) + if source == "self": + source = group_source + pairs.append((source, normalize_identifier(alias_match.group(2)))) return pairs