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>
126 lines
2.9 KiB
Markdown
126 lines
2.9 KiB
Markdown
+++
|
|
repository_url = "git@github.com:tree-sitter/tree-sitter"
|
|
revision = "24007727d42b4caceda3095ac685c463fae1ba1a"
|
|
+++
|
|
|
|
## Edit History
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -604,7 +604,7 @@
|
|
|
|
pub struct Loader {
|
|
pub parser_lib_path: PathBuf,
|
|
- languages_by_id: Vec<(PathBuf, OnceCell<Language>, Option<Vec<PathBuf>>)>,
|
|
+ languages_by_id: Vec<LanguageEntry>,
|
|
language_configurations: Vec<LanguageConfiguration<'static>>,
|
|
language_configuration_ids_by_file_type: HashMap<String, Vec<usize>>,
|
|
language_configuration_in_current_path: Option<usize>,
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -621,6 +621,8 @@
|
|
wasm_store: Mutex<Option<tree_sitter::WasmStore>>,
|
|
}
|
|
|
|
+str
|
|
pub struct CompileConfig<'a> {
|
|
pub src_path: &'a Path,
|
|
pub header_paths: Vec<&'a Path>,
|
|
```
|
|
|
|
## Cursor Position
|
|
|
|
```tree-sitter/crates/loader/src/loader.rs
|
|
sanitize_build: bool,
|
|
force_rebuild: bool,
|
|
|
|
#[cfg(feature = "wasm")]
|
|
wasm_store: Mutex<Option<tree_sitter::WasmStore>>,
|
|
}
|
|
|
|
str
|
|
// ^[CURSOR_POSITION]
|
|
pub struct CompileConfig<'a> {
|
|
pub src_path: &'a Path,
|
|
pub header_paths: Vec<&'a Path>,
|
|
pub parser_path: PathBuf,
|
|
pub scanner_path: Option<PathBuf>,
|
|
pub external_files: Option<&'a [PathBuf]>,
|
|
```
|
|
|
|
## Expected Patch
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -621,6 +621,8 @@
|
|
wasm_store: Mutex<Option<tree_sitter::WasmStore>>,
|
|
}
|
|
|
|
-str
|
|
+struct LanguageEntry {
|
|
+ path: PathBuf,
|
|
+ language: OnceCell<Language>,
|
|
+ external_files: Option<Vec<PathBuf>>,
|
|
+}
|
|
+
|
|
pub struct CompileConfig<'a> {
|
|
pub src_path: &'a Path,
|
|
pub header_paths: Vec<&'a Path>,
|
|
```
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -621,6 +621,8 @@
|
|
wasm_store: Mutex<Option<tree_sitter::WasmStore>>,
|
|
}
|
|
|
|
-str
|
|
+struct LanguageEntry {
|
|
+ path: PathBuf,
|
|
+ language: OnceCell<Language>,
|
|
+ dependencies: Option<Vec<PathBuf>>,
|
|
+}
|
|
+
|
|
pub struct CompileConfig<'a> {
|
|
pub src_path: &'a Path,
|
|
pub header_paths: Vec<&'a Path>,
|
|
```
|
|
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -621,6 +621,8 @@
|
|
wasm_store: Mutex<Option<tree_sitter::WasmStore>>,
|
|
}
|
|
|
|
-str
|
|
+struct LanguageEntry {
|
|
+ path: PathBuf,
|
|
+ language: OnceCell<Language>,
|
|
+ extra_files: Option<Vec<PathBuf>>,
|
|
+}
|
|
+
|
|
pub struct CompileConfig<'a> {
|
|
pub src_path: &'a Path,
|
|
pub header_paths: Vec<&'a Path>,
|
|
```
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -621,6 +621,8 @@
|
|
wasm_store: Mutex<Option<tree_sitter::WasmStore>>,
|
|
}
|
|
|
|
-str
|
|
+struct LanguageEntry(PathBuf, OnceCell<Language>, Option<Vec<PathBuf>>);
|
|
+
|
|
pub struct CompileConfig<'a> {
|
|
pub src_path: &'a Path,
|
|
pub header_paths: Vec<&'a Path>,
|
|
```
|