From b5d17b99df8656a53f3959d86a1ee92e5354c68f Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Thu, 6 Feb 2025 08:43:11 -0800 Subject: [PATCH] style: Format code and fix whitespace issues --- aider/watch.py | 17 ++++++----------- tests/basic/test_watch.py | 16 +++++++++------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/aider/watch.py b/aider/watch.py index b478921cb..989aa8bf6 100644 --- a/aider/watch.py +++ b/aider/watch.py @@ -128,7 +128,7 @@ class FileWatcher: """Process the detected changes and update state""" if not changes: return False - + changed_files = {str(Path(change[1])) for change in changes} self.changed_files.update(changed_files) self.io.interrupt_input() @@ -138,15 +138,13 @@ class FileWatcher: """Watch for file changes and process them""" try: roots_to_watch = self.get_roots_to_watch() - + for changes in watch( - *roots_to_watch, - watch_filter=self.filter_func, - stop_event=self.stop_event + *roots_to_watch, watch_filter=self.filter_func, stop_event=self.stop_event ): if self.handle_changes(changes): return - + except Exception as e: if self.verbose: dump(f"File watcher error: {e}") @@ -156,11 +154,8 @@ class FileWatcher: """Start watching for file changes""" self.stop_event = threading.Event() self.changed_files = set() - - self.watcher_thread = threading.Thread( - target=self.watch_files, - daemon=True - ) + + self.watcher_thread = threading.Thread(target=self.watch_files, daemon=True) self.watcher_thread.start() def stop(self): diff --git a/tests/basic/test_watch.py b/tests/basic/test_watch.py index 51f0e840b..204fa6b8c 100644 --- a/tests/basic/test_watch.py +++ b/tests/basic/test_watch.py @@ -65,16 +65,16 @@ def test_get_roots_to_watch(tmp_path): # Create a test directory structure (tmp_path / "included").mkdir() (tmp_path / "excluded").mkdir() - + io = InputOutput(pretty=False, fancy_input=False, yes=False) coder = MinimalCoder(io) - + # Test with no gitignore watcher = FileWatcher(coder, root=tmp_path) roots = watcher.get_roots_to_watch() assert len(roots) == 1 assert roots[0] == str(tmp_path) - + # Test with gitignore gitignore = tmp_path / ".gitignore" gitignore.write_text("excluded/") @@ -83,20 +83,22 @@ def test_get_roots_to_watch(tmp_path): assert len(roots) == 1 assert Path(roots[0]).name == "included" + def test_handle_changes(): io = InputOutput(pretty=False, fancy_input=False, yes=False) coder = MinimalCoder(io) watcher = FileWatcher(coder) - + # Test no changes assert not watcher.handle_changes([]) assert len(watcher.changed_files) == 0 - + # Test with changes - changes = [('modified', '/path/to/file.py')] + changes = [("modified", "/path/to/file.py")] assert watcher.handle_changes(changes) assert len(watcher.changed_files) == 1 - assert str(Path('/path/to/file.py')) in watcher.changed_files + assert str(Path("/path/to/file.py")) in watcher.changed_files + def test_ai_comment_pattern(): # Create minimal IO and Coder instances for testing