6fca1d2b0b
There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
68 lines
1.7 KiB
Python
Executable file
68 lines
1.7 KiB
Python
Executable file
#!/bin/env python3
|
|
|
|
import os
|
|
from pathlib import Path
|
|
|
|
def process_file(filepath):
|
|
with open(filepath, 'r', encoding='utf-8') as f:
|
|
lines = f.readlines()
|
|
|
|
modified_lines = []
|
|
in_conflict = False
|
|
after_equals = False
|
|
keep_lines = []
|
|
|
|
for line in lines:
|
|
if line.startswith('<<<<<<<'):
|
|
in_conflict = True
|
|
after_equals = False
|
|
keep_lines = []
|
|
continue
|
|
elif line.startswith('======='):
|
|
after_equals = True
|
|
continue
|
|
elif line.startswith('>>>>>>>'):
|
|
in_conflict = False
|
|
after_equals = False
|
|
modified_lines.extend(keep_lines)
|
|
continue
|
|
|
|
if in_conflict:
|
|
if after_equals:
|
|
keep_lines.append(line)
|
|
else:
|
|
modified_lines.append(line)
|
|
|
|
# Only write if changes were made
|
|
if lines != modified_lines:
|
|
with open(filepath, 'w', encoding='utf-8') as f:
|
|
f.writelines(modified_lines)
|
|
print(f"Processed: {filepath}")
|
|
return True
|
|
return False
|
|
|
|
def main():
|
|
# Get current directory
|
|
current_dir = Path('.')
|
|
|
|
# Find all .rs files recursively
|
|
rust_files = list(current_dir.rglob('*.rs'))
|
|
|
|
files_processed = 0
|
|
files_modified = 0
|
|
|
|
# Process each file
|
|
for filepath in rust_files:
|
|
try:
|
|
files_processed += 1
|
|
if process_file(filepath):
|
|
files_modified += 1
|
|
except Exception as e:
|
|
print(f"Error processing {filepath}: {str(e)}")
|
|
|
|
print(f"\nSummary:")
|
|
print(f"Files processed: {files_processed}")
|
|
print(f"Files modified: {files_modified}")
|
|
|
|
if __name__ == "__main__":
|
|
main()
|