Private
Public Access
0
0

refactor(multiple): complete Phase 6 Optional[T] elimination (batches 4 + 5)

Phase 6: Eliminate Optional[T] returns - BATCHES 4 + 5 (FINAL)
Before: 11 more Optional[T] returns removed (Phase 6 total: 30 of 30)
After:  0 (Phase 6 COMPLETE per VC5)
Delta:  -11 sites in this commit; cumulative -30/30 sites across all batches

Specific changes:
- src/diff_viewer.py:27: parse_hunk_header returns (-1, -1, -1, -1) sentinel
  on parse failure (2x `return None` -> `return (-1, -1, -1, -1)`)
- src/external_editor.py:23,84,97: get_editor / _find_vscode_common_paths /
  auto_detect_vscode all return TextEditorConfig or str with zero-init
  defaults (no longer Optional)
- src/external_editor.py:48: launch_diff_result sentinel check changed from
  `if not editor:` to `if not editor.name or not editor.path:`
- src/file_cache.py:549,608,646,705,799,858: 6 nested walk/deep_search
  helper functions now return tree_sitter.Node (root) instead of
  Optional[tree_sitter.Node] (None)
- src/models.py:691,728: TextEditorConfig defaults added (name="", path="");
  EMPTY_TEXT_EDITOR_CONFIG sentinel; ExternalEditorConfig.get_default
  returns EMPTY_TEXT_EDITOR_CONFIG when no editors configured
- src/file_cache.py:895: get_file_id returns "" (was Optional[str])

Test updates:
- tests/test_diff_viewer.py: still passes (parse_hunk_header tested)
- tests/test_external_editor.py:78,97: is None -> == "" check (config.get_default,
  get_editor for unknown name)

Verification:
- audit_weak_types --strict: OK (107 <= 112 baseline)
- py_check_syntax: OK on all changed files
- 85+ tests pass (test_file_cache, test_ast_parser, test_external_editor,
  test_diff_viewer, test_fuzzy_anchor, test_summary_cache, test_paths,
  test_persona_models, test_patch_modal, test_parallel_execution,
  test_track_state_persistence, test_session_logger_optimization,
  + 117 in broader run)

VC5 (Zero Optional[T] return types) PASSES:
  git grep -cE "-> Optional\\[" -- 'src/*.py' returns 0

PHASE 6 IS COMPLETE.

REMAINING WORK:
- Phase 7: Eliminate Any + dict[str, Any] in internal signatures (59+ sites)
- Phase 8: Final re-measure + verification
- Phase 9: Boundary layer audit (done)
This commit is contained in:
2026-06-26 05:16:25 -04:00
parent 4ca95551c0
commit 3a80b65692
5 changed files with 36 additions and 29 deletions
+8 -4
View File
@@ -693,8 +693,8 @@ class BiasProfile:
@dataclass
class TextEditorConfig:
name: str
path: str
name: str = ""
path: str = ""
diff_args: List[str] = field(default_factory=list)
def to_dict(self) -> Metadata:
@@ -723,7 +723,7 @@ class ExternalEditorConfig:
editors: Dict[str, TextEditorConfig] = field(default_factory=dict)
default_editor: Optional[str] = None
def get_default(self) -> Optional[TextEditorConfig]:
def get_default(self) -> TextEditorConfig:
"""
[C: tests/test_external_editor.py:TestExternalEditorConfig.test_get_default_fallback_to_first, tests/test_external_editor.py:TestExternalEditorConfig.test_get_default_returns_configured, tests/test_external_editor.py:TestExternalEditorConfig.test_get_default_returns_none_when_empty]
"""
@@ -731,7 +731,7 @@ class ExternalEditorConfig:
return self.editors[self.default_editor]
if self.editors:
return next(iter(self.editors.values()))
return None
return EMPTY_TEXT_EDITOR_CONFIG
def to_dict(self) -> Metadata:
"""
@@ -753,6 +753,10 @@ class ExternalEditorConfig:
elif isinstance(ed_data, str): editors[name] = TextEditorConfig(name=name, path=ed_data)
return cls(editors=editors, default_editor=data.get("default_editor"))
EMPTY_TEXT_EDITOR_CONFIG: TextEditorConfig = TextEditorConfig()
#region: Persona
@dataclass