b9819977a5
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>
154 lines
4.6 KiB
Markdown
154 lines
4.6 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>,
|
|
@@ -619,6 +619,12 @@
|
|
|
|
#[cfg(feature = "wasm")]
|
|
wasm_store: Mutex<Option<tree_sitter::WasmStore>>,
|
|
}
|
|
+
|
|
+struct LanguageEntry {
|
|
+ path: PathBuf,
|
|
+ language: OnceCell<Language>,
|
|
+ external_files: Option<Vec<PathBuf>>,
|
|
+}
|
|
|
|
pub struct CompileConfig<'a> {
|
|
@@ -767,7 +773,7 @@
|
|
pub fn get_all_language_configurations(&self) -> Vec<(&LanguageConfiguration, &Path)> {
|
|
self.language_configurations
|
|
.iter()
|
|
- .map(|c| (c, self.languages_by_id[c.language_id].0.as_ref()))
|
|
+ .map(|c| (c, self.languages_by_id[c.language_id].path.as_ref()))
|
|
.collect()
|
|
}
|
|
|
|
```
|
|
|
|
## Cursor Position
|
|
|
|
```tree-sitter/crates/loader/src/loader.rs
|
|
fn language_for_id(&self, id: usize) -> LoaderResult<Language> {
|
|
let (path, language, externals) = &self.languages_by_id[id];
|
|
// ^[CURSOR_POSITION]
|
|
language
|
|
.get_or_try_init(|| {
|
|
let src_path = path.join("src");
|
|
self.load_language_at_path(CompileConfig::new(
|
|
&src_path,
|
|
externals.as_deref(),
|
|
None,
|
|
))
|
|
})
|
|
.cloned()
|
|
}
|
|
```
|
|
|
|
## Expected Patch
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -926,7 +926,11 @@
|
|
}
|
|
|
|
fn language_for_id(&self, id: usize) -> LoaderResult<Language> {
|
|
- let (path, language, externals) = &self.languages_by_id[id];
|
|
+ let LanguageEntry {
|
|
+ path,
|
|
+ language,
|
|
+ external_files,
|
|
+ } = &self.languages_by_id[id];
|
|
language
|
|
.get_or_try_init(|| {
|
|
let src_path = path.join("src");
|
|
self.load_language_at_path(CompileConfig::new(
|
|
&src_path,
|
|
- externals.as_deref(),
|
|
+ external_files.as_deref(),
|
|
None,
|
|
))
|
|
})
|
|
.cloned()
|
|
```
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -926,7 +926,11 @@
|
|
}
|
|
|
|
fn language_for_id(&self, id: usize) -> LoaderResult<Language> {
|
|
- let (path, language, externals) = &self.languages_by_id[id];
|
|
+ let LanguageEntry {
|
|
+ path,
|
|
+ language,
|
|
+ external_files: externals,
|
|
+ } = &self.languages_by_id[id];
|
|
language
|
|
.get_or_try_init(|| {
|
|
let src_path = path.join("src");
|
|
```
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -926,13 +926,14 @@
|
|
}
|
|
|
|
fn language_for_id(&self, id: usize) -> LoaderResult<Language> {
|
|
- let (path, language, externals) = &self.languages_by_id[id];
|
|
- language
|
|
+ let entry = &self.languages_by_id[id];
|
|
+ entry
|
|
+ .language
|
|
.get_or_try_init(|| {
|
|
- let src_path = path.join("src");
|
|
+ let src_path = entry.path.join("src");
|
|
self.load_language_at_path(CompileConfig::new(
|
|
&src_path,
|
|
- externals.as_deref(),
|
|
+ entry.external_files.as_deref(),
|
|
None,
|
|
))
|
|
})
|
|
```
|
|
|
|
```diff
|
|
--- a/tree-sitter/crates/loader/src/loader.rs
|
|
+++ b/tree-sitter/crates/loader/src/loader.rs
|
|
@@ -926,0 +926,0 @@
|
|
}
|
|
|
|
fn language_for_id(&self, id: usize) -> LoaderResult<Language> {
|
|
- let (path, language, externals) = &self.languages_by_id[id];
|
|
+ let LanguageEntry { path, language, external_files } = &self.languages_by_id[id];
|
|
language
|
|
.get_or_try_init(|| {
|
|
let src_path = path.join("src");
|
|
self.load_language_at_path(CompileConfig::new(
|
|
&src_path,
|
|
- externals.as_deref(),
|
|
+ external_files.as_deref(),
|
|
None,
|
|
))
|
|
})
|
|
.cloned()
|
|
```
|