logiguard fork v3: full patch set on verified 8c74db0 tree

Includes prior-session patches (carry forward so the app compiles):
  - crates/gpui/build.rs: cross-compile manifest fix
  - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method
  - crates/gpui/src/window.rs: Window::activate_with_token public API
  - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix

Plus the focus-serial fix:
  - serial.rs: SerialKind::KeyboardEnter
  - client.rs: store wl_keyboard.enter serial; latest_serial_of()

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Mohamad Khani
2026-07-14 01:52:12 +03:30
commit b9819977a5
3984 changed files with 1487015 additions and 0 deletions

View File

@@ -0,0 +1,136 @@
+++
repository_url = "git@github.com:tree-sitter/tree-sitter"
revision = "17e3c7a5c56527a179fa6e37ce7ee934493e5047"
+++
## Edit History
```diff
--- a/crates/loader/src/loader.rs
+++ b/crates/loader/src/loader.rs
@@ -729,15 +729,16 @@
));
}
for parser_container_dir in &config.parser_directories {
- if let Ok(entries) = fs::read_dir(parser_container_dir) {
- for entry in entries {
- let entry = entry.map_err(|e| LoaderError::IO(IoError::new(e, None)))?;
- if let Some(parser_dir_name) = entry.file_name().to_str() {
- if parser_dir_name.starts_with("tree-sitter-") {
- self.find_language_configurations_at_path(
- &parser_container_dir.join(parser_dir_name),
- false,
- )
+ match fs::read_dir(parser_container_dir) {
+ Ok(entries) => {
+ for entry in entries {
+ let entry = entry.map_err(|e| LoaderError::IO(IoError::new(e, None)))?;
+ if let Some(parser_dir_name) = entry.file_name().to_str() {
+ if parser_dir_name.starts_with("tree-sitter-") {
+ self.find_language_configurations_at_path(
+ &parser_container_dir.join(parser_dir_name),
+ false,
+ )
.ok();
}
}
--- a/crates/loader/src/loader.rs
+++ b/crates/loader/src/loader.rs
@@ -739,7 +739,8 @@
&parser_container_dir.join(parser_dir_name),
false,
)
- .ok();
+ .ok();
+ }
}
}
}
```
## Cursor Position
```crates/loader/src/loader.rs
if let Some(parser_dir_name) = entry.file_name().to_str() {
if parser_dir_name.starts_with("tree-sitter-") {
self.find_language_configurations_at_path(
&parser_container_dir.join(parser_dir_name),
false,
)
.ok();
}
// ^[CURSOR_POSITION]
}
}
}
}
}
```
## Expected Patch
```diff
--- a/crates/loader/src/loader.rs
+++ b/crates/loader/src/loader.rs
@@ -736,13 +736,13 @@
if let Some(parser_dir_name) = entry.file_name().to_str() {
if parser_dir_name.starts_with("tree-sitter-") {
self.find_language_configurations_at_path(
&parser_container_dir.join(parser_dir_name),
false,
)
.ok();
}
}
}
}
+ Err(error) => {}
# ^[CURSOR_POSITION]
}
}
```
```diff
--- a/crates/loader/src/loader.rs
+++ b/crates/loader/src/loader.rs
@@ -736,13 +736,13 @@
if let Some(parser_dir_name) = entry.file_name().to_str() {
if parser_dir_name.starts_with("tree-sitter-") {
self.find_language_configurations_at_path(
&parser_container_dir.join(parser_dir_name),
false,
)
.ok();
}
}
}
}
+ Err(_) => {}
# ^[CURSOR_POSITION]
}
}
```
```diff
--- a/crates/loader/src/loader.rs
+++ b/crates/loader/src/loader.rs
@@ -736,13 +736,13 @@
if let Some(parser_dir_name) = entry.file_name().to_str() {
if parser_dir_name.starts_with("tree-sitter-") {
self.find_language_configurations_at_path(
&parser_container_dir.join(parser_dir_name),
false,
)
.ok();
}
}
}
}
+ Err(e) => {
+
# ^[CURSOR_POSITION]
+ }
}
}
```