b72a46db68
Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled
Single-commit orphan branch: full zed-industries/zed @ 8c74db0 source tree with a 3-file patch applied (no upstream history). Patch (crates/gpui_linux/src/linux/wayland/): - serial.rs: add SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; add latest_serial_of() - window.rs: activate() uses keyboard-enter serial (Mutter focus gate) Mutter honors window activation only when the token carries the keyboard- focus serial from wl_keyboard.enter; GPUI used a stale mouse-press serial. See docs/tray-window-focus-wayland.md in logiguard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
4.9 KiB
4.9 KiB
+++ repository_url = "git@github.com:tree-sitter/tree-sitter" revision = "17e3c7a5c56527a179fa6e37ce7ee934493e5047" +++
Edit History
--- 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
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
--- 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]
}
}
--- 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]
}
}
--- 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]
+ }
}
}